summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2001-01-04 02:56:38 +0200
committerunknown <monty@donna.mysql.com>2001-01-04 02:56:38 +0200
commite724a8479aa31d4a5950b4df079fcd5d4bbc604a (patch)
tree372d81dfa5cc567493d3b099189518dfa6fc14c5 /mysql-test/include
parent0f7e02820b9e094930fdb83660b85e08d42069cd (diff)
downloadmariadb-git-e724a8479aa31d4a5950b4df079fcd5d4bbc604a.tar.gz
Fixes to get mysql-test-run more portablemysql-3.23.30-gamma
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
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/have_default_master.inc3
-rw-r--r--mysql-test/include/master-slave.inc8
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';