diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-04-04 13:38:57 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-04-04 13:38:57 +0300 |
| commit | 89aa5548cea2c107049e40ef5e50696ac0194a23 (patch) | |
| tree | 6ca3d12f139041018ca0b5b2f5d978e0eaff1fcc | |
| parent | 7603ed9f27db8d6a66dd05b87a65481b5c106d8b (diff) | |
| parent | dbd125fd909c531b2296a7bd90283d259a62fb59 (diff) | |
| download | mariadb-git-89aa5548cea2c107049e40ef5e50696ac0194a23.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/B27513-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B27513-5.0-opt
| -rw-r--r-- | mysql-test/r/errors.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/errors.test | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/mysql-test/r/errors.result b/mysql-test/r/errors.result index 0b12853ab80..94debb1785f 100644 --- a/mysql-test/r/errors.result +++ b/mysql-test/r/errors.result @@ -28,21 +28,16 @@ ERROR 42000: Display width out of range for column 'a' (max = 255) set sql_mode='traditional'; create table t1 (a varchar(66000)); ERROR 42000: Column length too big for column 'a' (max = 65535); use BLOB or TEXT instead +set sql_mode=default; CREATE TABLE t1 (a INT); SELECT a FROM t1 WHERE a IN(1, (SELECT IF(1=0,1,2/0))); a -Warnings: -Error 1365 Division by 0 INSERT INTO t1 VALUES(1); SELECT a FROM t1 WHERE a IN(1, (SELECT IF(1=0,1,2/0))); a 1 -Warnings: -Error 1365 Division by 0 INSERT INTO t1 VALUES(2),(3); SELECT a FROM t1 WHERE a IN(1, (SELECT IF(1=0,1,2/0))); a 1 -Warnings: -Error 1365 Division by 0 DROP TABLE t1; diff --git a/mysql-test/t/errors.test b/mysql-test/t/errors.test index 6ddef2a8c08..4fbdcba635f 100644 --- a/mysql-test/t/errors.test +++ b/mysql-test/t/errors.test @@ -40,6 +40,7 @@ create table t1 (a int(256)); set sql_mode='traditional'; --error 1074 create table t1 (a varchar(66000)); +set sql_mode=default; # # Bug #27513: mysql 5.0.x + NULL pointer DoS |