diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-08 15:43:54 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-08 15:43:54 +0100 |
| commit | ea397372a36f21d1617844e0b276ec527aa31fdf (patch) | |
| tree | 0c0266c64f3ed9631158adfd9b13fa604299010e | |
| parent | b4a38b9e08646dd74f50fd7f42a9baa5da29784d (diff) | |
| download | mariadb-git-ea397372a36f21d1617844e0b276ec527aa31fdf.tar.gz | |
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
| -rw-r--r-- | scripts/mysql_system_tables_fix.sql | 2 | ||||
| -rw-r--r-- | sql/sql_plugin.cc | 3 | ||||
| -rw-r--r-- | sql/sql_udf.cc | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql index a35cc00d132..27c0f3b5bd4 100644 --- a/scripts/mysql_system_tables_fix.sql +++ b/scripts/mysql_system_tables_fix.sql @@ -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', diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index e3e24c1f375..fff324e139c 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -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; 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; } |