diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-09-12 14:32:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-09-12 14:32:17 +0200 |
| commit | 67beb14625f20618d48efa7d81c889b48c53baa1 (patch) | |
| tree | c1bcbf81139dd6b0cd1ff0b523ce42b446f41b63 | |
| parent | a922989347daf6f5b08f65ac6b32b09e9e838988 (diff) | |
| download | mariadb-git-67beb14625f20618d48efa7d81c889b48c53baa1.tar.gz | |
add suite.pm for oqgraph suite;fix suite.opt
| -rw-r--r-- | mysql-test/suite/oqgraph/include/have_oqgraph_engine.inc | 4 | ||||
| -rw-r--r-- | mysql-test/suite/oqgraph/suite.opt | 1 | ||||
| -rw-r--r-- | mysql-test/suite/oqgraph/suite.pm | 8 | ||||
| -rw-r--r-- | mysql-test/suite/oqgraph/t/basic.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/oqgraph/t/binlog.test | 1 | ||||
| -rw-r--r-- | mysql-test/suite/oqgraph/t/suite.opt | 1 |
6 files changed, 9 insertions, 8 deletions
diff --git a/mysql-test/suite/oqgraph/include/have_oqgraph_engine.inc b/mysql-test/suite/oqgraph/include/have_oqgraph_engine.inc deleted file mode 100644 index 6fc3c6a0632..00000000000 --- a/mysql-test/suite/oqgraph/include/have_oqgraph_engine.inc +++ /dev/null @@ -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; diff --git a/mysql-test/suite/oqgraph/suite.opt b/mysql-test/suite/oqgraph/suite.opt new file mode 100644 index 00000000000..2d93fbd24d6 --- /dev/null +++ b/mysql-test/suite/oqgraph/suite.opt @@ -0,0 +1 @@ +--plugin-load=$OQGRAPH_ENGINE_SO diff --git a/mysql-test/suite/oqgraph/suite.pm b/mysql-test/suite/oqgraph/suite.pm new file mode 100644 index 00000000000..faef9412e53 --- /dev/null +++ b/mysql-test/suite/oqgraph/suite.pm @@ -0,0 +1,8 @@ +package My::Suite::OQGraph; + +@ISA = qw(My::Suite); + +return "No OQGraph" unless $ENV{OQGRAPH_ENGINE_SO}; + +bless { }; + diff --git a/mysql-test/suite/oqgraph/t/basic.test b/mysql-test/suite/oqgraph/t/basic.test index b39341ba3d5..731f07c0eeb 100644 --- a/mysql-test/suite/oqgraph/t/basic.test +++ b/mysql-test/suite/oqgraph/t/basic.test @@ -1,5 +1,3 @@ --- source suite/oqgraph/include/have_oqgraph_engine.inc - drop table if exists graph; CREATE TABLE graph ( diff --git a/mysql-test/suite/oqgraph/t/binlog.test b/mysql-test/suite/oqgraph/t/binlog.test index ac7c8867533..7b3b6bdb8a9 100644 --- a/mysql-test/suite/oqgraph/t/binlog.test +++ b/mysql-test/suite/oqgraph/t/binlog.test @@ -1,4 +1,3 @@ --- source suite/oqgraph/include/have_oqgraph_engine.inc -- source include/have_log_bin.inc --disable_warnings diff --git a/mysql-test/suite/oqgraph/t/suite.opt b/mysql-test/suite/oqgraph/t/suite.opt deleted file mode 100644 index 05985782664..00000000000 --- a/mysql-test/suite/oqgraph/t/suite.opt +++ /dev/null @@ -1 +0,0 @@ ---plugin-load=$GRAPH_ENGINE_SO |