database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

fixes to make pushbuild tests green

Browse Source 
mysql-test/t/plugin_load-master.opt:
  add '--loose' modifier to allow test to be skipped if plugin is not available.
sql/sql_plugin.cc:
  Failure to load a plugin from command line option made non-fatal as plugin
  load failures from plugin table is already non-fatal.
This commit is contained in:
unknown
2008-01-26 02:13:35 -08:00
parent f1042103e6
commit 70884e09b8
2 changed files with 3 additions and 4 deletions
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);
} }