Bug#24248 Problem updating from 5.0.15 to 5.1.12 running under Win XP SP2

 - Fix error message to say that "mysql_upgrade" should be run when
 a particular error message is found to be missing
 - Dont's set default value on blob's - it will not be used anyway.


scripts/mysql_system_tables_fix.sql:
  Don't set a DEFAULT value on blob - depending on sql_mode it
  will either be dicarded or throw an error message. But never used.
sql/sql_plugin.cc:
  Update error message to indicate that "mysql_upgrade" should
  be used to correct the problem
sql/sql_udf.cc:
  Update error message to indicate that "mysql_upgrade" should
  be used to correct the problem

1 files changed, 2 insertions, 1 deletions

diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc
index 7dec58d9b6e..cacfdd5adf8 100644
--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.cc
@@ -145,7 +145,8 @@ 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_upgrade script to create it.");
+    sql_print_error("Can't open the mysql.func table. Please "
+                    "run mysql_upgrade to create it.");
     goto end;
   }