summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-05-04 21:56:29 +0300
committerMichael Widenius <monty@askmonty.org>2011-05-04 21:56:29 +0300
commita67a5dd6f956bf6f62799eafa2c67d008ee15e24 (patch)
treeec375d94d2adfc4765bcf46b095155dbe0158ec5
parent3c9ae014ca93480ab7f4868d5c69db59bc1a9fd1 (diff)
parenta3af6f0f3d023bcbba7be013343b46a400cf0648 (diff)
downloadmariadb-git-a67a5dd6f956bf6f62799eafa2c67d008ee15e24.tar.gz
Automatic merge
-rw-r--r--mysql-test/suite/innodb/t/innodb_bug60049.test6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/t/innodb_bug60049.test b/mysql-test/suite/innodb/t/innodb_bug60049.test
index ec4e3b8de7e..1110f619862 100644
--- a/mysql-test/suite/innodb/t/innodb_bug60049.test
+++ b/mysql-test/suite/innodb/t/innodb_bug60049.test
@@ -5,6 +5,12 @@
-- source include/not_embedded.inc
-- source include/have_innodb.inc
+if (`SELECT @@innodb_fast_shutdown != 0`)
+
+{
+ skip Need innodb_fast_shutdown=0;
+}
+
CREATE TABLE t(a INT)ENGINE=InnoDB;
RENAME TABLE t TO u;
DROP TABLE u;