diff options
Diffstat (limited to 'mysql-test/t/schema.test')
| -rw-r--r-- | mysql-test/t/schema.test | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/mysql-test/t/schema.test b/mysql-test/t/schema.test index 6af7ee20b02..8f9047e2e3f 100644 --- a/mysql-test/t/schema.test +++ b/mysql-test/t/schema.test @@ -27,7 +27,6 @@ DROP SCHEMA IF EXISTS schema1; connect(con2, localhost, root); ---echo # Connection default connection default; CREATE SCHEMA schema1; @@ -36,11 +35,9 @@ CREATE TABLE schema1.t1 (a INT); SET autocommit= FALSE; INSERT INTO schema1.t1 VALUES (1); ---echo # Connection 2 connection con2; --send DROP SCHEMA schema1 ---echo # Connection default connection default; let $wait_condition= SELECT COUNT(*)= 1 FROM information_schema.processlist WHERE state= 'Waiting for table metadata lock' @@ -52,11 +49,9 @@ let $wait_condition= SELECT COUNT(*)= 1 FROM information_schema.processlist ALTER SCHEMA schema1 DEFAULT CHARACTER SET utf8; SET autocommit= TRUE; ---echo # Connection 2 connection con2; --reap ---echo # Connection default connection default; disconnect con2; @@ -71,17 +66,14 @@ DROP SCHEMA IF EXISTS schema1; connect (con2, localhost, root); ---echo # Connection default connection default; CREATE SCHEMA schema1; CREATE TABLE schema1.t1 (id INT); LOCK TABLE schema1.t1 WRITE; ---echo # Connection con2 connection con2; --send DROP SCHEMA schema1 ---echo # Connection default connection default; let $wait_condition=SELECT COUNT(*)=1 FROM information_schema.processlist WHERE state='Waiting for schema metadata lock' and info='DROP SCHEMA schema1'; @@ -95,11 +87,9 @@ CREATE SCHEMA IF NOT EXISTS schema1; --echo # UNLOCK TABLES so DROP SCHEMA can continue. UNLOCK TABLES; ---echo # Connection con2 connection con2; --reap ---echo # Connection default connection default; disconnect con2; @@ -112,22 +102,18 @@ CREATE DATABASE db1; CREATE TABLE db1.t1 (a INT); INSERT INTO db1.t1 VALUES (1), (2); ---echo # Connection con1 connect (con1, localhost, root); HANDLER db1.t1 OPEN; ---echo # Connection default connection default; --echo # Sending: --send DROP DATABASE db1 ---echo # Connection con2 connect (con2, localhost, root); let $wait_condition=SELECT COUNT(*)=1 FROM information_schema.processlist WHERE state='Waiting for table metadata lock' AND info='DROP DATABASE db1'; --source include/wait_condition.inc ---echo # Connection con1 connection con1; # All these statements before resulted in deadlock. CREATE DATABASE db2; @@ -135,7 +121,6 @@ ALTER DATABASE db2 DEFAULT CHARACTER SET utf8; DROP DATABASE db2; HANDLER t1 CLOSE; ---echo # Connection default connection default; --echo # Reaping: DROP DATABASE db1 --reap @@ -156,20 +141,17 @@ DROP DATABASE IF EXISTS db2; connect (con2, localhost, root); connect (con3, localhost, root); ---echo # Connection default connection default; CREATE DATABASE db1; CREATE TABLE db1.t1 (id INT); START TRANSACTION; INSERT INTO db1.t1 VALUES (1); ---echo # Connection 2 connection con2; --echo # DROP DATABASE should block due to the active transaction --echo # Sending: --send DROP DATABASE db1 ---echo # Connection 3 connection con3; let $wait_condition=SELECT COUNT(*)=1 FROM information_schema.processlist WHERE state='Waiting for table metadata lock' and info='DROP DATABASE db1'; @@ -179,17 +161,14 @@ CREATE DATABASE db2; ALTER DATABASE db2 DEFAULT CHARACTER SET utf8; DROP DATABASE db2; ---echo # Connection default connection default; --echo # End the transaction so DROP DATABASE db1 can continue COMMIT; ---echo # Connection 2 connection con2; --echo # Reaping: DROP DATABASE db1 --reap ---echo # Connection default; connection default; disconnect con2; disconnect con3; |