diff options
| author | istruewing@chilla.local <> | 2006-12-21 18:41:01 +0100 |
|---|---|---|
| committer | istruewing@chilla.local <> | 2006-12-21 18:41:01 +0100 |
| commit | dee46f91006c40665d61ec89fb6de42d53c3792a (patch) | |
| tree | 0d8563075323b3859a76ba68779dae619afed594 /mysql-test/t/myisam.test | |
| parent | 80b97a6b542e436d56e6615701257247dd97405d (diff) | |
| parent | 1341cf1827092bac4723f3c6fc602069d62ca0b3 (diff) | |
| download | mariadb-git-dee46f91006c40665d61ec89fb6de42d53c3792a.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into chilla.local:/home/mydev/mysql-5.1-axmrg
Diffstat (limited to 'mysql-test/t/myisam.test')
| -rw-r--r-- | mysql-test/t/myisam.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test index b40938b96a6..2bb1984c91c 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; |