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/lock.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/lock.test')
| -rw-r--r-- | mysql-test/t/lock.test | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mysql-test/t/lock.test b/mysql-test/t/lock.test index 78f0e2ecf8d..23eb04d7826 100644 --- a/mysql-test/t/lock.test +++ b/mysql-test/t/lock.test @@ -333,7 +333,6 @@ connect(con1,localhost,root,,); set autocommit= 0; insert into t1 values (1); lock table t1 write; ---echo # Disconnect --echo # Ensure that metadata locks will be released if there is an open --echo # transaction (autocommit=off) in conjunction with lock tables. disconnect con1; @@ -349,7 +348,6 @@ create table t1 (a int); connect(con1,localhost,root,,); begin; insert into t1 values (1); ---echo # Disconnect --echo # Ensure that metadata locks held by the transaction are released. disconnect con1; connection default; @@ -556,12 +554,10 @@ connect (con2, localhost, root); CREATE TABLE t1 (id INT); CREATE TABLE t2 (id INT); ---echo # Connection default connection default; LOCK TABLE t1 WRITE; ANALYZE TABLE t1; ---echo # Connection con2 connection con2; LOCK TABLE t2 WRITE; --echo # This used to hang until the first connection @@ -570,7 +566,6 @@ FLUSH TABLE t2; UNLOCK TABLES; ---echo # Connection default connection default; UNLOCK TABLES; DROP TABLE t1, t2; |