List:Commits« Previous MessageNext Message »
From:Libing Song Date:December 10 2010 7:50am
Subject:Re: bzr commit into mysql-5.1-bugteam branch (luis.soares:3512)
Bug#46697
View as plain text  
Hi Luis,
Nice work, approved!

On Fri, 2010-12-10 at 13:12 +0800, Libing Song wrote:
> Hi Daogang,
> Nice work, approved!
> 
> On Fri, 2010-12-03 at 17:17 +0000, Luis Soares wrote:
> > #At file:///home/lsoares/Workspace/bzr/work/bugfixing/46697/mysql-5.1-bugteam/
> based on revid:mats.kindahl@stripped
> > 
> >  3512 Luis Soares	2010-12-03
> >       BUG#46697: Table name in error message is not populated
> >       
> >       When a query fails with a different error on the slave,
> >       the sql thread outputs a message (M) containing:
> >       
> >         1. the error message format for the master error code
> >         2. the master error code
> >         3. the error message for the slave's error code
> >         4. the slave error code
> >       
> >       Given that the slave has no information on the error message
> >       itself that the master outputs, it can only print its own
> >       version of the message format (but stripped from the 
> >       additional data if the message format requires). This may
> >       confuse users.
> >       
> >       To fix this we augment the slave's message (M) to explicitly
> >       state that the master's message is actually an error message 
> >       format, the one associated with the given master error code 
> >       and that the slave server knows about.
> > 
> >     modified:
> >       mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
> >       sql/log_event.cc
> > === modified file 'mysql-test/suite/rpl/r/rpl_stm_EE_err2.result'
> > --- a/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result	2008-11-13 19:19:00 +0000
> > +++ b/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result	2010-12-03 17:17:45 +0000
> > @@ -11,6 +11,6 @@ set sql_log_bin=1;
> >  insert into t1 values(1),(2);
> >  ERROR 23000: Duplicate entry '2' for key 'a'
> >  drop table t1;
> > -Error: "Query caused different errors on master and slave.     Error on master:
> 'Duplicate entry '%-.192s' for key %d' (1062), Error on slave: 'no error' (0). Default
> database: 'test'. Query: 'insert into t1 values(1),(2)'" (expected different error codes
> on master and slave)
> > +Error: "Query caused different errors on master and slave.     Error on master:
> message format='Duplicate entry '%-.192s' for key %d' error code=1062 ; Error on slave:
> actual message='no error', error code=0. Default database: 'test'. Query: 'insert into t1
> values(1),(2)'" (expected different error codes on master and slave)
> >  Errno: "0" (expected 0)
> >  drop table t1;
> > 
> > === modified file 'sql/log_event.cc'
> > --- a/sql/log_event.cc	2010-10-23 12:55:44 +0000
> > +++ b/sql/log_event.cc	2010-12-03 17:17:45 +0000
> > @@ -3337,7 +3337,8 @@ compare_errors:
> >        rli->report(ERROR_LEVEL, 0,
> >                        "\
> >  Query caused different errors on master and slave.     \
> > -Error on master: '%s' (%d), Error on slave: '%s' (%d). \
> > +Error on master: message format='%s' error code=%d ; \
> > +Error on slave: actual message='%s', error code=%d. \
> >  Default database: '%s'. Query: '%s'",
> >                        ER_SAFE(expected_error),
> >                        expected_error,
> > 
> > text/bzr-bundle type attachment
> > (bzr/luis.soares@stripped)
> > # Bazaar merge directive format 2 (Bazaar 0.90)
> > # revision_id: luis.soares@stripped
> > # target_branch: file:///home/lsoares/Workspace/bzr/work/bugfixing\
> > #   /46697/mysql-5.1-bugteam/
> > # testament_sha1: 4dbb4739f5c40095f5da74f88a0e1158fd9939e4
> > # timestamp: 2010-12-03 17:18:04 +0000
> > # source_branch: /home/lsoares/Workspace/bzr/clones/mysql-5.1-bugteam
> > # base_revision_id: mats.kindahl@stripped\
> > #   7udci9op4lc6jvtb
> > # 
> > # Begin bundle
> > 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
> > 28DxXvOBO96aiXA/xdyRThQkIBlwIoA=
> > 
> > 
> 
> -- 
> 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
> ==================================
> 
> 

-- 
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-5.1-bugteam branch (luis.soares:3512) Bug#46697Luis Soares3 Dec
  • Re: bzr commit into mysql-5.1-bugteam branch (luis.soares:3512)Bug#46697Daogang Qu7 Dec
  • Re: bzr commit into mysql-5.1-bugteam branch (luis.soares:3512)Bug#46697Libing Song10 Dec
    • Re: bzr commit into mysql-5.1-bugteam branch (luis.soares:3512)Bug#46697Libing Song10 Dec