Libing Song wrote:
> Hi Daogang,
> Nice work. Patch approved.
> Please find my comment below.
>
>
> On Thu, 2009-12-24 at 07:31 +0000, Dao-Gang.Qu@stripped wrote:
>
>> --- a/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result 2009-10-29
> 02:26:59 +0000
>> +++ b/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result 2009-12-24
> 07:29:51 +0000
>> @@ -4,10 +4,9 @@ reset master;
>> reset slave;
>> drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
>> start slave;
>> -call mtr.add_suppression("Get master clock failed with error: ");
>> -call mtr.add_suppression("Get master SERVER_ID failed with error: ");
>>
> Please add a comment to explain why they are removed ?
>
Thanks! Will do it.
>
>> -call mtr.add_suppression("Slave I/O: Master command COM_REGISTER_SLAVE failed:
> failed registering on master, reconnecting to try again");
>> +call mtr.add_suppression("Slave I/O: Master command COM_REGISTER_SLAVE failed:
> .*");
>> call mtr.add_suppression("Fatal error: The slave I/O thread stops because master
> and slave have equal MySQL server ids; .*");
>> +call mtr.add_suppression("Slave I/O thread .* register on master");
>> SELECT IS_FREE_LOCK("debug_lock.before_get_UNIX_TIMESTAMP");
>> IS_FREE_LOCK("debug_lock.before_get_UNIX_TIMESTAMP")
>> 1
>>
>> === modified file
> 'mysql-test/suite/rpl/t/rpl_get_master_version_and_clock-slave.opt'
>> ---
> a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock-slave.opt 2009-10-29 02:26:59
> +0000
>> +++
> b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock-slave.opt 2009-12-24 07:29:51
> +0000
>> @@ -1 +1 @@
>> ---master-retry-count=60
>> +--master-retry-count=240
>>
>> === modified file 'mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test'
>> --- a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test 2009-10-29
> 02:26:59 +0000
>> +++ b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test 2009-12-24
> 07:29:51 +0000
>> @@ -16,12 +16,13 @@
>>
>> source include/master-slave.inc;
>> source include/have_debug.inc;
>> -call mtr.add_suppression("Get master clock failed with error: ");
>> -call mtr.add_suppression("Get master SERVER_ID failed with error: ");
>> -call mtr.add_suppression("Slave I/O: Master command COM_REGISTER_SLAVE failed:
> failed registering on master, reconnecting to try again");
>> +
>> +connection slave;
>> +call mtr.add_suppression("Slave I/O: Master command COM_REGISTER_SLAVE failed:
> .*");
>> call mtr.add_suppression("Fatal error: The slave I/O thread stops because master
> and slave have equal MySQL server ids; .*");
>> +call mtr.add_suppression("Slave I/O thread .* register on master");
>> +
>> #Test case 1: Try to get the value of the UNIX_TIMESTAMP from master under
> network disconnection
>> -connection slave;
>> let $debug_saved= `select @@global.debug`;
>>
>> let $debug_lock= "debug_lock.before_get_UNIX_TIMESTAMP";
>>
>>
>
>
>
