mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge xiphis.org:/anubis/antony/work/bug33358.2

Browse source 
into  xiphis.org:/anubis/antony/work/bug33358.2-merge-5.1
This commit is contained in:
acurtis/antony@ltamd64.xiphis.org 2008-01-26 02:16:29 -08:00
commit e70f8dc417
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/t/plugin_load-master.opt
View file

@ -1,3 +1,3 @@
$EXAMPLE_PLUGIN_OPT $EXAMPLE_PLUGIN_OPT
"--plugin-load=;EXAMPLE=ha_example.so;" "--plugin-load=;EXAMPLE=ha_example.so;"
--plugin-example-enum-var=e2 --loose-plugin-example-enum-var=e2

5
sql/sql_plugin.cc
View file

@ -1181,9 +1181,8 @@ int plugin_init(int *argc, char **argv, int flags)
/* Register all dynamic plugins */ /* Register all dynamic plugins */
if (!(flags & PLUGIN_INIT_SKIP_DYNAMIC_LOADING)) if (!(flags & PLUGIN_INIT_SKIP_DYNAMIC_LOADING))
{ {
if (opt_plugin_load && if (opt_plugin_load)
plugin_load_list(&tmp_root, argc, argv, opt_plugin_load)) plugin_load_list(&tmp_root, argc, argv, opt_plugin_load);
goto err;
if (!(flags & PLUGIN_INIT_SKIP_PLUGIN_TABLE)) if (!(flags & PLUGIN_INIT_SKIP_PLUGIN_TABLE))
plugin_load(&tmp_root, argc, argv); plugin_load(&tmp_root, argc, argv);
} }