Commit 78566e48 authored by Patrick Crews's avatar Patrick Crews
Browse files

merge 5.0 -> 5.1

parents 2e4f86af f88fd3fe
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
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