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/myisam.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/myisam.test')
| -rw-r--r-- | mysql-test/t/myisam.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test index 0abe0a25f44..68c7b55c501 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; @@ -882,4 +882,4 @@ CREATE TABLE t1 (c1 TEXT) AVG_ROW_LENGTH=70100 MAX_ROWS=4100100100; SHOW TABLE STATUS LIKE 't1'; DROP TABLE t1; -# End of 4.1 tests +--echo End of 4.1 tests |