Commit ea397372 authored by unknown's avatar unknown

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
parent b4a38b9e
......@@ -343,7 +343,7 @@ ALTER TABLE proc MODIFY name char(64) DEFAULT '' NOT NULL,
'READS_SQL_DATA',
'MODIFIES_SQL_DATA'
) DEFAULT 'CONTAINS_SQL' NOT NULL,
MODIFY body longblob DEFAULT '' NOT NULL,
MODIFY body longblob NOT NULL,
MODIFY sql_mode
set('REAL_AS_FLOAT',
'PIPES_AS_CONCAT',
......
......@@ -778,7 +778,8 @@ 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_upgrade script to create it.");
sql_print_error("Can't open the mysql.plugin table. Please "
"run mysql_upgrade to create it.");
goto end;
}
table= tables.table;
......
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment