bzr push into mysql-trunk branch (rohit.kalhans:3410 to 3411) Bug#12765441

[Rohit Kalhans]

 3411 Rohit Kalhans	2011-09-19
      BUG#12765441:RPL_ROW_IGNORABLE_EVENT FAILS SPORADICALLY: CRASH IN DBUG CODE
      
      Problem: rpl.rpl_row_ingnorable_event failed ob pb2:crash in dbug code.
      
      Background: resetting the debug variable (on the master),
      while the dump thread is running, may cause sporadic
      races between user and dump threads.
      
      Fix: 
      1. Skip slave start in the begining (delay till needed).
      2. Change the values of debug variables.
      3. Start the slave thread (when needed).
     @ mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
        Updated result file.
     @ mysql-test/suite/rpl/t/rpl_row_ignorable_event.test
        Delay the start of slave threads on slave connection till  required.

    modified:
      mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
      mysql-test/suite/rpl/t/rpl_row_ignorable_event.test
 3410 Rafal Somla	2011-09-16 [merge]
      Fix for auth_rpl test.
      
      The test is fixed to provide correct password for the account using test authentication plugin. Also, the --master-retry-count option which is now obsolete is replaced by a corresponding clause of CHANGE MASTER TO command.

    modified:
      mysql-test/r/auth_rpl.result
      mysql-test/t/auth_rpl-slave.opt
      mysql-test/t/auth_rpl.test
=== modified file 'mysql-test/suite/rpl/r/rpl_row_ignorable_event.result'
--- a/mysql-test/suite/rpl/r/rpl_row_ignorable_event.result	2011-05-10 10:45:25 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_ignorable_event.result	2011-09-19 09:03:42 +0000
@@ -898,6 +898,7 @@ master-bin.000001	#	Table_map	#	#	table_
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t7` /* generated by server */
+include/start_slave.inc
 # Test The Rows_query log event can be relayed.
 # SHOW BINLOG EVENTS ON SLAVE
 show binlog events from <binlog_start>;

=== modified file 'mysql-test/suite/rpl/t/rpl_row_ignorable_event.test'
--- a/mysql-test/suite/rpl/t/rpl_row_ignorable_event.test	2011-05-10 10:45:25 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_ignorable_event.test	2011-09-19 09:03:42 +0000
@@ -8,6 +8,11 @@
 #
 
 source include/have_binlog_format_row.inc;
+ 
+#We will delay the slave start as resetting the debug variable (on the master)
+#while the dump thread is running, may cause sporadic races between user and
+#dump threads. BUG#12765441
+--let $rpl_skip_start_slave= 1
 source include/master-slave.inc;
 source include/have_binlog_rows_query.inc;
 source include/have_innodb.inc;
@@ -132,6 +137,9 @@ insert into t7(a) values(UUID_SHORT());
 drop table t7;
 source include/show_binlog_events.inc;
 
+--connection slave
+--source include/start_slave.inc
+--connection master
 sync_slave_with_master;
 --let $binlog_start= query_get_value(SHOW BINLOG EVENTS LIMIT 1, End_log_pos, 1)
 --echo # Test The Rows_query log event can be relayed.

No bundle (reason: useless for push emails).