summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2001-11-17 17:23:46 -0700
committersasha@mysql.sashanet.com <>2001-11-17 17:23:46 -0700
commit586e812452402de452b47751ec8b3121cb002e8f (patch)
treec21577a3e1e1590e9241dd9b406c046d31a17123 /mysql-test/include
parentf89418b4e56de1d971838390a38f294805b1ac13 (diff)
downloadmariadb-git-586e812452402de452b47751ec8b3121cb002e8f.tar.gz
use env vars for socket/port in connect in mysqltest
--local-master option in mysql-test-run do not log CREATE TABLE when doing table dump fix replication to slave off 3.23 master
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/master-slave.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc
index 3cb802fe6d9..23392690239 100644
--- a/mysql-test/include/master-slave.inc
+++ b/mysql-test/include/master-slave.inc
@@ -1,7 +1,7 @@
-connect (master,localhost,root,,test,0,master.sock);
-connect (master1,localhost,root,,test,0,master.sock);
-connect (slave,localhost,root,,test,0,slave.sock);
-connect (slave1,localhost,root,,test,0,slave.sock);
+connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
+connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,);
+connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);
+connect (slave1,127.0.0.1,root,,test,$SLAVE_MYPORT,);
connection slave;
--error 0,1199
!slave stop;