diff options
author | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-02-08 15:28:00 -0500 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-02-10 06:30:42 -0500 |
commit | 8b2e642aa214db729161252b96f36bfbae3add21 (patch) | |
tree | 006dcc588623c7c7ee508eca3534259f62244f2c /mysql-test/suite/maria/maria.test | |
parent | f556aa9b5f3685dfcf1b365d2461316cbd16e169 (diff) | |
download | mariadb-git-8b2e642aa214db729161252b96f36bfbae3add21.tar.gz |
MDEV-7635: Update tests to adapt to the new default sql_mode
Diffstat (limited to 'mysql-test/suite/maria/maria.test')
-rw-r--r-- | mysql-test/suite/maria/maria.test | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/suite/maria/maria.test b/mysql-test/suite/maria/maria.test index 68276fc507d..1b930a22c35 100644 --- a/mysql-test/suite/maria/maria.test +++ b/mysql-test/suite/maria/maria.test @@ -65,7 +65,7 @@ disable_query_log; SET SQL_WARNINGS=0; while ($1) { - eval insert into t1 (b) values(repeat(char(65+$1),65550-$1)); + eval insert ignore into t1 (b) values(repeat(char(65+$1),65550-$1)); dec $1; } SET SQL_WARNINGS=1; @@ -921,9 +921,11 @@ source include/varchar.inc; create table t1 (v varchar(65530), key(v)); drop table if exists t1; +set statement sql_mode = 'NO_ENGINE_SUBSTITUTION' for create table t1 (v varchar(65536)); show create table t1; drop table t1; +set statement sql_mode = 'NO_ENGINE_SUBSTITUTION' for create table t1 (v varchar(65530) character set utf8); show create table t1; drop table t1; @@ -1880,9 +1882,11 @@ drop table t1; # create table t1(a int primary key, b blob, c blob) engine=aria; +set sql_mode=''; insert into t1 values(1,repeat('a',100), repeat('b',657860)); --error ER_DUP_ENTRY insert into t1 values(1,repeat('a',100), repeat('b',657860)); +set sql_mode=default; check table t1; drop table t1; |