bk commit into 5.1 tree (msvensson:1.2498)

[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-05-19 18:15:40+02:00, msvensson@stripped +3 -0
  Merge pilot.blaudden:/home/msvensson/mysql/bug28401/my50-bug28401
  into  pilot.blaudden:/home/msvensson/mysql/bug28401/my51-bug28401
  MERGE: 1.1810.2939.2

  mysql-test/r/mysql_upgrade.result@stripped, 2007-05-19 18:15:37+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.1.1.5

  mysql-test/t/mysql_upgrade.test@stripped, 2007-05-19 18:15:37+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.4.1.4

  scripts/mysql_system_tables_fix.sql@stripped, 2007-05-19 18:15:37+02:00, msvensson@stripped +0 -1
    Auto merged
    MERGE: 1.9.1.36

# 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/bug28401/my51-bug28401/RESYNC

--- 1.11/mysql-test/r/mysql_upgrade.result	2007-04-19 21:35:24 +02:00
+++ 1.12/mysql-test/r/mysql_upgrade.result	2007-05-19 18:15:37 +02:00
@@ -78,3 +78,22 @@ DROP USER mysqltest1@'%';
 Run mysql_upgrade with a non existing server socket
 mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect
 FATAL ERROR: Upgrade failed
+set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE';
+mysql.columns_priv                                 OK
+mysql.db                                           OK
+mysql.func                                         OK
+mysql.help_category                                OK
+mysql.help_keyword                                 OK
+mysql.help_relation                                OK
+mysql.help_topic                                   OK
+mysql.host                                         OK
+mysql.proc                                         OK
+mysql.procs_priv                                   OK
+mysql.tables_priv                                  OK
+mysql.time_zone                                    OK
+mysql.time_zone_leap_second                        OK
+mysql.time_zone_name                               OK
+mysql.time_zone_transition                         OK
+mysql.time_zone_transition_type                    OK
+mysql.user                                         OK
+set GLOBAL sql_mode=default;

--- 1.8/mysql-test/t/mysql_upgrade.test	2007-04-24 11:21:38 +02:00
+++ 1.9/mysql-test/t/mysql_upgrade.test	2007-05-19 18:15:37 +02:00
@@ -55,3 +55,16 @@ DROP USER mysqltest1@'%';
 --replace_regex /.*mysqlcheck.*: Got/mysqlcheck: Got/ /\([0-9]*\)/(errno)/
 --error 1
 --exec $MYSQL_UPGRADE --skip-verbose --force --host=not_existing_host 2>&1
+
+#
+# Bug #28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE
+#
+
+# The SQL commands used by mysql_upgrade are written to be run
+# with sql_mode set to '' - thus the scripts should change sql_mode
+# for the session to make sure the SQL is legal.
+
+# Test by setting sql_mode before running mysql_upgrade
+set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE';
+--exec $MYSQL_UPGRADE --skip-verbose --force 2>&1
+eval set GLOBAL sql_mode=default;