diff options
| author | unknown <df@kahlann.erinye.com> | 2006-12-19 15:31:10 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2006-12-19 15:31:10 +0100 |
| commit | cc21a4822d6886b812ae20b516f3ef74c659632f (patch) | |
| tree | 7b4278185e77a5550e2d62ea54ba7b64f6f5ac2b /mysql-test/t/query_cache_notembedded.test | |
| parent | 0a27651fdf51d1507a581414f2414272525c9223 (diff) | |
| parent | 2eeeb9b4d390b438e0c3eac7143255dc10e979ca (diff) | |
| download | mariadb-git-cc21a4822d6886b812ae20b516f3ef74c659632f.tar.gz | |
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
mysql-test/t/grant_cache.test:
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/rpl000015.test:
SCCS merged
mysql-test/t/rpl000017.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 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; |