bk commit into 5.1 tree (gluh:1.2189) BUG#17568

[gluh]

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh 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
  1.2189 06/02/28 12:42:06 gluh@stripped +2 -0
  bug#17568 mysql_fix_privilege_tables doesn't create mysql.plugin
   'mysql_install_db' changed to 'mysql_upgrade' in error message
   

  sql/sql_udf.cc
    1.60 06/02/28 12:40:19 gluh@stripped +1 -1
    bug#17568 mysql_fix_privilege_tables doesn't create mysql.plugin
     'mysql_install_db' changed to 'mysql_upgrade' in error message
     

  sql/sql_plugin.cc
    1.15 06/02/28 12:40:19 gluh@stripped +1 -1
    bug#17568 mysql_fix_privilege_tables doesn't create mysql.plugin
     'mysql_install_db' changed to 'mysql_upgrade' in error message
     

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Bugs/5.1.17568

--- 1.59/sql/sql_udf.cc	Thu Dec 22 08:10:53 2005
+++ 1.60/sql/sql_udf.cc	Tue Feb 28 12:40:19 2006
@@ -146,7 +146,7 @@ void udf_init()
   if (simple_open_n_lock_tables(new_thd, &tables))
   {
     DBUG_PRINT("error",("Can't open udf table"));
-    sql_print_error("Can't open the mysql.func table. Please run the mysql_install_db
script to create it.");
+    sql_print_error("Can't open the mysql.func table. Please run the mysql_upgrade script
to create it.");
     goto end;
   }
 

--- 1.14/sql/sql_plugin.cc	Sat Feb 18 04:06:03 2006
+++ 1.15/sql/sql_plugin.cc	Tue Feb 28 12:40:19 2006
@@ -681,7 +681,7 @@ void plugin_load(void)
   if (simple_open_n_lock_tables(new_thd, &tables))
   {
     DBUG_PRINT("error",("Can't open plugin table"));
-    sql_print_error("Can't open the mysql.plugin table. Please run the mysql_install_db
script to create it.");
+    sql_print_error("Can't open the mysql.plugin table. Please run the mysql_upgrade
script to create it.");
     goto end;
   }
   table= tables.table;