Merge mysql-5.1-innodb to mysql-5.5-innodb.

778e700d · Marko Mäkelä · 11cbe874 · e428f0ed · 778e700d
Commit 778e700d authored Feb 17, 2011 by Marko Mäkelä
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

mysql-test/suite/innodb/t/innodb_bug60049.test mysql-test/suite/innodb/t/innodb_bug60049.test +1 -0

No files found.
--- a/mysql-test/suite/innodb/t/innodb_bug60049.test
+++ b/mysql-test/suite/innodb/t/innodb_bug60049.test
@@ -2,6 +2,7 @@
 # This test requires a fresh server start-up and a slow shutdown.
 # This was a suspected bug (not a bug).

+-- source include/not_embedded.inc
 -- source include/have_innodb.inc

 CREATE TABLE t(a INT)ENGINE=InnoDB;