bzr push into mysql-trunk-innodb branch (marko.makela:3503 to 3504)

[marko.makela]

 3504 Marko Mäkelä	2011-02-17 [merge]
      Merge mysql-5.5-innodb to mysql-trunk-innodb.

    modified:
      mysql-test/suite/innodb/t/innodb_bug60049.test
 3503 Marko Mäkelä	2011-02-16 [merge]
      Merge mysql-5.5-innodb to mysql-trunk-innodb.

    modified:
      mysql-test/suite/innodb/t/innodb_bug60049.test
=== modified file 'mysql-test/suite/innodb/t/innodb_bug60049.test'
--- a/mysql-test/suite/innodb/t/innodb_bug60049.test	revid:marko.makela@stripped
+++ b/mysql-test/suite/innodb/t/innodb_bug60049.test	revid:marko.makela@stripped
@@ -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;

Attachment: [text/bzr-bundle] bzr/[e-mail]