diff options
| author | unknown <joerg@trift2.> | 2006-12-21 12:18:28 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2006-12-21 12:18:28 +0100 |
| commit | b95a067685ed8f902e0f92f89c16a374c9214980 (patch) | |
| tree | a9ef7bc051c78d7437f802fbd6cb96adfcd5eec1 /mysql-test/t/query_cache_notembedded.test | |
| parent | 9498307c9e9aee397e7d1f7e79e50f5865b3c52d (diff) | |
| parent | eff3409964d234af862ecce1ad38fe7eba8bd66c (diff) | |
| download | mariadb-git-b95a067685ed8f902e0f92f89c16a374c9214980.tar.gz | |
Merge trift2.:/MySQL/M50/clone-5.0
into trift2.:/MySQL/M51/tmp-5.1
client/mysql_upgrade.c:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/query_cache_notembedded.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/rpl000017.test:
Null merge: Socket name change of 5.0 does not apply here.
mysql-test/t/rpl_000015.test:
SCCS merged
Diffstat (limited to 'mysql-test/t/query_cache_notembedded.test')
| -rw-r--r-- | mysql-test/t/query_cache_notembedded.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/query_cache_notembedded.test b/mysql-test/t/query_cache_notembedded.test index 802022d061b..a0085c0ba31 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; |