diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-10-18 13:17:27 -0700 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-10-18 13:17:27 -0700 |
| commit | 13cca92de4163fc262e8de71a7b003fd67e0803d (patch) | |
| tree | 0c0b19512db64c0c54b4b27f29ce8726156e755d | |
| parent | d2c683527fec45873011f69d460d60c78fe4f199 (diff) | |
| download | mariadb-git-13cca92de4163fc262e8de71a7b003fd67e0803d.tar.gz | |
fix funcs_1.is_engines_federated failure when no ha_federatex.so is present
| -rw-r--r-- | mysql-test/suite/federated/federatedx.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/federated/have_federatedx.opt | 2 | ||||
| -rw-r--r-- | mysql-test/suite/funcs_1/t/is_engines_federated.opt | 2 |
3 files changed, 2 insertions, 4 deletions
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 |