Commit b2d65369 authored by unknown's avatar unknown

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

into  xiphis.org:/anubis/antony/work/bug33358.2-merge-5.1

parents f9064eb0 70884e09
$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
...@@ -1181,9 +1181,8 @@ int plugin_init(int *argc, char **argv, int flags) ...@@ -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);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment