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/flush_block_commit.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/flush_block_commit.test')
| -rw-r--r-- | mysql-test/t/flush_block_commit.test | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/mysql-test/t/flush_block_commit.test b/mysql-test/t/flush_block_commit.test index 90443dc9242..6a6120ce63f 100644 --- a/mysql-test/t/flush_block_commit.test +++ b/mysql-test/t/flush_block_commit.test @@ -9,13 +9,9 @@ --echo # Save the initial number of concurrent sessions --source include/count_sessions.inc ---echo # Establish connection con1 (user=root) connect (con1,localhost,root,,); ---echo # Establish connection con2 (user=root) connect (con2,localhost,root,,); ---echo # Establish connection con3 (user=root) connect (con3,localhost,root,,); ---echo # Switch to connection con1 connection con1; --disable_warnings @@ -27,14 +23,11 @@ CREATE TABLE t1 (a INT) ENGINE=innodb; BEGIN; INSERT INTO t1 VALUES(1); ---echo # Switch to connection con2 connection con2; FLUSH TABLES WITH READ LOCK; ---echo # Switch to connection con1 connection con1; --echo # Sending: --send COMMIT ---echo # Switch to connection con2 connection con2; --echo # Wait until COMMIT gets blocked. let $wait_condition= @@ -44,33 +37,26 @@ let $wait_condition= --echo # Verify that 'con1' was blocked and data did not move. SELECT * FROM t1; UNLOCK TABLES; ---echo # Switch to connection con1 connection con1; --echo # Reaping COMMIT --reap # No deadlock ? ---echo # Switch to connection con1 connection con1; BEGIN; SELECT * FROM t1 FOR UPDATE; ---echo # Switch to connection con2 connection con2; BEGIN; send SELECT * FROM t1 FOR UPDATE; # blocked by con1 sleep 1; ---echo # Switch to connection con3 connection con3; send FLUSH TABLES WITH READ LOCK; # blocked by con2 ---echo # Switch to connection con1 connection con1; COMMIT; # should not be blocked by con3 ---echo # Switch to connection con2 connection con2; reap; COMMIT; ---echo # Switch to connection con3 connection con3; reap; UNLOCK TABLES; @@ -78,15 +64,12 @@ UNLOCK TABLES; # Bug#6732 FLUSH TABLES WITH READ LOCK + COMMIT hangs later FLUSH TABLES # WITH READ LOCK ---echo # Switch to connection con2 connection con2; COMMIT; # unlock InnoDB row locks to allow insertions ---echo # Switch to connection con1 connection con1; BEGIN; INSERT INTO t1 VALUES(10); FLUSH TABLES WITH READ LOCK; ---echo # Switch to connection con2 connection con2; FLUSH TABLES WITH READ LOCK; # bug caused hang here UNLOCK TABLES; @@ -100,7 +83,6 @@ COMMIT; --echo # Cleanup ---echo # Switch to connection default and close connections con1, con2, con3 connection default; disconnect con1; disconnect con2; |