bk commit into 5.1 tree (acurtis:1.2660)

[antony]

Below is the list of changes that have just been committed into a local
5.1 repository of acurtis.  When acurtis does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-01-26 02:13:35-08:00, acurtis@stripped +2 -0
  fixes to make pushbuild tests green

  mysql-test/t/plugin_load-master.opt@stripped, 2008-01-26 02:13:31-08:00, acurtis@stripped
+1 -1
    add '--loose' modifier to allow test to be skipped if plugin is not available.

  sql/sql_plugin.cc@stripped, 2008-01-26 02:13:31-08:00, acurtis@stripped +2 -3
    Failure to load a plugin from command line option made non-fatal as plugin
    load failures from plugin table is already non-fatal.

diff -Nrup a/mysql-test/t/plugin_load-master.opt b/mysql-test/t/plugin_load-master.opt
--- a/mysql-test/t/plugin_load-master.opt	2008-01-25 16:04:59 -08:00
+++ b/mysql-test/t/plugin_load-master.opt	2008-01-26 02:13:31 -08:00
@@ -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 -Nrup a/sql/sql_plugin.cc b/sql/sql_plugin.cc
--- a/sql/sql_plugin.cc	2008-01-25 16:04:59 -08:00
+++ b/sql/sql_plugin.cc	2008-01-26 02:13:31 -08:00
@@ -1181,9 +1181,8 @@ int plugin_init(int *argc, char **argv, 
   /* 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);
   }