bk commit into 5.1 tree (cmiller:1.2569)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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, 2007-07-18 13:37:56-04:00, cmiller@stripped +1 -0
  Re-set the plugin name so that we can be sure the plugin init()
  function doesn't set it to something else.

  sql/sql_show.cc@stripped, 2007-07-18 13:37:54-04:00, cmiller@stripped +5 -0
    Re-set the plugin name so that we can be sure the plugin init()
    function doesn't set it to something else.

diff -Nrup a/sql/sql_show.cc b/sql/sql_show.cc
--- a/sql/sql_show.cc	2007-07-18 12:27:52 -04:00
+++ b/sql/sql_show.cc	2007-07-18 13:37:54 -04:00
@@ -5904,6 +5904,8 @@ int initialize_schema_table(st_plugin_in
     schema_table->old_format= make_old_format;
     schema_table->idx_field1= -1, 
     schema_table->idx_field2= -1; 
+
+    /* Make the name available to the init() function. */
     schema_table->table_name= plugin->name.str;
 
     if (plugin->plugin->init(schema_table))
@@ -5912,6 +5914,9 @@ int initialize_schema_table(st_plugin_in
                       plugin->name.str);
       goto err;
     }
+    
+    /* Make sure the plugin name is not set inside the init() function. */
+    schema_table->table_name= plugin->name.str;
   }
 
   DBUG_RETURN(0);