diff options
| author | unknown <lars@mysql.com> | 2006-06-21 14:14:37 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2006-06-21 14:14:37 +0200 |
| commit | 6bf7ada5c3019bd918ae4c799bd5773b8800b58c (patch) | |
| tree | 9671f0a6dbd74ace568b9ddaf71d33b8468eba2e /mysql-test/t/sql_mode.test | |
| parent | cffb1699bf63c3a599d9f7ba535d4ae87c835088 (diff) | |
| parent | ac67bfd7f7500569fe4adeaf67c7ac5cfd7c1727 (diff) | |
| download | mariadb-git-6bf7ada5c3019bd918ae4c799bd5773b8800b58c.tar.gz | |
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
mysql-test/r/sql_mode.result:
Auto merged
mysql-test/t/sql_mode.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
client/mysqldump.c:
Manual merge
mysql-test/r/mysqldump.result:
Manual merge
mysql-test/t/mysqldump.test:
Manual merge
Diffstat (limited to 'mysql-test/t/sql_mode.test')
| -rw-r--r-- | mysql-test/t/sql_mode.test | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/t/sql_mode.test b/mysql-test/t/sql_mode.test index b4225ef8c4e..8542c2b7927 100644 --- 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 |