summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorVasil Dimov <vasil.dimov@oracle.com>2010-04-09 15:56:51 +0300
committerVasil Dimov <vasil.dimov@oracle.com>2010-04-09 15:56:51 +0300
commit5a0e20715d9865a51f99ee3755ec999b5f503de3 (patch)
treed86424395c37b89ef713af72cfb8fb6c3b5fc197 /mysql-test/include
parent6e24349e985a62b8c908bae8928270a094e0fdf1 (diff)
downloadmariadb-git-5a0e20715d9865a51f99ee3755ec999b5f503de3.tar.gz
Move the InnoDB Plugin tests from storage/innodb_plugin/mysql-test/ where
they are ignored to a new test suite "innodb_plugin". Remove a hack in mtr that was deployed to run the builtin InnoDB tests against the InnoDB Plugin. Also detect if a test is an 'innodb plugin test' and if so then transparently replace the builtin InnoDB with the InnoDB Plugin.
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/have_innodb_plugin.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/include/have_innodb_plugin.inc b/mysql-test/include/have_innodb_plugin.inc
new file mode 100644
index 00000000000..99a79465f52
--- /dev/null
+++ b/mysql-test/include/have_innodb_plugin.inc
@@ -0,0 +1,4 @@
+disable_query_log;
+--require r/true.require
+SELECT (plugin_library LIKE 'ha_innodb_plugin%') AS `TRUE` FROM information_schema.plugins WHERE LOWER(plugin_name) = 'innodb' AND LOWER(plugin_status) = 'active';
+enable_query_log;