diff options
Diffstat (limited to 'mysql-test/t/merge.test')
| -rw-r--r-- | mysql-test/t/merge.test | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index e9d69b446d5..09f313616f1 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -1678,6 +1678,7 @@ CREATE TABLE t1(a int); CREATE TABLE t2(a int); CREATE TABLE t3(a int) ENGINE = MERGE UNION(t1, t2); CREATE TRIGGER tr1 AFTER INSERT ON t3 FOR EACH ROW CALL foo(); +--replace_column 7 # SHOW CREATE TRIGGER tr1; DROP TRIGGER tr1; DROP TABLE t1, t2, t3; @@ -2585,7 +2586,6 @@ DROP TABLE t1, t2, t3, t4, m1, m2; --disable_warnings DROP TABLE IF EXISTS t1, t2, t3; --enable_warnings ---echo # Connection con1. connect (con1,localhost,root,,); CREATE TABLE t1 (c1 int); CREATE TABLE t2 (c1 int); @@ -2594,12 +2594,10 @@ START TRANSACTION; --error ER_ILLEGAL_HA HANDLER t3 OPEN; DROP TABLE t1, t2, t3; ---echo # Connection default. connection default; ---echo # Disconnecting con1, all mdl_tickets must have been released. +--echo # all mdl_tickets must have been released. disconnect con1; --echo # The bug-specific case. ---echo # Connection con1. connect (con1,localhost,root,,); CREATE TABLE t1 (c1 int); CREATE TABLE t2 (c1 int); @@ -2609,9 +2607,8 @@ START TRANSACTION; --error ER_WRONG_MRG_TABLE HANDLER t3 OPEN; DROP TABLE t1, t3; ---echo # Connection default. connection default; ---echo # Disconnecting con1, all mdl_tickets must have been released. +--echo # all mdl_tickets must have been released. disconnect con1; --echo # |