From 82839a0bbb0e33fffbf7a8905aa9566eb7d185a6 Mon Sep 17 00:00:00 2001
From: "acurtis/antony@xiphis.org/ltamd64.xiphis.org" <>
Date: Sat, 26 Jan 2008 02:13:35 -0800
Subject: [PATCH] fixes to make pushbuild tests green

---
 mysql-test/t/plugin_load-master.opt | 2 +-
 sql/sql_plugin.cc                   | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/mysql-test/t/plugin_load-master.opt b/mysql-test/t/plugin_load-master.opt
index 34186aab890..66637841f16 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;"
---plugin-example-enum-var=e2
+--loose-plugin-example-enum-var=e2
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 8e204eb3d51..bae4a85fd8a 100644
--- 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 &&
-        plugin_load_list(&tmp_root, argc, argv, opt_plugin_load))
-      goto err;
+    if (opt_plugin_load)
+      plugin_load_list(&tmp_root, argc, argv, opt_plugin_load);
     if (!(flags & PLUGIN_INIT_SKIP_PLUGIN_TABLE))
       plugin_load(&tmp_root, argc, argv);
   }