summaryrefslogtreecommitdiff
path: root/mysql-test/t/flush_read_lock.test
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2015-08-11 18:45:38 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2015-08-11 18:45:38 +0200
commit76d6ac448d18a9e97ce4be585d79607780e00a49 (patch)
tree4a469019460057da12977d7ee6817f3873ac607d /mysql-test/t/flush_read_lock.test
parentba230c21adcfc6e6a6174ff25d8a8aebd1a70f0a (diff)
downloadmariadb-git-bb-10.1-MDEV-6066.tar.gz
MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be stopped with no-zero size)bb-10.1-MDEV-6066
Diffstat (limited to 'mysql-test/t/flush_read_lock.test')
-rw-r--r--mysql-test/t/flush_read_lock.test3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/t/flush_read_lock.test b/mysql-test/t/flush_read_lock.test
index e8ec07392b5..7ba80ea38ac 100644
--- a/mysql-test/t/flush_read_lock.test
+++ b/mysql-test/t/flush_read_lock.test
@@ -13,6 +13,8 @@
# Save the initial number of concurrent sessions.
--source include/count_sessions.inc
+set global sql_mode="";
+set local sql_mode="";
--echo # FTWRL takes two global metadata locks -- a global shared
--echo # metadata lock and the commit blocker lock.
--echo # The first lock prevents DDL from taking place.
@@ -2161,6 +2163,7 @@ disconnect con1;
disconnect con2;
disconnect con3;
+set global sql_mode=default;
# Check that all connections opened by test cases in this file are really
# gone so execution of other tests won't be affected by their presence.
--source include/wait_until_count_sessions.inc