summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorSergey Glukhov <gluh@mysql.com>2009-02-09 19:03:52 +0400
committerSergey Glukhov <gluh@mysql.com>2009-02-09 19:03:52 +0400
commit4d0557a2e6e2f79e3662d3f10ea17656cf69ca12 (patch)
treee1a70de16466fc1105587d75908a1b3c3811044c /mysql-test/t
parent461cad77b4e068ecc2534150170a029e6f425407 (diff)
downloadmariadb-git-4d0557a2e6e2f79e3662d3f10ea17656cf69ca12.tar.gz
Bug#42610 Dynamic plugin broken in 5.1.31
added ignore-builtin-innodb option which disabled initialization of builtin InnoDB plugin mysql-test/r/innodb_ignore_builtin.result: test case mysql-test/t/innodb_ignore_builtin-master.opt: test case mysql-test/t/innodb_ignore_builtin.test: test case sql/mysql_priv.h: added ignore-builtin-innodb option which disabled initialization of builtin InnoDB plugin sql/mysqld.cc: added ignore-builtin-innodb option which disabled initialization of builtin InnoDB plugin sql/set_var.cc: added ignore-builtin-innodb option which disabled initialization of builtin InnoDB plugin sql/sql_plugin.cc: added ignore-builtin-innodb option which disabled initialization of builtin InnoDB plugin
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/innodb_ignore_builtin-master.opt1
-rw-r--r--mysql-test/t/innodb_ignore_builtin.test8
2 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/t/innodb_ignore_builtin-master.opt b/mysql-test/t/innodb_ignore_builtin-master.opt
new file mode 100644
index 00000000000..f7289eed20e
--- /dev/null
+++ b/mysql-test/t/innodb_ignore_builtin-master.opt
@@ -0,0 +1 @@
+--ignore_builtin_innodb
diff --git a/mysql-test/t/innodb_ignore_builtin.test b/mysql-test/t/innodb_ignore_builtin.test
new file mode 100644
index 00000000000..6f987bcf891
--- /dev/null
+++ b/mysql-test/t/innodb_ignore_builtin.test
@@ -0,0 +1,8 @@
+#
+# Bug #42610: Dynamic plugin broken in 5.1.31
+#
+show variables like 'ignore_builtin_innodb';
+select PLUGIN_NAME from information_schema.plugins
+where PLUGIN_NAME = "InnoDb";
+select ENGINE from information_schema.engines
+where ENGINE = "InnoDB";