Commit 877e11f2 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/MySQL/5.0-Bug-14765
parents 808f77f6 f4cab9f5

mysql-test/r/sql_mode.result

+4 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/t/sql_mode.test

+3 −0
Original line number Diff line number Diff line
@@ -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