diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-10 14:33:34 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-10 14:33:34 +0400 |
| commit | 380ad35c20626a6a4a5f64d7b6039e80864efd7f (patch) | |
| tree | 05473d341013d234283d2874043160d5a8163d2d /mysql-test | |
| parent | 42a7506d288a7666b666f9b514e7bbb2b1dc88dd (diff) | |
| parent | 6f3343eeb990d70c9f60bd6077615b93f8b5fc55 (diff) | |
| download | mariadb-git-380ad35c20626a6a4a5f64d7b6039e80864efd7f.tar.gz | |
Merge mysql.com:/d2/hf/common/my50-common
into mysql.com:/d2/hf/mr10/my50-mr10
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/t/myisam.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/query_cache_notembedded.test | 4 | ||||
| -rw-r--r-- | mysql-test/t/rpl000015.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl000017.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_rotate_logs.test | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test index d785002abdd..02f914ae094 100644 --- a/mysql-test/t/myisam.test +++ b/mysql-test/t/myisam.test @@ -498,7 +498,7 @@ insert into t1 values (1),(2),(3),(4),(5),(6); insert into t2 values (1,1),(2,1); lock tables t1 read local, t2 read local; select straight_join * from t1,t2 force index (primary) where t1.a=t2.a; -connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock); +connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); insert into t2 values(2,0); disconnect root; connection default; diff --git a/mysql-test/t/query_cache_notembedded.test b/mysql-test/t/query_cache_notembedded.test index 97be9f9f7ca..a4f4144d9c6 100644 --- a/mysql-test/t/query_cache_notembedded.test +++ b/mysql-test/t/query_cache_notembedded.test @@ -81,12 +81,12 @@ drop table t1, t2, t3, t11, t21; # # do not use QC if tables locked (BUG#12385) # -connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock); +connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); connection root; CREATE TABLE t1 ( a INT NOT NULL PRIMARY KEY AUTO_INCREMENT ) ENGINE = MyISAM; LOCK TABLE t1 READ LOCAL; -connect (root2,localhost,root,,test,$MASTER_MYPORT,master.sock); +connect (root2,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); connection root2; INSERT INTO t1 VALUES (), (), (); connection root; diff --git a/mysql-test/t/rpl000015.test b/mysql-test/t/rpl000015.test index d61b7120fa1..d05e4df66b1 100644 --- a/mysql-test/t/rpl000015.test +++ b/mysql-test/t/rpl000015.test @@ -1,5 +1,5 @@ connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); -connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock); +connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK); connection master; reset master; show master status; diff --git a/mysql-test/t/rpl000017.test b/mysql-test/t/rpl000017.test index 866b7fd1c25..c1d36d53501 100644 --- a/mysql-test/t/rpl000017.test +++ b/mysql-test/t/rpl000017.test @@ -1,5 +1,5 @@ connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); -connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock); +connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK); connection master; reset master; grant replication slave on *.* to replicate@localhost identified by 'aaaaaaaaaaaaaaab'; diff --git a/mysql-test/t/rpl_rotate_logs.test b/mysql-test/t/rpl_rotate_logs.test index ee49f92910a..25e54306d6e 100644 --- a/mysql-test/t/rpl_rotate_logs.test +++ b/mysql-test/t/rpl_rotate_logs.test @@ -16,7 +16,7 @@ connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); --disable_warnings drop table if exists t1, t2, t3, t4; --enable_warnings -connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock); +connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK); system cat /dev/null > $MYSQLTEST_VARDIR/slave-data/master.info; system chmod 000 $MYSQLTEST_VARDIR/slave-data/master.info; connection slave; |