diff options
| -rw-r--r-- | mysql-test/r/merge.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/merge.test | 53 |
2 files changed, 0 insertions, 58 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index cd56b5eca5c..6e4e6c5a443 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -2403,11 +2403,6 @@ REPAIR TABLE m1; Table Op Msg_type Msg_text test.m1 repair note The storage engine for the table doesn't support repair DROP TABLE m1, t1; -# -# BUG#11763712 - 56458: KILLING A FLUSH TABLE FOR A MERGE/CHILD -# CRASHES SERVER -# -# Disabled in 5.5 by Mattias. TODO: FIX THIS! End of 5.1 tests # # An additional test case for Bug#27430 Crash in subquery code diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 64327400a4f..74110962299 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -1812,59 +1812,6 @@ REPAIR TABLE m1; # DROP TABLE m1, t1; - ---echo # ---echo # BUG#11763712 - 56458: KILLING A FLUSH TABLE FOR A MERGE/CHILD ---echo # CRASHES SERVER ---echo # ---echo # Disabled in 5.5 by Mattias. TODO: FIX THIS! -if (0) -{ -CREATE TABLE t1(a INT); -CREATE TABLE t2(a INT); -CREATE TABLE t3(a INT, b INT); -CREATE TABLE m1(a INT) ENGINE=MERGE UNION=(t1, t2); - ---echo # Test reopen merge parent failure -LOCK TABLES m1 READ; ---echo # Remove 'm1' table using file operations. -remove_file $MYSQLD_DATADIR/test/m1.MRG; -remove_file $MYSQLD_DATADIR/test/m1.frm; ---error ER_NO_SUCH_TABLE -FLUSH TABLES; -UNLOCK TABLES; -CREATE TABLE m1(a INT) ENGINE=MERGE UNION=(t1, t2); - ---echo # Test reopen merge child failure -LOCK TABLES m1 READ; ---echo # Remove 't1' table using file operations. -remove_file $MYSQLD_DATADIR/test/t1.frm; -remove_file $MYSQLD_DATADIR/test/t1.MYI; -remove_file $MYSQLD_DATADIR/test/t1.MYD; ---error ER_NO_SUCH_TABLE -FLUSH TABLES; -UNLOCK TABLES; -CREATE TABLE t1(a INT); - ---echo # Test reattach merge failure -LOCK TABLES m1 READ; ---echo # Replace 't1' with 't3' table using file operations. -# move + remove is a work around for windows. -move_file $MYSQLD_DATADIR/test/t1.frm $MYSQLD_DATADIR/test/oldt1.frm; -move_file $MYSQLD_DATADIR/test/t1.MYI $MYSQLD_DATADIR/test/oldt1.MYI; -move_file $MYSQLD_DATADIR/test/t1.MYD $MYSQLD_DATADIR/test/oldt1.MYD; -remove_file $MYSQLD_DATADIR/test/oldt1.frm; -remove_file $MYSQLD_DATADIR/test/oldt1.MYI; -remove_file $MYSQLD_DATADIR/test/oldt1.MYD; -copy_file $MYSQLD_DATADIR/test/t3.frm $MYSQLD_DATADIR/test/t1.frm; -copy_file $MYSQLD_DATADIR/test/t3.MYI $MYSQLD_DATADIR/test/t1.MYI; -copy_file $MYSQLD_DATADIR/test/t3.MYD $MYSQLD_DATADIR/test/t1.MYD; ---error ER_CANT_REOPEN_TABLE -FLUSH TABLES; -UNLOCK TABLES; -DROP TABLE t1, t2, t3, m1; -} - --echo End of 5.1 tests --echo # |