diff options
| author | Patrick Crews <patrick.crews@sun.com> | 2008-11-13 16:01:01 -0500 |
|---|---|---|
| committer | Patrick Crews <patrick.crews@sun.com> | 2008-11-13 16:01:01 -0500 |
| commit | f5583481e3439a74e22170eab631755cc094c32c (patch) | |
| tree | 1dd5a086e16b3a498d0d618a22b3d9a6288d0e2a | |
| parent | c049fc6bd62f9ef3b836a04be49ddc0fd0e4edc0 (diff) | |
| download | mariadb-git-f5583481e3439a74e22170eab631755cc094c32c.tar.gz | |
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.
| -rw-r--r-- | mysql-test/t/federated_innodb.test | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mysql-test/t/federated_innodb.test b/mysql-test/t/federated_innodb.test index 772e37a2929..0617cb15d97 100644 --- a/mysql-test/t/federated_innodb.test +++ b/mysql-test/t/federated_innodb.test @@ -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 |