Commit 2e6b48af authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

replication updates and bugfixes. Still not perfect - there is some strange 

memory corruption I can only repeat on one system.
parent d993a1c0

mysql-test/r/multi_update.result

+27 −0
Original line number Diff line number Diff line
@@ -2,7 +2,34 @@ drop table if exists t1,t2,t3; 
create table t1(id1 int not null auto_increment primary key, t char(12));

create table t2(id2 int not null, t char(12));

create table t3(id3 int not null, t char(12), index(id3));

select count(*) from t1 where id1 > 95;

count(*)

5

select count(*) from t2 where id2 > 95;

count(*)

25

select count(*) from t3 where id3 > 95;

count(*)

250

update t1,t2,t3 set t1.t="aaa", t2.t="bbb", t3.t="cc" where  t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 90;

select count(*) from t1 where t = "aaa";

count(*)

10

select count(*) from t1 where id1 > 90;

count(*)

10

select count(*) from t2 where t = "bbb";

count(*)

10

select count(*) from t2 where id2 > 90;

count(*)

50

select count(*) from t3 where t = "cc";

count(*)

500

select count(*) from t3 where id3 > 90;

count(*)

500

delete t1.*, t2.*, t3.*  from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 95;

check table t1, t2, t3;

Table	Op	Msg_type	Msg_text

mysql-test/r/rpl000015.result

+3 −3
Original line number Diff line number Diff line
@@ -9,16 +9,16 @@ Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Lo 
change master to master_host='127.0.0.1';

show slave status;

Master_Host	Master_User	Master_Port	Connect_retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Exec_master_log_pos

127.0.0.1	test	MASTER_PORT	60		4	slave-relay-bin.001	4		No	No			0		0	0

127.0.0.1	test	MASTER_PORT	7		4	slave-relay-bin.001	4		No	No			0		0	0

change master to master_host='127.0.0.1',master_user='root',

master_password='',master_port=MASTER_PORT;

show slave status;

Master_Host	Master_User	Master_Port	Connect_retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Exec_master_log_pos

127.0.0.1	root	MASTER_PORT	60		4	slave-relay-bin.001	4		No	No			0		0	0

127.0.0.1	root	MASTER_PORT	7		4	slave-relay-bin.001	4		No	No			0		0	0

slave start;

show slave status;

Master_Host	Master_User	Master_Port	Connect_retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Exec_master_log_pos

127.0.0.1	root	MASTER_PORT	60	master-bin.001	79	slave-relay-bin.001	120	master-bin.001	Yes	Yes			0		0	79

127.0.0.1	root	MASTER_PORT	7	master-bin.001	79	slave-relay-bin.001	120	master-bin.001	Yes	Yes			0		0	79

drop table if exists t1;

create table t1 (n int);

insert into t1 values (10),(45),(90);

mysql-test/t/multi_update.test

+11 −0
Original line number Diff line number Diff line
@@ -29,7 +29,18 @@ while ($1) 
  dec $1;

 }

enable_query_log;



select count(*) from t1 where id1 > 95;

select count(*) from t2 where id2 > 95;

select count(*) from t3 where id3 > 95;



update t1,t2,t3 set t1.t="aaa", t2.t="bbb", t3.t="cc" where  t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 90;

select count(*) from t1 where t = "aaa";

select count(*) from t1 where id1 > 90;

select count(*) from t2 where t = "bbb";

select count(*) from t2 where id2 > 90;

select count(*) from t3 where t = "cc";

select count(*) from t3 where id3 > 90;

delete t1.*, t2.*, t3.*  from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 95;



check table t1, t2, t3;

mysql-test/t/rpl000014.test

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ sync_with_master; 
show slave status;

change master to master_log_pos=73;

slave stop;



change master to master_log_pos=73;

--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT

show slave status;

mysql-test/t/rpl000015-slave-master-info.opt

+1 −1
Original line number Diff line number Diff line 
--server-id=2
 
--server-id=22 --master-connect-retry=7