summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb/t/innodb-lock.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/suite/innodb/t/innodb-lock.test
parent5052e2479e873461bebfcedbc674bbaf57d3c968 (diff)
downloadmariadb-git-282497dd6d1049b4fb963641504c2733752845a7.tar.gz
MDEV-6720 - enable connection log in mysqltest by default
Diffstat (limited to 'mysql-test/suite/innodb/t/innodb-lock.test')
-rw-r--r--mysql-test/suite/innodb/t/innodb-lock.test6
1 files changed, 0 insertions, 6 deletions
diff --git a/mysql-test/suite/innodb/t/innodb-lock.test b/mysql-test/suite/innodb/t/innodb-lock.test
index e3026ac505b..47246c53759 100644
--- a/mysql-test/suite/innodb/t/innodb-lock.test
+++ b/mysql-test/suite/innodb/t/innodb-lock.test
@@ -71,7 +71,6 @@ insert into t1 values(0, 0),(1,1),(2,2);
commit;
SELECT * from t1 where id = 0 FOR UPDATE;
---echo # Connection 'con2'.
connection con2;
set autocommit=0;
set @@innodb_table_locks=0;
@@ -82,7 +81,6 @@ set @@innodb_table_locks=0;
--echo # Sending:
--send lock table t1 write;
---echo # Connection 'con1'.
connection con1;
--echo # Wait until LOCK TABLE is blocked on SQL-level lock.
let $wait_condition=
@@ -96,18 +94,15 @@ select * from t1;
--echo # Unblock LOCK TABLE.
commit;
---echo # Connection 'con2'.
connection con2;
--echo # Reap LOCK TABLE.
--reap
unlock tables;
---echo # Connection 'con1'.
connection con1;
select * from t1 where id = 0 for update;
---echo # Connection 'con2'.
connection con2;
--echo # The below statement should not be blocked as LOCK TABLES ... READ
--echo # does not take strong SQL-level lock on t1. SELECTs which do not
@@ -120,7 +115,6 @@ unlock tables;
select * from t1;
commit;
---echo # Connection 'con1'.
connection con1;
commit;