bk commit into 5.1 tree (davi:1.2566) BUG#35824

[Davi Arnaut]

Below is the list of changes that have just been committed into a local
5.1 repository of davi.  When davi 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, 2008-04-04 13:46:05-03:00, davi@stripped +1 -0
  Bug#35824: mysql_upgrade does not fix scheduler tables when upgrading from 5.1.23 to
5.1.24
  
  The problem is that when upgrading the event table, the sql_mode
  column was always being added instead of being updated to list new
  sql_mode values, causing upgrades of the event which already have
  a sql_mode column to not be updated to the new sql_mode values.
  
  The solution is to always add first a stub sql_mode column and
  subsequently update the column to the new sql_mode values.

  scripts/mysql_system_tables_fix.sql@stripped, 2008-04-04 13:46:02-03:00, davi@stripped +4
-1
    Always add and update the sql_mode column of the event table.

diff -Nrup a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql
--- a/scripts/mysql_system_tables_fix.sql	2008-02-07 08:47:37 -02:00
+++ b/scripts/mysql_system_tables_fix.sql	2008-04-04 13:46:02 -03:00
@@ -433,7 +433,10 @@ ALTER TABLE db MODIFY Event_priv enum('N
 #
 ALTER TABLE event DROP PRIMARY KEY;
 ALTER TABLE event ADD PRIMARY KEY(db, name);
-ALTER TABLE event ADD sql_mode
+# Add sql_mode column just in case.
+ALTER TABLE event ADD sql_mode set ('NOT_USED') AFTER on_completion;
+# Update list of sql_mode values.
+ALTER TABLE event MODIFY sql_mode
                         set('REAL_AS_FLOAT',
                             'PIPES_AS_CONCAT',
                             'ANSI_QUOTES',