Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into mysql.com:/home/gluh/MySQL/Bugs/5.1.17568

sql/sql_plugin.cc

@@ -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;

sql/sql_udf.cc

@@ -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;
   }