List:Commits« Previous MessageNext Message »
From:Luís Soares Date:April 13 2010 6:15pm
Subject:Re: bzr commit into mysql-5.1-rep+2 branch (luis.soares:3183) Bug#44486
View as plain text  
Hi Li-Bing,

  Here is the commit with the results updated:
  http://lists.mysql.com/commits/105571

Regards,
Luís

On Tue, 2010-04-13 at 22:40 +0800, Libing Song wrote:
> Hi Luis,
> 
> Nice work.
> Please find my review comments below.
> 
> STATUS
> ------
>   Not Approved.
> 
> REQUIRED CHANGES
> ----------------
>   RC1. There is wrong in 'rpl_flushlog_loop.result', please correct it.
>   RC2. Please check all test case again, some missed test cases are
> following.
>        + parts.rpl_partition
>        + rpl_known_bugs_detection
>        + rpl_loaddata_fatal
>        + rpl_rbr_to_sbr
>        + rpl_rotate_logs
>        + rpl_slave_skip
> 
> 
> DETAILS 
> -------
> n/a
> On Tue, 2010-03-30 at 01:05 +0000, Luis Soares wrote:
> > #At file:///home/lsoares/Workspace/bzr/work/features/b44486/mysql-5.1-rep%2B2/
> based on revid:zhenxing.he@stripped
> > 
> >  3183 Luis Soares	2010-03-30
> >       BUG#44486: master_retry_count cannot be displayed
> >       
> >       SHOW SLAVE STATUS did not show master_retry_count.
> >       
> >       We fix this by adding a line to the end of the output
> >       of SHOW SLAVE STATUS that prints out the current value
> >       of master_retry_count.
> >       
> >       Additionally, several test result files needed to be
> >       updated (due to the extra output in SHOW SLAVE STATUS).
> > 
> >     modified:
> >       mysql-test/suite/rpl/r/rpl_000015.result
> >       mysql-test/suite/rpl/r/rpl_bug33931.result
> >       mysql-test/suite/rpl/r/rpl_change_master.result
> >       mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
> >       mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
> >       mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
> >       mysql-test/suite/rpl/r/rpl_flushlog_loop.result
> >       mysql-test/suite/rpl/r/rpl_grant.result
> >       mysql-test/suite/rpl/r/rpl_heartbeat.result
> >       mysql-test/suite/rpl/r/rpl_incident.result
> >       mysql-test/suite/rpl/r/rpl_log_pos.result
> >       mysql-test/suite/rpl/r/rpl_replicate_do.result
> >       mysql-test/suite/rpl/r/rpl_row_colSize.result
> >       mysql-test/suite/rpl/r/rpl_row_log.result
> >       mysql-test/suite/rpl/r/rpl_row_log_innodb.result
> >       mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
> >       mysql-test/suite/rpl/r/rpl_row_reset_slave.result
> >       mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
> >       mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
> >       mysql-test/suite/rpl/r/rpl_row_until.result
> >       mysql-test/suite/rpl/r/rpl_skip_error.result
> >       mysql-test/suite/rpl/r/rpl_ssl.result
> >       mysql-test/suite/rpl/r/rpl_ssl1.result
> >       mysql-test/suite/rpl/r/rpl_stm_log.result
> >       mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result
> >       mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
> >       mysql-test/suite/rpl/r/rpl_stm_until.result
> >       mysql-test/suite/rpl/r/rpl_temporary_errors.result
> >       mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result
> >       mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
> >       mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
> >       mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result
> >       mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
> >       mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result
> >       sql/slave.cc
> > === modified file 'mysql-test/suite/rpl/r/rpl_000015.result'
> > --- a/mysql-test/suite/rpl/r/rpl_000015.result	2009-11-04 12:28:20 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_000015.result	2010-03-30 01:05:19 +0000
> > @@ -47,6 +47,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	0
> > +Master_Retry_Count	10
> >  start slave;
> >  SHOW SLAVE STATUS;
> >  Slave_IO_State	#
> > @@ -89,6 +90,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  drop table if exists t1;
> >  create table t1 (n int, PRIMARY KEY(n));
> >  insert into t1 values (10),(45),(90);
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_bug33931.result'
> > --- a/mysql-test/suite/rpl/r/rpl_bug33931.result	2009-11-28 14:53:48 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_bug33931.result	2010-03-30 01:05:19 +0000
> > @@ -44,4 +44,5 @@ Last_SQL_Errno	#
> >  Last_SQL_Error	Failed during slave thread initialization
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	0
> > +Master_Retry_Count	10
> >  SET GLOBAL debug="";
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_change_master.result'
> > --- a/mysql-test/suite/rpl/r/rpl_change_master.result	2009-10-02 08:35:03 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_change_master.result	2010-03-30 01:05:19 +0000
> > @@ -52,6 +52,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  change master to master_user='root';
> >  SHOW SLAVE STATUS;
> >  Slave_IO_State	#
> > @@ -94,6 +95,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  start slave;
> >  select * from t1;
> >  n
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_deadlock_innodb.result'
> > --- a/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result	2009-10-01 16:44:53
> +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result	2010-03-30 01:05:19
> +0000
> > @@ -91,6 +91,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  
> >  *** Test lock wait timeout ***
> >  include/stop_slave.inc
> > @@ -155,6 +156,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  
> >  *** Test lock wait timeout and purged relay logs ***
> >  SET @my_max_relay_log_size= @@global.max_relay_log_size;
> > @@ -224,6 +226,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  
> >  *** Clean up ***
> >  DROP TABLE t1,t2,t3;
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result'
> > --- a/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result	2009-12-17
> 21:43:35 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result	2010-03-30
> 01:05:19 +0000
> > @@ -134,6 +134,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  
> > 
> >  ***** Testing Altering table def scenario *****
> > @@ -512,6 +513,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  
> >  ****************************************
> >  * columns in master at middle of table *
> > @@ -588,6 +590,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	Column 2 of table 'test.t10' cannot be converted from type
> 'double' to type 'char(5)'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
> >  START SLAVE;
> >  
> > @@ -665,6 +668,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	Column 2 of table 'test.t11' cannot be converted from type
> 'tinyblob' to type 'varchar(254)'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
> >  START SLAVE;
> >  
> > @@ -818,6 +822,7 @@ Last_SQL_Errno	1091
> >  Last_SQL_Error	Error 'Can't DROP 'c7'; check that column/key exists' on query.
> Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  STOP SLAVE;
> >  RESET SLAVE;
> >  
> > @@ -906,6 +911,7 @@ Last_SQL_Errno	1054
> >  Last_SQL_Error	Error 'Unknown column 'c7' in 't15'' on query. Default database:
> 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  STOP SLAVE;
> >  RESET SLAVE;
> >  
> > @@ -994,6 +1000,7 @@ Last_SQL_Errno	1072
> >  Last_SQL_Error	Error 'Key column 'c6' doesn't exist in table' on query. Default
> database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  STOP SLAVE;
> >  RESET SLAVE;
> >  
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result'
> > --- a/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result	2009-12-17
> 21:43:35 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result	2010-03-30
> 01:05:19 +0000
> > @@ -134,6 +134,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  
> > 
> >  ***** Testing Altering table def scenario *****
> > @@ -512,6 +513,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  
> >  ****************************************
> >  * columns in master at middle of table *
> > @@ -588,6 +590,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	Column 2 of table 'test.t10' cannot be converted from type
> 'double' to type 'char(5)'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
> >  START SLAVE;
> >  
> > @@ -665,6 +668,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	Column 2 of table 'test.t11' cannot be converted from type
> 'tinyblob' to type 'varchar(254)'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
> >  START SLAVE;
> >  
> > @@ -818,6 +822,7 @@ Last_SQL_Errno	1091
> >  Last_SQL_Error	Error 'Can't DROP 'c7'; check that column/key exists' on query.
> Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  STOP SLAVE;
> >  RESET SLAVE;
> >  
> > @@ -906,6 +911,7 @@ Last_SQL_Errno	1054
> >  Last_SQL_Error	Error 'Unknown column 'c7' in 't15'' on query. Default database:
> 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  STOP SLAVE;
> >  RESET SLAVE;
> >  
> > @@ -994,6 +1000,7 @@ Last_SQL_Errno	1072
> >  Last_SQL_Error	Error 'Key column 'c6' doesn't exist in table' on query. Default
> database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  STOP SLAVE;
> >  RESET SLAVE;
> >  
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_flushlog_loop.result'
> > --- a/mysql-test/suite/rpl/r/rpl_flushlog_loop.result	2009-10-01 17:22:44 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_flushlog_loop.result	2010-03-30 01:05:19 +0000
> > @@ -62,3 +62,4 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	2
> > +Master_Retry_Count	8POSITION0
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_grant.result'
> > --- a/mysql-test/suite/rpl/r/rpl_grant.result	2009-10-01 16:44:53 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_grant.result	2010-03-30 01:05:19 +0000
> > @@ -82,3 +82,4 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_heartbeat.result'
> > --- a/mysql-test/suite/rpl/r/rpl_heartbeat.result	2009-11-04 12:28:20 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_heartbeat.result	2010-03-30 01:05:19 +0000
> > @@ -93,6 +93,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SHOW SLAVE STATUS;
> >  Slave_IO_State	#
> >  Master_Host	127.0.0.1
> > @@ -134,6 +135,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  show status like 'Slave_heartbeat_period';;
> >  Variable_name	Slave_heartbeat_period
> >  Value	0.500
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_incident.result'
> > --- a/mysql-test/suite/rpl/r/rpl_incident.result	2009-10-01 16:44:53 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_incident.result	2010-03-30 01:05:19 +0000
> > @@ -66,6 +66,7 @@ Last_SQL_Errno	1590
> >  Last_SQL_Error	The incident LOST_EVENTS occured on the master. Message:
> <none>
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
> >  START SLAVE;
> >  SELECT * FROM t1;
> > @@ -115,4 +116,5 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  DROP TABLE t1;
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_log_pos.result'
> > --- a/mysql-test/suite/rpl/r/rpl_log_pos.result	2009-11-10 18:45:15 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_log_pos.result	2010-03-30 01:05:19 +0000
> > @@ -51,6 +51,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  start slave;
> >  include/stop_slave.inc
> >  SHOW SLAVE STATUS;
> > @@ -94,6 +95,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  show master status;
> >  File	Position	Binlog_Do_DB	Binlog_Ignore_DB
> >  master-bin.000001	#	<Binlog_Do_DB>	<Binlog_Ignore_DB>
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_replicate_do.result'
> > --- a/mysql-test/suite/rpl/r/rpl_replicate_do.result	2009-10-01 16:44:53 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_replicate_do.result	2010-03-30 01:05:19 +0000
> > @@ -67,6 +67,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  create table t1 (ts timestamp);
> >  set one_shot time_zone='met';
> >  insert into t1 values('2005-08-12 00:00:00');
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_row_colSize.result'
> > --- a/mysql-test/suite/rpl/r/rpl_row_colSize.result	2009-12-17 21:43:35 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_row_colSize.result	2010-03-30 01:05:19 +0000
> > @@ -59,6 +59,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type
> 'decimal(20,10)' to type 'decimal(5,2)'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SELECT COUNT(*) FROM t1;
> >  COUNT(*)
> >  0
> > @@ -115,6 +116,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type
> 'decimal(27,18)' to type 'decimal(27,9)'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SELECT COUNT(*) FROM t1;
> >  COUNT(*)
> >  0
> > @@ -171,6 +173,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type
> 'decimal(20,10)' to type 'decimal(5,2)'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SELECT COUNT(*) FROM t1;
> >  COUNT(*)
> >  0
> > @@ -228,6 +231,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type
> 'double' to type 'float'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SELECT COUNT(*) FROM t1;
> >  COUNT(*)
> >  0
> > @@ -285,6 +289,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type
> 'bit(64)' to type 'bit(5)'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SELECT COUNT(*) FROM t1;
> >  COUNT(*)
> >  0
> > @@ -341,6 +346,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type
> 'bit(12)' to type 'bit(11)'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SELECT COUNT(*) FROM t1;
> >  COUNT(*)
> >  0
> > @@ -398,6 +404,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type 'set'
> to type 'set('4')'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SELECT COUNT(*) FROM t1;
> >  COUNT(*)
> >  0
> > @@ -455,6 +462,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type
> 'char(20)' to type 'char(10)'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SELECT COUNT(*) FROM t1;
> >  COUNT(*)
> >  0
> > @@ -543,6 +551,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type 'enum'
> to type 'enum('44','54')'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SELECT COUNT(*) FROM t1;
> >  COUNT(*)
> >  0
> > @@ -600,6 +609,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type
> 'varchar(2000)' to type 'varchar(100)'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SELECT COUNT(*) FROM t1;
> >  COUNT(*)
> >  0
> > @@ -656,6 +666,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type
> 'varchar(200)' to type 'varchar(10)'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SELECT COUNT(*) FROM t1;
> >  COUNT(*)
> >  0
> > @@ -712,6 +723,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type
> 'varchar(2000)' to type 'varchar(1000)'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SELECT COUNT(*) FROM t1;
> >  COUNT(*)
> >  0
> > @@ -769,6 +781,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type
> 'tinyblob' to type 'tinyblob'
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SELECT COUNT(*) FROM t1;
> >  COUNT(*)
> >  0
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_row_log.result'
> > --- a/mysql-test/suite/rpl/r/rpl_row_log.result	2009-11-03 19:02:56 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_row_log.result	2010-03-30 01:05:19 +0000
> > @@ -288,6 +288,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  show binlog events in 'slave-bin.000005' from 4;
> >  ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find
> target log
> >  DROP TABLE t1;
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_row_log_innodb.result'
> > --- a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result	2009-11-03 19:02:56
> +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result	2010-03-30 01:05:19
> +0000
> > @@ -288,6 +288,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  show binlog events in 'slave-bin.000005' from 4;
> >  ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find
> target log
> >  DROP TABLE t1;
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_row_max_relay_size.result'
> > --- a/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result	2009-10-01 16:44:53
> +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result	2010-03-30 01:05:19
> +0000
> > @@ -62,6 +62,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  #
> >  # Test 2
> >  #
> > @@ -112,6 +113,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  #
> >  # Test 3: max_relay_log_size = 0
> >  #
> > @@ -162,6 +164,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  #
> >  # Test 4: Tests below are mainly to ensure that we have not coded with wrong
> assumptions
> >  #
> > @@ -209,6 +212,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  #
> >  # Test 5
> >  #
> > @@ -257,6 +261,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  #
> >  # Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated
> >  #
> > @@ -303,6 +308,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  flush logs;
> >  show master status;
> >  File	Position	Binlog_Do_DB	Binlog_Ignore_DB
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_row_reset_slave.result'
> > --- a/mysql-test/suite/rpl/r/rpl_row_reset_slave.result	2009-11-04 12:28:20
> +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_row_reset_slave.result	2010-03-30 01:05:19
> +0000
> > @@ -45,6 +45,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  stop slave;
> >  change master to master_user='test';
> >  SHOW SLAVE STATUS;
> > @@ -88,6 +89,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  reset slave;
> >  SHOW SLAVE STATUS;
> >  Slave_IO_State	#
> > @@ -130,6 +132,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  change master to master_user='root';
> >  start slave;
> >  SHOW SLAVE STATUS;
> > @@ -173,6 +176,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  stop slave;
> >  reset slave;
> >  start slave;
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result'
> > --- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result	2009-12-17
> 21:43:35 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result	2010-03-30
> 01:05:19 +0000
> > @@ -159,6 +159,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	<Last_SQL_Error>
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  INSERT INTO t9 VALUES (4);
> >  INSERT INTO t4 VALUES (4);
> >  SHOW SLAVE STATUS;
> > @@ -202,6 +203,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	<Last_SQL_Error>
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
> >  START SLAVE;
> >  INSERT INTO t9 VALUES (5);
> > @@ -247,6 +249,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	<Last_SQL_Error>
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
> >  START SLAVE;
> >  INSERT INTO t9 VALUES (6);
> > @@ -292,6 +295,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	<Last_SQL_Error>
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
> >  START SLAVE;
> >  INSERT INTO t9 VALUES (6);
> > @@ -336,6 +340,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	<Last_SQL_Error>
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  INSERT INTO t7 VALUES (1),(2),(3);
> >  INSERT INTO t8 VALUES (1),(2),(3);
> >  SELECT * FROM t7 ORDER BY a;
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result'
> > --- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result	2009-12-17
> 21:43:35 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result	2010-03-30
> 01:05:19 +0000
> > @@ -159,6 +159,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	<Last_SQL_Error>
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  INSERT INTO t9 VALUES (4);
> >  INSERT INTO t4 VALUES (4);
> >  SHOW SLAVE STATUS;
> > @@ -202,6 +203,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	<Last_SQL_Error>
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
> >  START SLAVE;
> >  INSERT INTO t9 VALUES (5);
> > @@ -247,6 +249,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	<Last_SQL_Error>
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
> >  START SLAVE;
> >  INSERT INTO t9 VALUES (6);
> > @@ -292,6 +295,7 @@ Last_SQL_Errno	1658
> >  Last_SQL_Error	<Last_SQL_Error>
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
> >  START SLAVE;
> >  INSERT INTO t9 VALUES (6);
> > @@ -336,6 +340,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	<Last_SQL_Error>
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  INSERT INTO t7 VALUES (1),(2),(3);
> >  INSERT INTO t8 VALUES (1),(2),(3);
> >  SELECT * FROM t7 ORDER BY a;
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_row_until.result'
> > --- a/mysql-test/suite/rpl/r/rpl_row_until.result	2009-10-01 16:44:53 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_row_until.result	2010-03-30 01:05:19 +0000
> > @@ -61,6 +61,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  START SLAVE UNTIL MASTER_LOG_FILE='master-no-such-bin.000001',
> MASTER_LOG_POS=291;
> >  SELECT * FROM t1;
> >  n
> > @@ -109,6 +110,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  START SLAVE UNTIL RELAY_LOG_FILE='slave-relay-bin.000002',
> RELAY_LOG_POS=relay_pos_insert1_t2
> >  SELECT * FROM t2;
> >  n
> > @@ -155,6 +157,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  START SLAVE;
> >  include/stop_slave.inc
> >  START SLAVE SQL_THREAD UNTIL MASTER_LOG_FILE='master-bin.000001',
> MASTER_LOG_POS=master_pos_create_t2
> > @@ -199,6 +202,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  START SLAVE UNTIL MASTER_LOG_FILE='master-bin', MASTER_LOG_POS=561;
> >  ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE
> UNTIL
> >  START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=561,
> RELAY_LOG_POS=12;
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_skip_error.result'
> > --- a/mysql-test/suite/rpl/r/rpl_skip_error.result	2009-10-01 16:44:53 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_skip_error.result	2010-03-30 01:05:19 +0000
> > @@ -72,6 +72,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  ==== Clean Up ====
> >  drop table t1;
> >  create table t1(a int primary key);
> > @@ -127,6 +128,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  ==== Clean Up ====
> >  drop table t1;
> >  ==== Using Innodb ====
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_ssl.result'
> > --- a/mysql-test/suite/rpl/r/rpl_ssl.result	2009-10-01 16:44:53 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_ssl.result	2010-03-30 01:05:19 +0000
> > @@ -60,6 +60,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  STOP SLAVE;
> >  select * from t1;
> >  t
> > @@ -106,6 +107,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  drop user replssl@localhost;
> >  drop table t1;
> >  End of 5.0 tests
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_ssl1.result'
> > --- a/mysql-test/suite/rpl/r/rpl_ssl1.result	2009-10-01 16:44:53 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_ssl1.result	2010-03-30 01:05:19 +0000
> > @@ -59,6 +59,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  stop slave;
> >  change master to master_user='root',master_password='', master_ssl=0;
> >  start slave;
> > @@ -105,6 +106,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  stop slave;
> >  change master to
> >  master_host="localhost",
> > @@ -161,4 +163,5 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  drop table t1;
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_stm_log.result'
> > --- a/mysql-test/suite/rpl/r/rpl_stm_log.result	2010-02-12 23:30:44 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_stm_log.result	2010-03-30 01:05:19 +0000
> > @@ -286,6 +286,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  show binlog events in 'slave-bin.000005' from 4;
> >  ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find
> target log
> >  DROP TABLE t1;
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result'
> > --- a/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result	2009-10-01 16:44:53
> +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result	2010-03-30 01:05:19
> +0000
> > @@ -62,6 +62,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  #
> >  # Test 2
> >  #
> > @@ -112,6 +113,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  #
> >  # Test 3: max_relay_log_size = 0
> >  #
> > @@ -162,6 +164,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  #
> >  # Test 4: Tests below are mainly to ensure that we have not coded with wrong
> assumptions
> >  #
> > @@ -209,6 +212,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  #
> >  # Test 5
> >  #
> > @@ -257,6 +261,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  #
> >  # Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated
> >  #
> > @@ -303,6 +308,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  flush logs;
> >  show master status;
> >  File	Position	Binlog_Do_DB	Binlog_Ignore_DB
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_stm_reset_slave.result'
> > --- a/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result	2009-11-04 12:28:20
> +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result	2010-03-30 01:05:19
> +0000
> > @@ -45,6 +45,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  stop slave;
> >  change master to master_user='test';
> >  SHOW SLAVE STATUS;
> > @@ -88,6 +89,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  reset slave;
> >  SHOW SLAVE STATUS;
> >  Slave_IO_State	#
> > @@ -130,6 +132,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  change master to master_user='root';
> >  start slave;
> >  SHOW SLAVE STATUS;
> > @@ -173,6 +176,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  stop slave;
> >  reset slave;
> >  start slave;
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_stm_until.result'
> > --- a/mysql-test/suite/rpl/r/rpl_stm_until.result	2010-02-12 23:30:44 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_stm_until.result	2010-03-30 01:05:19 +0000
> > @@ -65,6 +65,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  start slave until master_log_file='master-no-such-bin.000001',
> master_log_pos=291;
> >  select * from t1;
> >  n
> > @@ -113,6 +114,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=891;
> >  select * from t2;
> >  n
> > @@ -159,6 +161,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  start slave;
> >  [on master]
> >  [on slave]
> > @@ -205,6 +208,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  ==== Test various error conditions ====
> >  start slave until master_log_file='master-bin', master_log_pos=561;
> >  ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE
> UNTIL
> > 
> > === modified file 'mysql-test/suite/rpl/r/rpl_temporary_errors.result'
> > --- a/mysql-test/suite/rpl/r/rpl_temporary_errors.result	2009-10-18 03:57:38
> +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_temporary_errors.result	2010-03-30 01:05:19
> +0000
> > @@ -80,6 +80,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  DROP TABLE t1;
> >  **** On Master ****
> >  DROP TABLE t1;
> > 
> > === modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result'
> > --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result	2009-10-01 16:44:53 +0000
> > +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result	2010-03-30 01:05:19 +0000
> > @@ -181,6 +181,7 @@ Last_SQL_Errno	<Last_SQL_Errno>
> >  Last_SQL_Error	<Last_SQL_Error>
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  set GLOBAL slave_transaction_retries=10;
> >  include/start_slave.inc
> >  select * from t1 order by nid;
> > 
> > === modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result'
> > --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result	2009-10-01 16:44:53
> +0000
> > +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result	2010-03-30 01:05:19
> +0000
> > @@ -58,6 +58,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SELECT * FROM t1 ORDER BY a;
> >  a	b
> >  1	2
> > @@ -103,5 +104,6 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	2
> > +Master_Retry_Count	86400
> >  STOP SLAVE;
> >  DROP TABLE t1;
> > 
> > === modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result'
> > --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result	2009-11-10
> 18:45:15 +0000
> > +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result	2010-03-30
> 01:05:19 +0000
> > @@ -55,6 +55,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	2
> > +Master_Retry_Count	86400
> >  SELECT * FROM t1 ORDER BY a;
> >  a	b
> >  1	2
> > @@ -106,4 +107,5 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  DROP TABLE t1;
> > 
> > === modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result'
> > --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result	2009-10-01 16:44:53
> +0000
> > +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result	2010-03-30 01:05:19
> +0000
> > @@ -33,15 +33,15 @@ c1	c2	c3
> >  row3	C	3
> >  row4	D	4
> >  SHOW SLAVE STATUS;
> >
> -Slave_IO_State	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	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id
> >
> -<Slave_IO_State>	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	<Read_Master_Log_Pos>	<Relay_Log_File>	<Relay_Log_Pos>	master-bin.000001	Yes	Yes				<Replicate_Ignore_Table>			0		0	<Exec_Master_Log_Pos>	<Relay_Log_Space>	None		0	No						<Seconds_Behind_Master>	No	<Last_IO_Errno>	<Last_IO_Error>	0			1
> >
> +Slave_IO_State	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	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Master_Retry_Count
> >
> +<Slave_IO_State>	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	<Read_Master_Log_Pos>	<Relay_Log_File>	<Relay_Log_Pos>	master-bin.000001	Yes	Yes				<Replicate_Ignore_Table>			0		0	<Exec_Master_Log_Pos>	<Relay_Log_Space>	None		0	No						<Seconds_Behind_Master>	No	<Last_IO_Errno>	<Last_IO_Error>	0			1	10
> >  STOP SLAVE;
> >  CHANGE MASTER TO
> >  master_log_file = 'master-bin.000001',
> >  master_log_pos = <the_pos> ;
> >  SHOW SLAVE STATUS;
> >
> -Slave_IO_State	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	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id
> >
> -<Slave_IO_State>	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	<Read_Master_Log_Pos>	<Relay_Log_File>	<Relay_Log_Pos>	master-bin.000001	No	No				<Replicate_Ignore_Table>			0		0	<Exec_Master_Log_Pos>	<Relay_Log_Space>	None		0	No						<Seconds_Behind_Master>	No	<Last_IO_Errno>	<Last_IO_Error>	0			1
> >
> +Slave_IO_State	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	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Master_Retry_Count
> >
> +<Slave_IO_State>	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	<Read_Master_Log_Pos>	<Relay_Log_File>	<Relay_Log_Pos>	master-bin.000001	No	No				<Replicate_Ignore_Table>			0		0	<Exec_Master_Log_Pos>	<Relay_Log_Space>	None		0	No						<Seconds_Behind_Master>	No	<Last_IO_Errno>	<Last_IO_Error>	0			1	10
> >  START SLAVE;
> >  SELECT * FROM t1 ORDER BY c3;
> >  c1	c2	c3
> > @@ -68,6 +68,6 @@ SELECT * FROM t1;
> >  c1	c2	c3
> >  row2	new on slave	2
> >  SHOW SLAVE STATUS;
> >
> -Slave_IO_State	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	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id
> >
> -<Slave_IO_State>	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	<Read_Master_Log_Pos>	<Relay_Log_File>	<Relay_Log_Pos>	master-bin.000001	Yes	Yes				<Replicate_Ignore_Table>			0		0	<Exec_Master_Log_Pos>	<Relay_Log_Space>	None		0	No						<Seconds_Behind_Master>	<Last_IO_Errno>	<Last_IO_Error>		0			1
> >
> +Slave_IO_State	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	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Master_Retry_Count
> >
> +<Slave_IO_State>	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	<Read_Master_Log_Pos>	<Relay_Log_File>	<Relay_Log_Pos>	master-bin.000001	Yes	Yes				<Replicate_Ignore_Table>			0		0	<Exec_Master_Log_Pos>	<Relay_Log_Space>	None		0	No						<Seconds_Behind_Master>	<Last_IO_Errno>	<Last_IO_Error>		0			1	10
> >  DROP TABLE IF EXISTS t1;
> > 
> > === modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result'
> > --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result	2009-11-03 19:02:56 +0000
> > +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result	2010-03-30 01:05:19 +0000
> > @@ -304,6 +304,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  show binlog events in 'slave-bin.000005' from 4;
> >  ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find
> target log
> >  DROP TABLE t1;
> > 
> > === modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result'
> > --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result	2009-10-01 16:44:53 +0000
> > +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result	2010-03-30 01:05:19 +0000
> > @@ -109,6 +109,7 @@ Last_SQL_Errno	0
> >  Last_SQL_Error	
> >  Replicate_Ignore_Server_Ids	
> >  Master_Server_Id	1
> > +Master_Retry_Count	10
> >  SELECT hex(c1),hex(c2),c3 FROM t1 ORDER BY c3;
> >  hex(c1)	hex(c2)	c3
> >  1	1	row1
> > 
> > === modified file 'sql/slave.cc'
> > --- a/sql/slave.cc	2010-02-12 23:30:44 +0000
> > +++ b/sql/slave.cc	2010-03-30 01:05:19 +0000
> > @@ -1723,6 +1723,8 @@ bool show_master_info(THD* thd, Master_i
> >                                               FN_REFLEN));
> >    field_list.push_back(new Item_return_int("Master_Server_Id", sizeof(ulong),
> >                                             MYSQL_TYPE_LONG));
> > +  field_list.push_back(new Item_return_int("Master_Retry_Count", 10,
> > +                                           MYSQL_TYPE_LONGLONG));
> >  
> >    if (protocol->send_fields(&field_list,
> >                              Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
> > @@ -1872,6 +1874,9 @@ bool show_master_info(THD* thd, Master_i
> >      // Master_Server_id
> >      protocol->store((uint32) mi->master_id);
> >  
> > +    // Master_Retry_Count
> > +    protocol->store((ulonglong) master_retry_count);
> > +
> >      pthread_mutex_unlock(&mi->rli.err_lock);
> >      pthread_mutex_unlock(&mi->err_lock);
> >      pthread_mutex_unlock(&mi->rli.data_lock);
> > 
> 
> 


Thread
bzr commit into mysql-5.1-rep+2 branch (luis.soares:3183) Bug#44486Luis Soares30 Mar
  • Re: bzr commit into mysql-5.1-rep+2 branch (luis.soares:3183) Bug#44486Libing Song13 Apr
  • Re: bzr commit into mysql-5.1-rep+2 branch (luis.soares:3183) Bug#44486Libing Song13 Apr
    • Re: bzr commit into mysql-5.1-rep+2 branch (luis.soares:3183) Bug#44486Luís Soares13 Apr
    • Re: bzr commit into mysql-5.1-rep+2 branch (luis.soares:3183) Bug#44486Luís Soares13 Apr