summaryrefslogtreecommitdiff
path: root/mysql-test/suite/federated/federated.inc
diff options
context:
space:
mode:
authorGuilhem Bichot <guilhem@mysql.com>2009-02-12 15:08:56 +0100
committerGuilhem Bichot <guilhem@mysql.com>2009-02-12 15:08:56 +0100
commit704b4845aa9ce51a6c5a9f5f42265e376db0dfb3 (patch)
tree73476f970c229f75846855edeeddfbc6fd87ed4b /mysql-test/suite/federated/federated.inc
parent2637dda66845868fe996e60e54996acf03f6c537 (diff)
parenta5e5b0180a6b86cce258eef232ef59d6e7c40bb0 (diff)
downloadmariadb-git-704b4845aa9ce51a6c5a9f5f42265e376db0dfb3.tar.gz
merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.
There were so many changes into mtr (this is the new mtr coming) that I rather copied mtr from 6.0-main here (at least this one knows how to run Maria tests). I also fixed suite/maria tests to be accepted by the new mtr. mysys/thr_mutex.c: adding DBUG_PRINT here, so that we can locate where the warning is issued.
Diffstat (limited to 'mysql-test/suite/federated/federated.inc')
-rw-r--r--mysql-test/suite/federated/federated.inc11
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/suite/federated/federated.inc b/mysql-test/suite/federated/federated.inc
new file mode 100644
index 00000000000..ad640dcbb61
--- /dev/null
+++ b/mysql-test/suite/federated/federated.inc
@@ -0,0 +1,11 @@
+--source include/not_embedded.inc
+--source have_federated_db.inc
+
+connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
+connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);
+
+connection master;
+CREATE DATABASE federated;
+
+connection slave;
+CREATE DATABASE federated;