database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

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

Browse Source 
- 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
This commit is contained in:
unknown
2007-03-08 15:43:54 +01:00
parent b4a38b9e08
commit ea397372a3
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/mysql_system_tables_fix.sql
View File

@ -343,7 +343,7 @@ ALTER TABLE proc MODIFY name char(64) DEFAULT '' NOT NULL,
'READS_SQL_DATA', 'READS_SQL_DATA',
'MODIFIES_SQL_DATA' 'MODIFIES_SQL_DATA'
) DEFAULT 'CONTAINS_SQL' NOT NULL, ) DEFAULT 'CONTAINS_SQL' NOT NULL,
MODIFY body longblob DEFAULT '' NOT NULL, MODIFY body longblob NOT NULL,
MODIFY sql_mode MODIFY sql_mode
set('REAL_AS_FLOAT', set('REAL_AS_FLOAT',
'PIPES_AS_CONCAT', 'PIPES_AS_CONCAT',

3
sql/sql_plugin.cc
View File

@ -778,7 +778,8 @@ void plugin_load(void)
if (simple_open_n_lock_tables(new_thd, &tables)) if (simple_open_n_lock_tables(new_thd, &tables))
{ {
DBUG_PRINT("error",("Can't open plugin table")); 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; goto end;
} }
table= tables.table; table= tables.table;

3
sql/sql_udf.cc
View File

@ -145,7 +145,8 @@ void udf_init()
if (simple_open_n_lock_tables(new_thd, &tables)) if (simple_open_n_lock_tables(new_thd, &tables))
{ {
DBUG_PRINT("error",("Can't open udf table")); 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; goto end;
} }