summaryrefslogtreecommitdiff
path: root/storage/tokudb/mysql-test/tokudb_bugs/t
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2017-02-08 15:28:00 -0500
committerNirbhay Choubey <nirbhay@mariadb.com>2017-02-10 06:30:42 -0500
commit8b2e642aa214db729161252b96f36bfbae3add21 (patch)
tree006dcc588623c7c7ee508eca3534259f62244f2c /storage/tokudb/mysql-test/tokudb_bugs/t
parentf556aa9b5f3685dfcf1b365d2461316cbd16e169 (diff)
downloadmariadb-git-8b2e642aa214db729161252b96f36bfbae3add21.tar.gz
MDEV-7635: Update tests to adapt to the new default sql_mode
Diffstat (limited to 'storage/tokudb/mysql-test/tokudb_bugs/t')
-rw-r--r--storage/tokudb/mysql-test/tokudb_bugs/t/alter_table_copy_table.test1
-rw-r--r--storage/tokudb/mysql-test/tokudb_bugs/t/db397_delete_trigger.test2
-rw-r--r--storage/tokudb/mysql-test/tokudb_bugs/t/db945.test2
3 files changed, 4 insertions, 1 deletions
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/alter_table_copy_table.test b/storage/tokudb/mysql-test/tokudb_bugs/t/alter_table_copy_table.test
index 6e4433183b0..0c85115bd20 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/t/alter_table_copy_table.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/alter_table_copy_table.test
@@ -8,5 +8,6 @@ set default_storage_engine=tokudb;
create table t (id int, x char(2), primary key (id), unique key (x));
insert into t values (1,'aa'),(2,'ab');
--error 1062
+set statement sql_mode = '' for
alter table t modify x char(1);
drop table t; \ No newline at end of file
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/db397_delete_trigger.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db397_delete_trigger.test
index 79043664607..dfd935b17ff 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/t/db397_delete_trigger.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db397_delete_trigger.test
@@ -20,6 +20,7 @@ insert into t1 (col1,col2) values (0,0);
insert into t1_audit (col1,action) values (0,'DUMMY');
set local tokudb_prelock_empty=0;
+set statement sql_mode = '' for
create trigger t1_trigger before delete on t1
for each row
insert into t1_audit (col1, action) values (old.col1, 'BEFORE DELETE');
@@ -33,6 +34,7 @@ select locks_dname,locks_key_left,locks_key_right from information_schema.tokudb
commit;
drop trigger t1_trigger;
+set statement sql_mode = '' for
create trigger t1_trigger after delete on t1
for each row
insert into t1_audit (col1, action) values (old.col1, 'AFTER DELETE');
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/db945.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db945.test
index 27b0d284484..c7774877291 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/t/db945.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db945.test
@@ -12,7 +12,7 @@ set session tokudb_analyze_time = 0;
create table t1(a int, b text(1), c text(1), filler text(1), primary key(a, b(1)), unique key (a, c(1)));
lock tables t1 write, t1 as a read, t1 as b read;
-insert into t1(a) values(1);
+insert ignore into t1(a) values(1);
alter table t1 drop key a;
unlock tables;