summaryrefslogtreecommitdiff
path: root/mysql-test/suite/federated/federatedx.test
diff options
context:
space:
mode:
authorunknown <timour@askmonty.org>2012-11-06 11:52:55 +0200
committerunknown <timour@askmonty.org>2012-11-06 11:52:55 +0200
commit7c23d6d0c66cb3b84cb466f956e19bfea0acc342 (patch)
tree551dd23a43a26923a6dd30096a2822a27a90f355 /mysql-test/suite/federated/federatedx.test
parent43293b7a515dbb2cf04907e2d98bcc813279cad8 (diff)
parent813b661d00123e3291530d102e2b94388f42fb0f (diff)
downloadmariadb-git-7c23d6d0c66cb3b84cb466f956e19bfea0acc342.tar.gz
Merge MySQL 5.1.66 -> MariaDB 5.1.65
Diffstat (limited to 'mysql-test/suite/federated/federatedx.test')
-rw-r--r--mysql-test/suite/federated/federatedx.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/federated/federatedx.test b/mysql-test/suite/federated/federatedx.test
index cabcf0cea1b..d1f05d52a4b 100644
--- a/mysql-test/suite/federated/federatedx.test
+++ b/mysql-test/suite/federated/federatedx.test
@@ -6,7 +6,7 @@
# should work with embedded server after mysqltest is fixed
--source include/not_embedded.inc
---source federated.inc
+--source include/federated.inc
--source have_federatedx.inc
connection default;
@@ -2001,4 +2001,4 @@ connection slave;
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;
connection default;
-source federated_cleanup.inc;
+source suite/federated/include/federated_cleanup.inc;