bzr commit into mysql-6.0 branch (chad:2778)

[Chad MILLER]

#At file:///home/cmiller/work/mysqlbzr/mysql-6.0-bugteam/

 2778 Chad MILLER	2008-08-18 [merge]
      Merge from local 5.1-bugteam.
modified:
  sql/sql_show.cc

=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2008-08-15 21:14:52 +0000
+++ b/sql/sql_show.cc	2008-08-18 16:17:48 +0000
@@ -7070,17 +7070,15 @@ int initialize_schema_table(st_plugin_in
     {
       sql_print_error("Plugin '%s' init function returned error.",
                       plugin->name.str);
-      goto err;
+      plugin->data= NULL;
+      my_free(schema_table, MYF(0));
+      DBUG_RETURN(1);
     }
 
     /* Make sure the plugin name is not set inside the init() function. */
     schema_table->table_name= plugin->name.str;
   }
-
   DBUG_RETURN(0);
-err:
-  my_free(schema_table, MYF(0));
-  DBUG_RETURN(1);
 }
 
 int finalize_schema_table(st_plugin_int *plugin)