diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-11-17 17:23:46 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-11-17 17:23:46 -0700 |
| commit | 4bcb4f4dae07d3ceca01f17ce97012c1d6046c6a (patch) | |
| tree | c21577a3e1e1590e9241dd9b406c046d31a17123 /mysql-test/include/master-slave.inc | |
| parent | f5a488eef458ee68a8a20fc4e06503eba6d013f8 (diff) | |
| download | mariadb-git-4bcb4f4dae07d3ceca01f17ce97012c1d6046c6a.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
client/mysqltest.c:
fix to be able to use env vars for socket and port in connect
mysql-test/include/master-slave.inc:
connect to port specified in environment
mysql-test/mysql-test-run.sh:
added --local-master option - will assume master is on port 3306 on localhost
sql/log_event.cc:
fixes to slave off 3.23 master
sql/log_event.h:
fixes to slave off 3.23 master
sql/slave.cc:
do not log CREATE TABLE when doing table dump
Diffstat (limited to 'mysql-test/include/master-slave.inc')
| -rw-r--r-- | mysql-test/include/master-slave.inc | 8 |
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; |