diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
| commit | cd776fedba3e2902bc25ee206d6e6266e7eb9411 (patch) | |
| tree | 95bf82d0e0522c6af708cd28639c82e004b5a264 /mysql-test/t/show_check.test | |
| parent | f884d233e6a5f68bab846a7bdbd041fc4415ad77 (diff) | |
| parent | d516a2ae0cbd09d3b5b1667ec62b421330ab9902 (diff) | |
| download | mariadb-git-10.2-connector-c-integ.tar.gz | |
Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ
Diffstat (limited to 'mysql-test/t/show_check.test')
| -rw-r--r-- | mysql-test/t/show_check.test | 12 |
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; |