summaryrefslogtreecommitdiff
path: root/mysql-test/t/show_check.test
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2016-03-25 20:51:22 +0400
committerSergey Vojtovich <svoj@mariadb.org>2016-03-31 10:11:16 +0400
commit282497dd6d1049b4fb963641504c2733752845a7 (patch)
tree7288d17c29fbbe9ac47ec51f6988fb954f59a361 /mysql-test/t/show_check.test
parent5052e2479e873461bebfcedbc674bbaf57d3c968 (diff)
downloadmariadb-git-282497dd6d1049b4fb963641504c2733752845a7.tar.gz
MDEV-6720 - enable connection log in mysqltest by default
Diffstat (limited to 'mysql-test/t/show_check.test')
-rw-r--r--mysql-test/t/show_check.test12
1 files changed, 0 insertions, 12 deletions
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index d9aed952fce..a14c42d8ade 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -1232,7 +1232,6 @@ connection default;
CREATE TABLE t1 (i INT PRIMARY KEY);
LOCK TABLE t1 WRITE;
---echo # Switching to connection 'con1'.
connection con1;
--echo # This statement used to be blocked.
SHOW CREATE TABLE t1;
@@ -1240,7 +1239,6 @@ SHOW CREATE TABLE t1;
disconnect con1;
--source include/wait_until_disconnected.inc
---echo # Switching to connection 'default'.
connection default;
UNLOCK TABLES;
DROP TABLE t1;
@@ -1257,22 +1255,18 @@ DROP TABLE IF EXISTS t1;
CREATE TABLE t1(a INT);
---echo # Connection con1
connect (con1,localhost,root);
LOCK TABLE t1 WRITE;
---echo # Connection default
connection default;
START TRANSACTION;
SHOW CREATE TABLE t1;
---echo # Connection con1
connection con1;
# Used to block
ALTER TABLE t1 CHARACTER SET = utf8;
UNLOCK TABLES;
---echo # Connection default
connection default;
COMMIT;
disconnect con1;
@@ -1292,27 +1286,22 @@ CREATE TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW SET new.a = 1;
--echo # Test 1: SHOW CREATE TRIGGER with WRITE locked table.
---echo # Connection con1
connect (con1, localhost, root);
LOCK TABLE t1 WRITE;
---echo # Connection default
connection default;
# Should not block.
SHOW CREATE TRIGGER t1_bi;
---echo # Connection con1
connection con1;
UNLOCK TABLES;
--echo # Test 2: ALTER TABLE with SHOW CREATE TRIGGER in transaction
---echo # Connection default
connection default;
START TRANSACTION;
SHOW CREATE TRIGGER t1_bi;
---echo # Connection con1
connection con1;
# Should not block.
ALTER TABLE t1 CHARACTER SET = utf8;
@@ -1320,7 +1309,6 @@ ALTER TABLE t1 CHARACTER SET = utf8;
disconnect con1;
--source include/wait_until_disconnected.inc
---echo # Connection default
connection default;
COMMIT;
DROP TRIGGER t1_bi;