bzr push into mysql-trunk branch (jon.hauglid:3788 to 3789) Bug#13833438

[Jon Olav Hauglid]

 3789 Jon Olav Hauglid	2012-03-16
      Bug#13833438 ERROR CODES MUST HAVE SAME VALUE ACROSS MYSQL VERSIONS
      
      Follow-up patch.
      
      Fix test failures when the following tests are run in MTS mode:
      - rpl.rpl_stm_EE_err2
      - rpl.rpl_loaddata
      - rpl.rpl_stm_loaddata_concurrent

    modified:
      mysql-test/extra/rpl_tests/rpl_loaddata.test
      mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
      mysql-test/suite/rpl/r/rpl_loaddata.result
      mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
      mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
 3788 Annamalai Gurusami	2012-03-16 [merge]
      merging from mysql-5.5 to mysql-trunk. 

    modified:
      mysql-test/suite/innodb/t/innodb_bug11766634.test
=== modified file 'mysql-test/extra/rpl_tests/rpl_loaddata.test'
--- a/mysql-test/extra/rpl_tests/rpl_loaddata.test	2011-12-09 21:08:37 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_loaddata.test	2012-03-16 07:00:39 +0000
@@ -158,7 +158,7 @@ if (`SELECT @@global.binlog_format != 'R
 {
   # Query causes error on master but not on slave. This causes the slave to
   # stop with error code 0 (which is wrong: see BUG#57287)
-  --let $slave_sql_errno= 0,1742
+  --let $slave_sql_errno= 0,1753
   --source include/wait_for_slave_sql_error.inc
   drop table t1, t2;
 }

=== modified file 'mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test'
--- a/mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test	2011-10-18 00:49:55 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test	2012-03-16 07:00:39 +0000
@@ -28,7 +28,7 @@ call mtr.add_suppression("Slave SQL.*Que
 call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 
 --echo (expect different error codes on master and slave)
---let $slave_sql_errno= 0,1742
+--let $slave_sql_errno= 0,1753
 # can't print error text. MTS reports a separate error in this case.
 # Todo: to fix single-threaded-slave BUG#57287.
 --let $show_slave_sql_error= 0

=== modified file 'mysql-test/suite/rpl/r/rpl_loaddata.result'
--- a/mysql-test/suite/rpl/r/rpl_loaddata.result	2011-12-09 21:08:37 +0000
+++ b/mysql-test/suite/rpl/r/rpl_loaddata.result	2012-03-16 07:00:39 +0000
@@ -82,7 +82,7 @@ load data infile '../../std_data/rpl_loa
 terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
 '\n##\n' starting by '>' ignore 1 lines;
 ERROR 23000: Duplicate entry '2003-03-22' for key 'day'
-include/wait_for_slave_sql_error.inc [errno=0,1742]
+include/wait_for_slave_sql_error.inc [errno=0,1753]
 drop table t1, t2;
 drop table t1, t2;
 CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_EE_err2.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result	2011-11-19 08:08:03 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result	2012-03-16 07:00:39 +0000
@@ -13,7 +13,7 @@ drop table t1;
 call mtr.add_suppression("Slave SQL.*Query caused different errors on master and slave.*Error on master:.* error code=1062.*Error on slave:.* Error_code: 0");
 call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 (expect different error codes on master and slave)
-include/wait_for_slave_sql_error.inc [errno=0,1742]
+include/wait_for_slave_sql_error.inc [errno=0,1753]
 drop table t1;
 include/stop_slave.inc
 RESET SLAVE;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result	2012-02-08 13:28:38 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result	2012-03-16 07:00:39 +0000
@@ -98,7 +98,7 @@ load data CONCURRENT infile '../../std_d
 terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
 '\n##\n' starting by '>' ignore 1 lines;
 ERROR 23000: Duplicate entry '2003-03-22' for key 'day'
-include/wait_for_slave_sql_error.inc [errno=0,1742]
+include/wait_for_slave_sql_error.inc [errno=0,1753]
 drop table t1, t2;
 drop table t1, t2;
 CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB;

No bundle (reason: useless for push emails).