List:Commits« Previous MessageNext Message »
From:Libing Song Date:July 15 2010 4:09am
Subject:Re: bzr commit into mysql-next-mr-bugfixing branch (aelkin:3302)
Bug#54935 WL#2540
View as plain text  
Hi Andrei,
Nice work.
Please check my comments below.

On Fri, 2010-07-09 at 14:42 +0000, Andrei Elkin wrote:

> === modified file 'mysql-test/extra/binlog_tests/binlog.test'
> --- a/mysql-test/extra/binlog_tests/binlog.test	2010-06-19 09:24:34 +0000
> +++ b/mysql-test/extra/binlog_tests/binlog.test	2010-07-09 14:42:00 +0000
> @@ -243,14 +243,17 @@ reset master;
>  drop table if exists t3;
>  --enable_warnings
>  create table t3 (a int(11) NOT NULL AUTO_INCREMENT, b text, PRIMARY KEY (a) )
> engine=innodb;
> -show master status;
> +--let $binlog_file1= query_get_value(SHOW MASTER STATUS, File, 1)
> +--echo File $binlog_file1
I think it is better to use show_master_status.inc.
>  let $it=4;
>  while ($it)
>  {
>  insert into t3(b) values
> ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aa!
>  aaaaaaaaa
>  dec $it;
>  }
> -show master status /* must show new binlog index after rotating */;
> +--let $binlog_file2= query_get_value(SHOW MASTER STATUS, File, 1)
> +--echo *** show new binlog index after rotating ***
> +--echo File $binlog_file2
see above.
>  drop table t3;
>  
>  --echo #
> 
> === modified file 'mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test'
> --- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test	2010-04-28 12:47:49
> +0000
> +++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test	2010-07-09 14:42:00
> +0000
> @@ -320,6 +320,12 @@ disconnect con3;
>  
>  connection con4;
>  select get_lock("a",10); # wait for rollback to finish
get_lock can be removed, it do the same thing as
wait_for_binlog_event.inc.
> +if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'MIXED'`)
> +{
> + --let $wait_binlog_event= ROLLBACK
> + --source include/wait_for_binlog_event.inc
> + --let $binlog_rollback= query_get_value(SHOW BINLOG EVENTS, Pos, 7)
> +}
>  flush logs;
>  

> 
> === modified file 'mysql-test/suite/binlog/t/binlog_killed_simulate.test'
> --- a/mysql-test/suite/binlog/t/binlog_killed_simulate.test	2009-11-03 19:02:56
> +0000
> +++ b/mysql-test/suite/binlog/t/binlog_killed_simulate.test	2010-07-09 14:42:00
> +0000
> @@ -24,7 +24,8 @@ update t1 set a=2 /* will be "killed" af
>  #      for some constants like the offset of the first real event
>  #      that is different between severs versions.
>  let $MYSQLD_DATADIR= `select @@datadir`;
[snip]
> ---exec $MYSQL_BINLOG --force-if-open --start-position=107
> $MYSQLD_DATADIR/master-bin.000001 >
> $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
> +--let $binlog_start_point= query_get_value(SHOW BINLOG EVENTS LIMIT 1, End_log_pos,
> 1)
> +--exec $MYSQL_BINLOG --force-if-open --start-position=$binlog_start_point
> $MYSQLD_DATADIR/master-bin.000001 >
> $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
>  --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
>  eval select
>  (@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
This code is used a few times.
So I think it is better to write a include file to check log_event's
error. 
> @@ -49,10 +50,13 @@ load data infile '../../std_data/rpl_loa
>  
> 
>  # a proof the query is binlogged with an error
> -
> +--let $binlog_load_data= query_get_value(SHOW BINLOG EVENTS, Pos, 3)
> +--let $binlog_end=       query_get_value(SHOW BINLOG EVENTS, Pos, 4)
>  source include/show_binlog_events.inc;
>  
> ---exec $MYSQL_BINLOG --force-if-open --start-position=210 --stop-position=387
> $MYSQLD_DATADIR/master-bin.000001 >
> $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
> +--exec $MYSQL_BINLOG --force-if-open --start-position=$binlog_load_data
> --stop-position=$binlog_end $MYSQLD_DATADIR/master-bin.000001 >
> $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
> +
> +
>  --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
>  eval select
>  (@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
see above.


-- 
Your Sincerely,
Libing Song
==================================
MySQL Replication Team
Software Engineer


Email : Li-Bing.Song@stripped
Skype : libing.song
MSN   : slb_database@stripped
Phone : +86 010-6505-4020 ext. 319
Mobile: +86 138-1144-2038
==================================

Thread
bzr commit into mysql-next-mr-bugfixing branch (aelkin:3302) Bug#54935WL#2540Andrei Elkin9 Jul
  • Re: bzr commit into mysql-next-mr-bugfixing branch (aelkin:3302)Bug#54935 WL#2540Libing Song15 Jul
Re: bzr commit into mysql-next-mr-bugfixing branch (aelkin:3302)Bug#54935 WL#2540Libing Song15 Jul