Fixes to get mysql-test-run more portable

7 files changed, 10 insertions, 9 deletions

diff --git a/mysql-test/t/bigint.test b/mysql-test/t/bigint.test
index 91997c811b5..9a819463f3f 100644
--- a/mysql-test/t/bigint.test
+++ b/mysql-test/t/bigint.test
@@ -2,8 +2,6 @@
 # Test of reading of bigint values
 #
 select 0,256,00000000000000065536,2147483647,-2147483648,2147483648,+4294967296;
-select 922337203685477580,92233720368547758000;
-select -922337203685477580,-92233720368547758000;
 select 9223372036854775807,-009223372036854775808;
 select +9999999999999999999,-9999999999999999999;
 
diff --git a/mysql-test/t/rpl000008.test b/mysql-test/t/rpl000008.test
index 58a00b4ffbb..d17190ef31d 100644
--- a/mysql-test/t/rpl000008.test
+++ b/mysql-test/t/rpl000008.test
@@ -18,7 +18,7 @@ drop table if exists choo;
 create table choo (k int);
 insert into choo values(55);
 connection slave;
-sleep 2;
+sleep 3;
 @r/rpl000008.result select foo.n,bar.m,choo.k from foo,bar,choo;
 connection master;
 drop table if exists foo,bar,choo;
diff --git a/mysql-test/t/rpl000012.test b/mysql-test/t/rpl000012.test
index 8a231c3f04d..d4b40a48386 100644
--- a/mysql-test/t/rpl000012.test
+++ b/mysql-test/t/rpl000012.test
@@ -21,6 +21,6 @@ sleep 1;
 #
 # Clean up
 #
-connect (master2,localhost,root,,test,0,var/tmp/mysql.sock);
+connect (master2,localhost,root,,test,0,mysql-master.sock);
 connection master2;
 drop table if exists t1,t2;
diff --git a/mysql-test/t/rpl000013.test b/mysql-test/t/rpl000013.test
index ec9ca1ce8d2..4d4dc3f491a 100644
--- a/mysql-test/t/rpl000013.test
+++ b/mysql-test/t/rpl000013.test
@@ -27,6 +27,6 @@ while ($1)
 #
 # Clean up
 #
-connect (master2,localhost,root,,test,0,var/tmp/mysql.sock);
+connect (master2,localhost,root,,test,0,mysql-master.sock);
 connection master2;
 drop table if exists t1,t2;
diff --git a/mysql-test/t/rpl000014.test b/mysql-test/t/rpl000014.test
index 3ab5360d82d..1a2ce014813 100644
--- a/mysql-test/t/rpl000014.test
+++ b/mysql-test/t/rpl000014.test
@@ -1,4 +1,5 @@
 source include/master-slave.inc;
+source include/have_default_master.inc;
 connection master;
 show master status;
 connection slave;
diff --git a/mysql-test/t/rpl000015.test b/mysql-test/t/rpl000015.test
index dda1b528e10..a2528aa9b42 100644
--- a/mysql-test/t/rpl000015.test
+++ b/mysql-test/t/rpl000015.test
@@ -1,5 +1,6 @@
-connect (master,localhost,root,,test,0,var/tmp/mysql.sock);
-connect (slave,localhost,root,,test,0,var/tmp/mysql-slave.sock);
+connect (master,localhost,root,,test,0,mysql-master.sock);
+connect (slave,localhost,root,,test,0, mysql-slave.sock);
+source include/have_default_master.inc;
 connection master;
 reset master;
 show master status;
diff --git a/mysql-test/t/rpl000016.test b/mysql-test/t/rpl000016.test
index 5704bfeaf66..2ee68cd230f 100644
--- a/mysql-test/t/rpl000016.test
+++ b/mysql-test/t/rpl000016.test
@@ -1,5 +1,6 @@
-connect (master,localhost,root,,test,0,var/tmp/mysql.sock);
-connect (slave,localhost,root,,test,0,var/tmp/mysql-slave.sock);
+connect (master,localhost,root,,test,0,mysql-master.sock);
+connect (slave,localhost,root,,test,0,mysql-slave.sock);
+source include/have_default_master.inc;
 system cat /dev/null > var/slave-data/master.info;
 system chmod 000 var/slave-data/master.info;
 connection slave;