bzr commit into mysql-5.1-bugteam branch (luis.soares:3523) Bug#46697

[Luis Soares]

#At file:///home/lsoares/Workspace/bzr/work/bugfixing/46697/push/mysql-5.1-bugteam-push/ based on revid:sergey.glukhov@stripped

 3523 Luis Soares	2010-12-14 [merge]
      BUG#46697
      
      Autmoerging into latest mysql-5.1-bugteam.

    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-14 16:43:25 +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-14 16:43:25 +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,

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).