diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-12-21 18:23:14 -0700 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-12-21 18:23:14 -0700 |
| commit | 8e1f54501af7e39333b9226f7bc5dcfff5d63c8a (patch) | |
| tree | 098f0b40b44fba7320edd47b145d57749db01be9 /mysql-test/t/myisam.test | |
| parent | 8fb853ca5032564bd2943766890b3af27d3b3f7c (diff) | |
| parent | b95a067685ed8f902e0f92f89c16a374c9214980 (diff) | |
| download | mariadb-git-8e1f54501af7e39333b9226f7bc5dcfff5d63c8a.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
into siva.hindu.god:/usr/home/tim/m/bk/51
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysqld_multi.sh:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/sql_class.h:
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 810de78ff64..8270bd59ae0 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; |