diff options
| author | unknown <df@kahlann.erinye.com> | 2007-01-22 16:30:53 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2007-01-22 16:30:53 +0100 |
| commit | 747ec6f9046ea18ba687e5f878762d342d36e1dc (patch) | |
| tree | 955f8ad9db2dc189bd84802ee77c95eadd4dda62 /mysql-test/t/myisam.test | |
| parent | 4fda992bff2034ff551d30cb5da742184ff4a3df (diff) | |
| parent | cdd5a353c4d0443e207a97a99fe05ed3eb2cbd37 (diff) | |
| download | mariadb-git-747ec6f9046ea18ba687e5f878762d342d36e1dc.tar.gz | |
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work1-testcases-20061
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
BUILD/check-cpu:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/myisam.test:
Auto merged
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 082f9c1f844..960d060f6a7 100644 --- a/mysql-test/t/myisam.test +++ b/mysql-test/t/myisam.test @@ -495,7 +495,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; |