List:Commits« Previous MessageNext Message »
From:Jon Olav Hauglid Date:December 5 2012 12:35pm
Subject:bzr push into mysql-trunk branch (jon.hauglid:5161 to 5162)
View as plain text  
 5162 Jon Olav Hauglid	2012-12-05
      Fix test failures due to error message renumbering:
      - main.insert 
      - rpl.rpl_loaddata 
      - rpl.rpl_stm_loaddata_concurrent 
      - rpl.rpl_stm_EE_err2 
      - rpl.rpl_stm_000001
      
      Add missing replace_column to rpl.rpl_row_until and update .result

    modified:
      mysql-test/extra/rpl_tests/rpl_loaddata.test
      mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
      mysql-test/r/insert.result
      mysql-test/suite/rpl/r/rpl_loaddata.result
      mysql-test/suite/rpl/r/rpl_row_until.result
      mysql-test/suite/rpl/r/rpl_stm_000001.result
      mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
      mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
      mysql-test/suite/rpl/t/rpl_row_until.test
 5161 horst.hunger@stripped	2012-12-05 [merge]
      Merge from 5.6.

    modified:
      mysql-test/include/wait_time_until_connected_again.inc
=== modified file 'mysql-test/extra/rpl_tests/rpl_loaddata.test'
--- a/mysql-test/extra/rpl_tests/rpl_loaddata.test	2012-12-02 07:31:42 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_loaddata.test	2012-12-05 12:35:16 +0000
@@ -70,7 +70,7 @@ save_master_pos;
 connection slave;
 # 1062 = ER_DUP_ENTRY
 call mtr.add_suppression("Slave SQL.*Error .Duplicate entry .10. for key .b.. on query.* Error_code: 1062");
-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: 1861");
+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: 1862");
 call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 --let $slave_sql_errno= 1062
 --source include/wait_for_slave_sql_error_and_skip.inc
@@ -161,10 +161,10 @@ 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)
   # A new error code ER_INCONSISTENT_ERROR has been introduced instead of 0. 
-  # The error code is 1861
+  # The error code is 1862
   # 1756 = ER_MTS_INCONSISTENT_DATA
-  # 1861 = ER_INCONSISTENT_ERROR
-  --let $slave_sql_errno= 1861,1756
+  # 1862 = ER_INCONSISTENT_ERROR
+  --let $slave_sql_errno= 1862,1756
   --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	2012-12-02 07:31:42 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test	2012-12-05 12:35:16 +0000
@@ -24,13 +24,13 @@ insert into t1 values(1),(2);
 drop table t1;
 
 connection slave;
-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: 1861");
+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: 1862");
 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)
 # 1756 = ER_MTS_INCONSISTENT_DATA
-# 1861 = ER_INCONSISTENT_ERROR
---let $slave_sql_errno= 1861,1756
+# 1862 = ER_INCONSISTENT_ERROR
+--let $slave_sql_errno= 1862,1756
 # 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/r/insert.result'
--- a/mysql-test/r/insert.result	2012-12-02 07:31:42 +0000
+++ b/mysql-test/r/insert.result	2012-12-05 12:35:16 +0000
@@ -577,10 +577,10 @@ DROP TABLE t1;
 CREATE TABLE t1( a INT );
 INSERT DELAYED INTO t1 VALUES ( 1 );
 Warnings:
-Warning	1864	INSERT DELAYED is no longer supported. The statement was converted to INSERT.
+Warning	1865	INSERT DELAYED is no longer supported. The statement was converted to INSERT.
 REPLACE DELAYED INTO t1 VALUES ( 1 );
 Warnings:
-Warning	1864	REPLACE DELAYED is no longer supported. The statement was converted to REPLACE.
+Warning	1865	REPLACE DELAYED is no longer supported. The statement was converted to REPLACE.
 DROP TABLE t1;
 SET GLOBAL delayed_insert_limit = DEFAULT;
 Warnings:

=== modified file 'mysql-test/suite/rpl/r/rpl_loaddata.result'
--- a/mysql-test/suite/rpl/r/rpl_loaddata.result	2012-12-02 07:31:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_loaddata.result	2012-12-05 12:35:16 +0000
@@ -31,7 +31,7 @@ create table t1(a int, b int, unique(b))
 insert into t1 values(1,10);
 load data infile '../../std_data/rpl_loaddata.dat' into table t1;
 call mtr.add_suppression("Slave SQL.*Error .Duplicate entry .10. for key .b.. on query.* Error_code: 1062");
-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: 1861");
+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: 1862");
 call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 include/wait_for_slave_sql_error_and_skip.inc [errno=1062]
 include/check_slave_no_error.inc
@@ -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=1861,1756]
+include/wait_for_slave_sql_error.inc [errno=1862,1756]
 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_row_until.result'
--- a/mysql-test/suite/rpl/r/rpl_row_until.result	2012-12-05 05:41:51 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_until.result	2012-12-05 12:35:16 +0000
@@ -12,9 +12,9 @@ INSERT INTO t2 VALUES (3),(4);
 DROP TABLE t2;
 include/stop_slave.inc
 RESET SLAVE;
-+Warnings:
-+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-+Note	####	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=master_pos_drop_t1
 include/wait_for_slave_sql_to_stop.inc
 SELECT * FROM t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_000001.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_000001.result	2012-12-02 07:31:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_000001.result	2012-12-05 12:35:16 +0000
@@ -54,7 +54,7 @@ select (@id := id) - id from t2;
 kill @id;
 drop table t2;
 Got one of the listed errors
-include/wait_for_slave_sql_error.inc [errno=1860]
+include/wait_for_slave_sql_error.inc [errno=1861]
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
 include/start_slave.inc
 select count(*) from t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_EE_err2.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result	2012-12-02 07:31:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result	2012-12-05 12:35:16 +0000
@@ -10,10 +10,10 @@ set sql_log_bin=1;
 insert into t1 values(1),(2);
 ERROR 23000: Duplicate entry '2' for key 'a'
 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: 1861");
+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: 1862");
 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=1861,1756]
+include/wait_for_slave_sql_error.inc [errno=1862,1756]
 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-12-02 07:31:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result	2012-12-05 12:35:16 +0000
@@ -47,7 +47,7 @@ create table t1(a int, b int, unique(b))
 insert into t1 values(1,10);
 load data CONCURRENT infile '../../std_data/rpl_loaddata.dat' into table t1;
 call mtr.add_suppression("Slave SQL.*Error .Duplicate entry .10. for key .b.. on query.* Error_code: 1062");
-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: 1861");
+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: 1862");
 call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 include/wait_for_slave_sql_error_and_skip.inc [errno=1062]
 include/check_slave_no_error.inc
@@ -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=1861,1756]
+include/wait_for_slave_sql_error.inc [errno=1862,1756]
 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/t/rpl_row_until.test'
--- a/mysql-test/suite/rpl/t/rpl_row_until.test	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_until.test	2012-12-05 12:35:16 +0000
@@ -43,6 +43,7 @@ sync_slave_with_master;
 # Reset slave.
 RESET SLAVE;
 --disable_query_log
+--replace_column 2 ####
 eval CHANGE MASTER TO MASTER_USER='root', MASTER_CONNECT_RETRY=1, MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT;
 --enable_query_log
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (jon.hauglid:5161 to 5162) Jon Olav Hauglid5 Dec