diff options
Diffstat (limited to 'mysql-test/t/delayed.test')
| -rw-r--r-- | mysql-test/t/delayed.test | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/mysql-test/t/delayed.test b/mysql-test/t/delayed.test index 2886dff8f91..85f28de128b 100644 --- a/mysql-test/t/delayed.test +++ b/mysql-test/t/delayed.test @@ -315,7 +315,6 @@ insert into t1 values (1,1); lock table t1 read; connect (update,localhost,root,,); connection update; ---echo connection: update --send insert delayed into t1 values (2,2); connection default; let $wait_condition= @@ -323,10 +322,8 @@ let $wait_condition= where command = "Delayed insert" and state = "Waiting for table level lock"; --source include/wait_condition.inc connect (select,localhost,root,,); ---echo connection: select select * from t1; connection default; ---echo connection: default select * from t1; connection default; disconnect update; @@ -421,17 +418,14 @@ CREATE TABLE t3 (a INT); --echo # Test 1: Using LOCK TABLE ---echo # Connection con1 connect (con1, localhost, root); LOCK TABLE t1 WRITE; ---echo # Connection default connection default; LOCK TABLE t2 WRITE; --echo # Sending: --send INSERT DELAYED INTO t1 VALUES (1) ---echo # Connection con1 connection con1; --echo # Wait until INSERT DELAYED is blocked on table 't1'. let $wait_condition= @@ -443,7 +437,6 @@ let $wait_condition= INSERT DELAYED INTO t2 VALUES (1); UNLOCK TABLES; ---echo # Connection default connection default; --echo # Reaping: INSERT DELAYED INTO t1 VALUES (1) --reap @@ -454,12 +447,10 @@ UNLOCK TABLES; START TRANSACTION; SELECT * FROM t1 WHERE a=0; ---echo # Connection con1 connection con1; --echo # Sending: --send ALTER TABLE t1 MODIFY a INT UNSIGNED; ---echo # Connection default connection default; --echo # Wait until ALTER TABLE is blocked on table 't1'. let $wait_condition= @@ -471,24 +462,20 @@ let $wait_condition= INSERT DELAYED INTO t1 VALUES (3); COMMIT; ---echo # Connection con1 connection con1; --echo # Reaping: ALTER TABLE t1 COMMENT 'test' --reap --echo # Test 3: Using RENAME TABLE ---echo # Connection default connection default; START TRANSACTION; INSERT INTO t2 VALUES (1); ---echo # Connection con1 connection con1; --echo # Sending: --send RENAME TABLE t1 to t5, t2 to t4 ---echo # Connection default connection default; --echo # Wait until RENAME TABLE is blocked on table 't1'. let $wait_condition= @@ -500,12 +487,10 @@ let $wait_condition= INSERT DELAYED INTO t1 VALUES (4); COMMIT; ---echo # Connection con1 connection con1; --echo # Reaping: RENAME TABLE t1 to t5, t2 to t4 --reap ---echo # Connection default connection default; --echo # Reverting the renames RENAME TABLE t5 to t1, t4 to t2; @@ -515,11 +500,9 @@ RENAME TABLE t5 to t1, t4 to t2; START TRANSACTION; INSERT INTO t2 VALUES (1); ---echo # Connection con2 connect (con2, localhost, root); --send LOCK TABLE t1 WRITE, t2 WRITE ---echo # Connection con1 connection con1; --echo # Wait until LOCK TABLE is blocked on table 't2'. let $wait_condition= @@ -529,7 +512,6 @@ let $wait_condition= --source include/wait_condition.inc --send INSERT DELAYED INTO t1 VALUES (5) ---echo # Connection default connection default; --echo # Wait until INSERT DELAYED is blocked on table 't1'. let $wait_condition= @@ -541,18 +523,15 @@ let $wait_condition= INSERT DELAYED INTO t1 VALUES (6); COMMIT; ---echo # Connection con2 connection con2; --echo # Reaping: LOCK TABLE t1 WRITE, t2 WRITE --reap UNLOCK TABLES; ---echo # Connection con1 connection con1; --echo # Reaping: INSERT DELAYED INTO t1 VALUES (5) --reap ---echo # Connection default connection default; --echo # Test 5: LOCK TABLES + INSERT DELAYED in one connection. @@ -567,16 +546,13 @@ INSERT DELAYED INTO t2 VALUES (8); UNLOCK TABLES; SET AUTOCOMMIT= 1; ---echo # Connection con2 connection con2; disconnect con2; --source include/wait_until_disconnected.inc ---echo # Connection con1 connection con1; disconnect con1; --source include/wait_until_disconnected.inc ---echo # Connection default connection default; DROP TABLE t1, t2, t3; --enable_ps_protocol @@ -596,12 +572,10 @@ create table tm(a int) engine=merge union=(t1, t2); begin; select * from t1; ---echo # Connection 'con1'. connection con1; --echo # Sending: --send alter table t1 comment 'test' ---echo # Connection 'default'. connection default; --echo # Wait until ALTER TABLE blocks and starts waiting --echo # for connection 'default'. It should wait with a @@ -619,13 +593,11 @@ insert delayed into tm values (1); --echo # Unblock ALTER TABLE. commit; ---echo # Connection 'con1'. connection con1; --echo # Reaping ALTER TABLE: --reap disconnect con1; --source include/wait_until_disconnected.inc ---echo # Connection 'default'. connection default; drop tables tm, t1, t2; |