bk commit into 5.0 tree (grog:1.2099) BUG#14765

[Greg Lehey]

Below is the list of changes that have just been committed into a local
5.0 repository of grog. When grog 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
  1.2099 06/04/27 21:59:04 grog@stripped +2 -0
  sql_mode.test:
    BUG#14765: Modified test file.
  sql_mode.result:
    BUG#14765: Modified result file.

  mysql-test/t/sql_mode.test
    1.18 06/04/27 21:58:12 grog@stripped +3 -0
    BUG#14765: Modified test file.

  mysql-test/r/sql_mode.result
    1.35 06/04/27 21:57:46 grog@stripped +4 -0
    BUG#14765: Modified result file.

# 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:	grog
# Host:	eucla.lemis.com
# Root:	/home/MySQL/5.0-Bug-14765

--- 1.34/mysql-test/r/sql_mode.result	2006-03-02 22:48:45 +10:30
+++ 1.35/mysql-test/r/sql_mode.result	2006-04-27 21:57:46 +09:30
@@ -485,6 +485,10 @@
 select @@sql_mode;
 @@sql_mode
 STRICT_TRANS_TABLES
+set sql_mode=4194304;
+select @@sql_mode;
+@@sql_mode
+STRICT_ALL_TABLES
 set sql_mode=16384+(65536*4);
 select @@sql_mode;
 @@sql_mode

--- 1.17/mysql-test/t/sql_mode.test	2006-02-19 03:02:11 +10:30
+++ 1.18/mysql-test/t/sql_mode.test	2006-04-27 21:58:12 +09:30
@@ -258,6 +258,9 @@
 select @@sql_mode;
 set sql_mode=2097152;
 select @@sql_mode;
+# BUG#14675
+set sql_mode=4194304;
+select @@sql_mode;
 set sql_mode=16384+(65536*4);
 select @@sql_mode;
 --error 1231