List:Commits« Previous MessageNext Message »
From:Libing Song Date:July 16 2010 2:36am
Subject:Re: bzr commit into mysql-next-mr-bugfixing branch (aelkin:3303)
Bug#54935 WL#2540
View as plain text  
Hi Andrei,
Nice work.
Patch approved.

On Thu, 2010-07-15 at 14:42 +0000, Andrei Elkin wrote:
> #At file:///home/andrei/MySQL/BZR/2a-23May/mysql-next-mr-bugfixing/ based on
> revid:aelkin@stripped
> 
>  3303 Andrei Elkin	2010-07-15
>        bug#54935 few tests with explicit log pos stand in the way wl#2540 merging
>       
>       Deploying an assert about expected ROLLBACK query instead of asking question
> wait_for macro
> 
>     modified:
>       mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
> === modified file 'mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test'
> --- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test	2010-07-09 14:42:00
> +0000
> +++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test	2010-07-15 14:42:30
> +0000
> @@ -322,9 +322,13 @@ connection con4;
>  select get_lock("a",10); # wait for rollback to finish
>  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)
> + --let $binlog_query= query_get_value(SHOW BINLOG EVENTS, Info, 7)
> + if (`SELECT 'ROLLBACK' != '$binlog_query'`) {
> +  --echo Wrong query from SHOW BINLOG EVENTS. Expected ROLLBACK, got
> '$binlog_query'
> +  --source include/show_rpl_debug_info.inc
> +  --die Wrong value for slave parameter
> + }
>  }
>  flush logs;
>  
> 
> text/bzr-bundle type attachment
> (bzr/aelkin@stripped)
> # Bazaar merge directive format 2 (Bazaar 0.90)
> # revision_id: aelkin@stripped
> # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-next-mr-\
> #   bugfixing/
> # testament_sha1: 07dd7fa45755034975aa55ad45727be97f932992
> # timestamp: 2010-07-15 17:42:40 +0300
> # base_revision_id: aelkin@stripped
> # 
> # Begin bundle
> IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXfgGy8AAajfgAAQfOf/937t
> nYD////6UARGp5VWKabKFAlETQCZAxTZEbSnkMo0wmTyDI0jyh6hzAEYJiAYBME0ZDQwCYIxMMiN
> CJhpU/TRpkmpk9JtQB5QaBoBoaBzAEYJiAYBME0ZDQwCYIxMJJENGSMAhNGJD0mj0gAAAAaeV2zk
> u7DUq1+PK69f+cRC3FOlaiQMY+0ZIqRfst7/SGggWq9cVVTftJ5XRCzqZn+dzziH8nYQZofU32bZ
> stEul7dpgPj/CvKwM+XRhlB0HWjr3K4N+u5w7zJJqt9nPZtnS7p1zKoR2uzkUuBiMnYW92/J7wvh
> aZRC8IU195ipZMUjcdGXDBdlDEi7VdXLAY+NieFPBgVAfvy84MAR+XOBDqBEansFDiR2gwpGoFgK
> i8wRgaiETe8EcObAbFRXPy8GNx7T8p+IZi/UsBWUUG4NZy4ZZmjVaaX5uKJw4Aq4GRtPHCAsex5D
> 0zvway1gvic1Z0sSZMLSWijFuYHKobK9leksKqAlr5AWNuDwMIzRaCt4IUkRsbMNzqmwCM1JkVIg
> 8UMa+ivU/tJU1lZnecf8LSO0bLlSukMukTr6MJmcaoBDSCOdwE2lIvGhY29ICg64PfzDDhhYq1i/
> CSJVV9JPE2wtZisIk0ifFgwY0B1tFmS3xqE3kKrWvRq1FkXFIowkBGSV+YdfVu2aMbrVMvnqciFa
> ZoJVRT5SY+NyK853ZxIA4DSMbvR9In04HAaPHFOJDrXcbP02WQjJR4oTV14zJiZT4ckYH1Rqduvb
> APLRgcHTqPLxZ3GG5roul80B0nUKzhppnCnz1jyRtrmq37bgWFx21cNfsEsOPIX8gwU5sJcTA49x
> /ZSh11WyrwQfnNlpNabMfJ8jy3FkVtYnUeiIX4CBUH2U3rY7LIEcljLH0bg3J64FsmdXaSRxLRHP
> n62vXplqwtJkz56uc0MjqB9e+vHIyKC+3HL4YNos3zzvZu9+3GhIuCBrTKb/WX1Mr5ugosEeecK1
> hiwPPyhXoKIUyQSc2SsUvU9BjLhciNNrb91J2pmVWk6o6huljAsJ0H4ndtMlN7OC1g2f3A95uO7E
> JEUjbb0zKZNC1w2FwdYiEjqVQK6Mb38ZknUPJtyjXiElsDPZt3hhDXeLMpOATArwo0Cj2gtoTBQ4
> IP5xb1zzW+iCRjvoNm9FOjRdI5dIJypxKrlNyY1jlJoB9IOsu/xIfQIJE3gIpITyipzIiB9MaKZv
> kyezM9gMlgOkhmTLYWmZ0cmKVmWxE6AKpHheFQUm4K3J700Dqs08bNHd2zq02MyedRVrYLn3ahwW
> 1PqihPNqYhVFpPC94TWx63olwiVEquIylln/Si5qSH4GcDDHJ1SYbDap7H9Dir17iAHX0HTeoo30
> JmQa5IY6FqAQIljZ42zlnmD3xJoQgIzDm2D7+zdbmw6LpW23FfETBYrGcaaHqcjqrXUlwW7UpaTz
> Cuvv0qwtBw0KCpiwJutu+DIpVTCfTsVzITpHg4lNMiNBWf8XckU4UJB34Bsv
> 
> 

-- 
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:3303) Bug#54935WL#2540Andrei Elkin15 Jul
  • Re: bzr commit into mysql-next-mr-bugfixing branch (aelkin:3303)Bug#54935 WL#2540Libing Song16 Jul