Commit 2392c3ab authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

fixed bugs in the new stuff in rpl000001 test 

start slave thread if master.info is present and server_id is set
updates for rpl000015 and rpl000016 to remove master.info to make sure
master info struct does not get auto-initialized
parent 6fa6f331

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line 
heikki@donna.mysql.fi

sasha@mysql.sashanet.com

Docs/manual.texi

+12 −0
Original line number Diff line number Diff line
@@ -42845,6 +42845,18 @@ not yet 100% confident in this code. 
@appendixsubsec Changes in release 3.23.37

@itemize @bullet

@item

Slave thread will now be started even if @code{master-host} is not set, as

long as @code{server-id} is set and valid @code{master.info} is present

@item

Partial updates ( terminated with kill) are now logged with a special error

code to the binary log. Slave will refuse to execute them if the error code

indicates the update was terminated abnormally, and will have to be recovered

with @code{SET SQL_SLAVE_SKIP_COUNTER=1; SLAVE START} after a manual sanity

check/correction of data integrity

@item

Fixed bug that erroneously logged a drop of internal temporary table

 on thread termination to the binary log - bug affected replication

@item

Fixed a bug in @code{REGEXP()} on 64-bit machines.

@item

@code{UPDATE} and @code{DELETE} with @code{WHERE unique_key_part IS NULL}

mysql-test/r/rpl000001.result

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ sum(length(word)) 
(@id := id) - id

0

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter

127.0.0.1	root	9306	1	master-bin.001	1729584	No			1053	Slave: query ' update t1 set n = n + 1' partially completed on the master and was aborted. There is a chance that your master is inconsistent at this point. If you are sure that your master is ok, run this query manually on the slave and then restart the slave with SET SQL_SLAVE_SKIP_COUNTER=1; SLAVE START;	0

127.0.0.1	root	9306	1	master-bin.001	1729137	No			1053	Slave: query ' update t1 set n = n + 1' partially completed on the master and was aborted. There is a chance that your master is inconsistent at this point. If you are sure that your master is ok, run this query manually on the slave and then restart the slave with SET SQL_SLAVE_SKIP_COUNTER=1; SLAVE START;	0

count(*)

30000

n

mysql-test/t/rpl000001.test

+8 −0
Original line number Diff line number Diff line
@@ -20,7 +20,13 @@ drop table t1; 
save_master_pos;

connection slave;

sync_with_master;



#test handling of aborted connection in the middle of update

connection master;

reset master;

connection slave;

reset slave;



connection master;

drop table if exists t1,t2;

create table t1(n int);
@@ -44,6 +50,8 @@ connection master; 
reap;

connection slave;

sync_with_master ;

#give the slave a chance to exit

sleep 0.5;

show slave status;

set sql_slave_skip_counter=1;

slave start;

mysql-test/t/rpl000015-slave.sh

0 → 100755
+1 −0
Original line number Diff line number Diff line 
rm $MYSQL_TEST_DIR/var/slave-data/master.info