diff options
| author | monty@donna.mysql.com <> | 2001-01-04 02:56:38 +0200 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2001-01-04 02:56:38 +0200 |
| commit | 7541a877bcc007f58cb218fe18a4f4b18c7ba71a (patch) | |
| tree | 372d81dfa5cc567493d3b099189518dfa6fc14c5 /mysql-test/include | |
| parent | ff0e2e2d7a6336a5addc71a3216f497261c6b4d3 (diff) | |
| download | mariadb-git-7541a877bcc007f58cb218fe18a4f4b18c7ba71a.tar.gz | |
Fixes to get mysql-test-run more portable
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/have_default_master.inc | 3 | ||||
| -rw-r--r-- | mysql-test/include/master-slave.inc | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/mysql-test/include/have_default_master.inc b/mysql-test/include/have_default_master.inc new file mode 100644 index 00000000000..eff1414c16a --- /dev/null +++ b/mysql-test/include/have_default_master.inc @@ -0,0 +1,3 @@ +-- require r/have_default_master.require +connection master; +show variables like "port"; diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc index 8270c0e46f6..69ab73db6b5 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,var/tmp/mysql.sock); -connect (master1,localhost,root,,test,0,var/tmp/mysql.sock); -connect (slave,localhost,root,,test,0,var/tmp/mysql-slave.sock); -connect (slave1,localhost,root,,test,0,var/tmp/mysql-slave.sock); +connect (master,localhost,root,,test,0,mysql-master.sock); +connect (master1,localhost,root,,test,0,mysql-master.sock); +connect (slave,localhost,root,,test,0,mysql-slave.sock); +connect (slave1,localhost,root,,test,0,mysql-slave.sock); connection slave; !slave stop; @r/slave-stopped.result show status like 'Slave_running'; |