bzr commit into mysql-5.0-bugteam branch (patrick.crews:2713) Bug#40645

[Patrick Crews]

#At file:///Users/pcrews/usr/local/bin/data1/work/fed_cleanup/mysql-5.0-bugteam/

 2713 Patrick Crews	2008-11-13
      Bug#40645 Test main.federated_innodb does not always clean up after itself
      
      Reordered include files so that no mess will be left if this test is run without InnoDB
      Previously, this test would leave a database named 'federated' in such a case and would
      cause tests that examined existing databases to fail.
modified:
  mysql-test/t/federated_innodb.test

=== modified file 'mysql-test/t/federated_innodb.test'
--- a/mysql-test/t/federated_innodb.test	2007-06-28 23:03:01 +0000
+++ b/mysql-test/t/federated_innodb.test	2008-11-13 21:01:01 +0000
@@ -1,5 +1,10 @@
-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