summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorBjorn Munch <bjorn.munch@oracle.com>2011-11-21 12:28:35 +0100
committerBjorn Munch <bjorn.munch@oracle.com>2011-11-21 12:28:35 +0100
commitf7513f398b89a659f91fb9cec27e2f1b413a1e1c (patch)
tree0ac98dac9d20dbe235a20e25c4edfdb38fa5b65a /mysql-test
parent04b1eeb19536f170cb4f71d203969f42600de9d0 (diff)
downloadmariadb-git-f7513f398b89a659f91fb9cec27e2f1b413a1e1c.tar.gz
Followup to 11750417:
Disable federated_plugin test for embedded, like other federated tests Also removed redundant include/not_embedded.inc from federated.test
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/federated/federated.test2
-rw-r--r--mysql-test/suite/federated/federated_plugin.test1
2 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/suite/federated/federated.test b/mysql-test/suite/federated/federated.test
index a1d86462c11..432e19a4a68 100644
--- a/mysql-test/suite/federated/federated.test
+++ b/mysql-test/suite/federated/federated.test
@@ -4,8 +4,6 @@
#
-# should work with embedded server after mysqltest is fixed
---source include/not_embedded.inc
--source federated.inc
connection default;
diff --git a/mysql-test/suite/federated/federated_plugin.test b/mysql-test/suite/federated/federated_plugin.test
index 8c465095cfa..a0add3af8ff 100644
--- a/mysql-test/suite/federated/federated_plugin.test
+++ b/mysql-test/suite/federated/federated_plugin.test
@@ -1,3 +1,4 @@
+--source include/not_embedded.inc
--source include/have_federated_plugin.inc
# Uninstall will not uninstall if ps has been used