summaryrefslogtreecommitdiff
path: root/mysql-test/t/plugin_load-master.opt
diff options
context:
space:
mode:
authorVladislav Vaintroub <vvaintroub@mysql.com>2009-06-10 10:59:49 +0200
committerVladislav Vaintroub <vvaintroub@mysql.com>2009-06-10 10:59:49 +0200
commit768bbae90eb116349940821a1fb48920291ddd97 (patch)
tree41fa2696a71a46f4885a21cf7c58dc438a600d7a /mysql-test/t/plugin_load-master.opt
parentb6312995f1eb1478c8af30452c99e9b94b5f8185 (diff)
downloadmariadb-git-768bbae90eb116349940821a1fb48920291ddd97.tar.gz
Backport WL#3653 to 5.1 to enable bundled innodb plugin.
Remove custom DLL loader code from innodb plugin code, use symbols exported from mysqld. storage/innodb_plugin/handler/ha_innodb.cc: Remove a Win32 workaround for current_thd. The original problem that innodb plugin used value of TLS variable across DLL boundaries is solved in MySQL server (current_thd is a function not TLS variable now) storage/innodb_plugin/handler/handler0alter.cc: Remove custom delay loader storage/innodb_plugin/handler/handler0vars.h: Remove custom delay loader storage/innodb_plugin/handler/i_s.cc: Remove custom delay loader storage/innodb_plugin/handler/win_delay_loader.cc: Remove custom delay loader storage/innodb_plugin/plug.in: Remove commented out MYSQL_PLUGIN_STATIC, CMake would not parse that correctly
Diffstat (limited to 'mysql-test/t/plugin_load-master.opt')
-rw-r--r--mysql-test/t/plugin_load-master.opt2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/plugin_load-master.opt b/mysql-test/t/plugin_load-master.opt
index 66637841f16..bb7831c5769 100644
--- a/mysql-test/t/plugin_load-master.opt
+++ b/mysql-test/t/plugin_load-master.opt
@@ -1,3 +1,3 @@
$EXAMPLE_PLUGIN_OPT
-"--plugin-load=;EXAMPLE=ha_example.so;"
+$EXAMPLE_PLUGIN_LOAD
--loose-plugin-example-enum-var=e2