diff options
| author | unknown <istruewing@chilla.local> | 2007-01-29 17:20:18 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-01-29 17:20:18 +0100 |
| commit | d308799383bdbcaad568c9844b34708462dd74e7 (patch) | |
| tree | 9ecca7943a964140be08bdfb8a54f9b76b89e592 /mysql-test/t/query_cache_notembedded.test | |
| parent | 9403c7ca67535aa2a7610c4887b6e9276f5cb333 (diff) | |
| parent | fddf3c397913f3254bd2adf0d1d7ad4cde586355 (diff) | |
| download | mariadb-git-d308799383bdbcaad568c9844b34708462dd74e7.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into chilla.local:/home/mydev/mysql-4.1-axmrg
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/symlink.test:
Auto merged
mysql-test/r/myisam.result:
Manual merged
mysql-test/t/myisam.test:
Manual 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 fd4785ffe95..20baf3450e2 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; |