summaryrefslogtreecommitdiff
path: root/mysql-test/main/flush.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/main/flush.test')
-rw-r--r--mysql-test/main/flush.test10
1 files changed, 7 insertions, 3 deletions
diff --git a/mysql-test/main/flush.test b/mysql-test/main/flush.test
index 6d76196bf54..c324a839d77 100644
--- a/mysql-test/main/flush.test
+++ b/mysql-test/main/flush.test
@@ -1,3 +1,5 @@
+--disable_service_connection
+
connect (con1,localhost,root,,);
connect (con2,localhost,root,,);
connection con1;
@@ -420,6 +422,7 @@ drop table t1;
--echo # Bug#52117 Pending FLUSH TALBES <list> aborts
--echo # transactions unnecessarily.
--echo #
+--disable_view_protocol
--disable_warnings
drop table if exists t1;
--enable_warnings
@@ -495,7 +498,7 @@ disconnect con2;
--source include/wait_until_disconnected.inc
connection default;
drop table t1;
-
+--enable_view_protocol
--echo #
--echo # Test for bug #55273 "FLUSH TABLE tm WITH READ LOCK for Merge table
@@ -533,6 +536,7 @@ drop tables tm, t1, t2;
--echo # Test for bug #57006 "Deadlock between HANDLER and
--echo # FLUSH TABLES WITH READ LOCK".
--echo #
+--disable_view_protocol
--disable_warnings
drop table if exists t1, t2;
--enable_warnings
@@ -575,7 +579,7 @@ disconnect con2;
--source include/wait_until_disconnected.inc
connection default;
drop tables t1, t2;
-
+--enable_view_protocol
--echo #
--echo # Bug#57649 FLUSH TABLES under FLUSH TABLES <list> WITH READ LOCK leads
@@ -668,7 +672,7 @@ UNLOCK TABLES;
DROP VIEW v1;
DROP TABLE t1;
-
+--enable_service_connection
--echo #
--echo # Test FLUSH THREADS
--echo #