Commit 353204ff authored by unknown's avatar unknown
Browse files

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
parents 9d8c9e9d cc21a482

mysql-test/t/myisam.test

+1 −1
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/query_cache_notembedded.test

+2 −2
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/rpl000015.test

+1 −1
Original line number Diff line number Diff line 
connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);

connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);

connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);

connection master;

reset master;

show master status;

mysql-test/t/rpl000017.test

+1 −1
Original line number Diff line number Diff line 
connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);

connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);

connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);

connection master;

reset master;

grant replication slave on *.* to replicate@localhost identified by 'aaaaaaaaaaaaaaab';

mysql-test/t/rpl_rotate_logs.test

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); 
--disable_warnings

drop table if exists t1, t2, t3, t4;

--enable_warnings

connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);

connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);

system cat /dev/null > $MYSQLTEST_VARDIR/slave-data/master.info;

system chmod 000 $MYSQLTEST_VARDIR/slave-data/master.info;

connection slave;