[Commits] Rev 2845: Fix oqgraph test suite. in http://bazaar.launchpad.net/~maria-captains/maria/5.1

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Wed Sep 8 14:28:16 EEST 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.1

------------------------------------------------------------
revno: 2845
revision-id: knielsen at knielsen-hq.org-20100908112815-898jbb9isrzsg3j4
parent: sergii at pisem.net-20100903201714-iemiu494d155dd1f
committer: knielsen at knielsen-hq.org
branch nick: 5.2-serg
timestamp: Wed 2010-09-08 13:28:15 +0200
message:
  Fix oqgraph test suite.
=== removed directory 'mysql-test/suite/oqgraph/include'
=== removed file 'mysql-test/suite/oqgraph/include/have_oqgraph_engine.inc'
--- a/mysql-test/suite/oqgraph/include/have_oqgraph_engine.inc	2010-01-04 08:27:50 +0000
+++ b/mysql-test/suite/oqgraph/include/have_oqgraph_engine.inc	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-disable_query_log;
---require r/true.require
-select (PLUGIN_LIBRARY LIKE 'oqgraph_engine%') as `TRUE` from information_schema.plugins where PLUGIN_NAME='OQGRAPH';
-enable_query_log;

=== modified file 'mysql-test/suite/oqgraph/suite.pm'
--- a/mysql-test/suite/oqgraph/suite.pm	2010-08-31 07:13:46 +0000
+++ b/mysql-test/suite/oqgraph/suite.pm	2010-09-08 11:28:15 +0000
@@ -2,7 +2,7 @@ package My::Suite::OQGraph;
 
 @ISA = qw(My::Suite);
 
-return "No OQGraph" unless $ENV{HA_OQGRAPH_SO};
+return "No OQGraph" unless $ENV{OQGRAPH_ENGINE_SO};
 
 bless { };
 

=== modified file 'mysql-test/suite/oqgraph/t/basic.test'
--- a/mysql-test/suite/oqgraph/t/basic.test	2010-01-04 08:27:50 +0000
+++ b/mysql-test/suite/oqgraph/t/basic.test	2010-09-08 11:28:15 +0000
@@ -1,5 +1,3 @@
--- source suite/oqgraph/include/have_oqgraph_engine.inc
-
 drop table if exists graph;
 
 CREATE TABLE graph (

=== modified file 'mysql-test/suite/oqgraph/t/binlog.test'
--- a/mysql-test/suite/oqgraph/t/binlog.test	2010-04-12 23:23:51 +0000
+++ b/mysql-test/suite/oqgraph/t/binlog.test	2010-09-08 11:28:15 +0000
@@ -1,4 +1,3 @@
--- source suite/oqgraph/include/have_oqgraph_engine.inc
 -- source include/have_log_bin.inc
 
 --disable_warnings

=== modified file 'mysql-test/suite/oqgraph/t/suite.opt'
--- a/mysql-test/suite/oqgraph/t/suite.opt	2010-06-14 16:58:52 +0000
+++ b/mysql-test/suite/oqgraph/t/suite.opt	2010-09-08 11:28:15 +0000
@@ -1 +1 @@
---plugin-load=$GRAPH_ENGINE_SO
+--plugin-load=$OQGRAPH_ENGINE_SO



More information about the commits mailing list