From 92a3aedc05dd07e1d00986f237a2097af595e584 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 4 Jan 2001 02:56:38 +0200 Subject: Fixes to get mysql-test-run more portable Docs/manual.texi: More examples based on user comments client/mysqltest.c: Added --sleep and --tmpdir mysql-test/README: Update mysql-test/include/master-slave.inc: Fixed to not be dependent on path to sockets mysql-test/install_test_db.sh: Added privilege for hostname% mysql-test/mysql-test-run.sh: Portability fixes + a lot of new options mysql-test/r/bigint.result: Made test portable mysql-test/t/bigint.test: Made test portable mysql-test/t/rpl000008.test: Changed sleeptime mysql-test/t/rpl000012.test: Fixed to not be dependent on path to sockets mysql-test/t/rpl000013.test: Fixed to not be dependent on path to sockets mysql-test/t/rpl000014.test: Fixed to not be dependent on path to sockets mysql-test/t/rpl000015.test: Fixed to not be dependent on path to sockets mysql-test/t/rpl000016.test: Fixed to not be dependent on path to sockets --- mysql-test/include/have_default_master.inc | 3 +++ mysql-test/include/master-slave.inc | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 mysql-test/include/have_default_master.inc (limited to 'mysql-test/include') 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'; -- cgit v1.2.1