merge 5.0 -> 5.1
This commit is contained in:
commit
78566e48f4
@ -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/have_innodb.inc;
|
||||||
|
source include/federated.inc;
|
||||||
|
|
||||||
#
|
#
|
||||||
# Bug#25513 Federated transaction failures
|
# Bug#25513 Federated transaction failures
|
||||||
|
Loading…
x
Reference in New Issue
Block a user