Merge mysql.com:/home/MySQL/5.0-Bug-14765.old

into mysql.com:/home/MySQL/5.0-Bug-14765

Merge mysql.com:/home/MySQL/5.0-Bug-14765.old
into mysql.com:/home/MySQL/5.0-Bug-14765
877e11f2 · unknown · 808f77f6 · f4cab9f5 · 877e11f2 · 877e11f2
Commit 877e11f2 authored May 19, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

mysql-test/r/sql_mode.result mysql-test/r/sql_mode.result +4 -0

mysql-test/t/sql_mode.test mysql-test/t/sql_mode.test +3 -0

No files found.
--- a/mysql-test/r/sql_mode.result
+++ b/mysql-test/r/sql_mode.result
@@ -485,6 +485,10 @@ set sql_mode=2097152;
 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

--- a/mysql-test/t/sql_mode.test
+++ b/mysql-test/t/sql_mode.test
@@ -258,6 +258,9 @@ drop table t1, t2;
 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