bk commit into 5.1 tree (msvensson:1.2470) BUG#24248

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-08 15:43:54+01:00, msvensson@stripped +3 -0
  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@stripped, 2007-03-08 15:43:53+01:00,
msvensson@stripped +1 -1
    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@stripped, 2007-03-08 15:43:53+01:00, msvensson@stripped +2 -1
    Update error message to indicate that "mysql_upgrade" should
    be used to correct the problem

  sql/sql_udf.cc@stripped, 2007-03-08 15:43:53+01:00, msvensson@stripped +2 -1
    Update error message to indicate that "mysql_upgrade" should
    be used to correct the problem

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/my51-m-mysql_upgrade

--- 1.70/sql/sql_udf.cc	2007-01-08 11:32:41 +01:00
+++ 1.71/sql/sql_udf.cc	2007-03-08 15:43:53 +01:00
@@ -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;
   }
 

--- 1.44/sql/sql_plugin.cc	2007-02-02 23:22:15 +01:00
+++ 1.45/sql/sql_plugin.cc	2007-03-08 15:43:53 +01:00
@@ -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;

--- 1.59/scripts/mysql_system_tables_fix.sql	2007-02-28 14:40:05 +01:00
+++ 1.60/scripts/mysql_system_tables_fix.sql	2007-03-08 15:43:53 +01:00
@@ -343,7 +343,7 @@ ALTER TABLE proc MODIFY name char(64) DE
                              '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',