merge 5.0 -> 5.1

f9f8cc58 · Patrick Crews · ba453779 · f5583481 · f9f8cc58
Commit f9f8cc58 authored Nov 13, 2008 by Patrick Crews
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

mysql-test/t/federated_innodb.test mysql-test/t/federated_innodb.test +6 -1

No files found.
--- a/mysql-test/t/federated_innodb.test
+++ b/mysql-test/t/federated_innodb.test
-source include/federated.inc;
+# NOTE:  Keep any include/ files that will kill / skip a test BEFORE any others
+# having federated.inc before have_innodb.inc allows for an orphaned database
+# that can cause other tests to fail.
+# See Bug #40645 Test main.federated_innodb does not always clean up after itself
 source include/have_innodb.inc;
+source include/federated.inc;
 #
 # Bug#25513 Federated transaction failures