From 13cca92de4163fc262e8de71a7b003fd67e0803d Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Fri, 18 Oct 2013 13:17:27 -0700
Subject: [PATCH] fix funcs_1.is_engines_federated failure when no
 ha_federatex.so is present

---
 mysql-test/suite/federated/federatedx.test          | 2 +-
 mysql-test/suite/federated/have_federatedx.opt      | 2 +-
 mysql-test/suite/funcs_1/t/is_engines_federated.opt | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)
 delete mode 100644 mysql-test/suite/funcs_1/t/is_engines_federated.opt

diff --git a/mysql-test/suite/federated/federatedx.test b/mysql-test/suite/federated/federatedx.test
index cfe6a425944..818cc2c1681 100644
--- 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;
 
diff --git a/mysql-test/suite/federated/have_federatedx.opt b/mysql-test/suite/federated/have_federatedx.opt
index 21f6f149f09..c7debd0f1a7 100644
--- 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
diff --git a/mysql-test/suite/funcs_1/t/is_engines_federated.opt b/mysql-test/suite/funcs_1/t/is_engines_federated.opt
deleted file mode 100644
index e3c507f518d..00000000000
--- a/mysql-test/suite/funcs_1/t/is_engines_federated.opt
+++ /dev/null
@@ -1,2 +0,0 @@
---loose-federated
---plugin-load=$HA_FEDERATEDX_SO