From 149ecabb503e13cf72f92a1cdab9876f499c2767 Mon Sep 17 00:00:00 2001
From: "gluh@eagle.intranet.mysql.r18.ru" <>
Date: Tue, 28 Feb 2006 12:42:06 +0400
Subject: [PATCH] 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 | 2 +-
 sql/sql_udf.cc    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 2046596c428..ad99d81d7b4 100644
--- a/sql/sql_plugin.cc
+++ b/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;
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc
index 77bfba5ba28..5d73c139279 100644
--- a/sql/sql_udf.cc
+++ b/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;
   }