fix funcs_1.is_engines_federated failure when no ha_federatex.so is present

2013-10-18 13:17:27 -07:00 · 2013-10-18 13:17:27 -07:00 · 13cca92de4
commit 13cca92de4
parent d2c683527f
3 changed files with 2 additions and 4 deletions
--- a/mysql-test/suite/federated/federatedx.test
+++ b/mysql-test/suite/federated/federatedx.test
@ -4,8 +4,8 @@
 #


--source include/federated.inc
 --source have_federatedx.inc
+--source include/federated.inc

 connection default;

--- a/mysql-test/suite/federated/have_federatedx.opt
+++ b/mysql-test/suite/federated/have_federatedx.opt
@ -1 +1 @@
--plugin-load=$HA_FEDERATEDX_SO --federated
+--plugin-load=$HA_FEDERATEDX_SO --loose-federated
--- a/mysql-test/suite/funcs_1/t/is_engines_federated.opt
+++ b/mysql-test/suite/funcs_1/t/is_engines_federated.opt
@ -1,2 +0,0 @@
--loose-federated
--plugin-load=$HA_FEDERATEDX_SO