diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-18 11:44:47 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-18 11:44:47 -0500 |
| commit | a3a91332d006fd39a32e1f6d4663e11515ea944b (patch) | |
| tree | 560c152c9f8146a4c1bcd52ad2a2fa454be48aec /mysql-test/t/union.test | |
| parent | 2805baf06c31dac21604148ec089300461790e3d (diff) | |
| download | mariadb-git-bb-10.2-mdev7635.saved.tar.gz | |
MDEV-7635: Update tests to adapt to the new default sql_modebb-10.2-mdev7635.savedbb-10.2-mdev7635.final
Diffstat (limited to 'mysql-test/t/union.test')
| -rw-r--r-- | mysql-test/t/union.test | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index 151512515b9..ecc90972563 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -582,6 +582,7 @@ drop table t1; # # parser stack overflow # +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE t1 ( ID1 int(10) unsigned NOT NULL DEFAULT '0' , ID2 datetime NOT NULL DEFAULT '0000-00-00 00:00:00' , DATA1 varchar(10) , DATA2 double(5,4) , DATA3 datetime , PRIMARY KEY (ID1,ID2)); CREATE TABLE t2 ( ID int(3) unsigned NOT NULL DEFAULT '0' , DATA1 timestamp DEFAULT '0000-00-00 00:00:00' , PRIMARY KEY (ID)); @@ -610,6 +611,7 @@ PARTITIONED_B WHERE PARTITIONED_B.ID=PARTITIONED.ID1) UNION (SELECT * FROM t1 AS PARTITIONED, t2 AS PARTITIONED_B WHERE PARTITIONED_B.ID=PARTITIONED.ID1); drop table t1,t2; +SET sql_mode = DEFAULT; # # merging ENUM and SET fields in one UNION @@ -884,10 +886,12 @@ drop table t1; # # Bug#12185: Data type aggregation may produce wrong result # +set sql_mode = 'NO_ENGINE_SUBSTITUTION'; create table t1(f1 char(1), f2 char(5), f3 binary(1), f4 binary(5), f5 timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', f6 varchar(1) character set utf8 collate utf8_general_ci, f7 text); create table t2 as select *, f6 as f8 from t1 union select *, f7 from t1; show create table t2; drop table t1, t2; +set sql_mode = default; # # Bug#18175: Union select over 129 tables with a sum function fails. |