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

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

Merge xiphis.org:/anubis/antony/work/bug33358.2
into xiphis.org:/anubis/antony/work/bug33358.2-merge-5.1
e70f8dc4 · acurtis/antony@ltamd64.xiphis.org · 8629f2e3 · 82839a0b · e70f8dc4 · e70f8dc4
Commit e70f8dc4 authored Jan 26, 2008 by acurtis/antony@ltamd64.xiphis.org
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

mysql-test/t/plugin_load-master.opt mysql-test/t/plugin_load-master.opt +1 -1

sql/sql_plugin.cc sql/sql_plugin.cc +2 -3

No files found.
--- a/mysql-test/t/plugin_load-master.opt
+++ b/mysql-test/t/plugin_load-master.opt
 $EXAMPLE_PLUGIN_OPT
 "--plugin-load=;EXAMPLE=ha_example.so;"
--plugin-example-enum-var=e2
+--loose-plugin-example-enum-var=e2
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -1181,9 +1181,8 @@ int plugin_init(int *argc, char **argv, int flags)
  /* Register all dynamic plugins */
  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))
      plugin_load(&tmp_root, argc, argv);
  }