5255 Mattias Jonsson 2012-12-14
post-push mysql-trunk fix by due to introducing new 5.6 error in bug#15961327.
Updated mysql-trunk only error numbers in tests+results.
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_stm_000001.result
mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
5254 Ramil Kalimullin 2012-12-14 [merge]
Auto-merge.
=== modified file 'mysql-test/extra/rpl_tests/rpl_loaddata.test'
--- a/mysql-test/extra/rpl_tests/rpl_loaddata.test revid:ramil.kalimullin@stripped
+++ b/mysql-test/extra/rpl_tests/rpl_loaddata.test revid:mattias.jonsson@stripped
@@ -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: 1863");
+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: 1864");
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 1863
+ # The error code is 1864
# 1756 = ER_MTS_INCONSISTENT_DATA
- # 1863 = ER_INCONSISTENT_ERROR
- --let $slave_sql_errno= 1863,1756
+ # 1864 = ER_INCONSISTENT_ERROR
+ --let $slave_sql_errno= 1864,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 revid:ramil.kalimullin@stripped
+++ b/mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test revid:mattias.jonsson@stripped
@@ -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: 1863");
+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: 1864");
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
-# 1863 = ER_INCONSISTENT_ERROR
---let $slave_sql_errno= 1863,1756
+# 1864 = ER_INCONSISTENT_ERROR
+--let $slave_sql_errno= 1864,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 revid:ramil.kalimullin@stripped
+++ b/mysql-test/r/insert.result revid:mattias.jonsson@stripped
@@ -577,10 +577,10 @@ DROP TABLE t1;
CREATE TABLE t1( a INT );
INSERT DELAYED INTO t1 VALUES ( 1 );
Warnings:
-Warning 1866 INSERT DELAYED is no longer supported. The statement was converted to INSERT.
+Warning 1867 INSERT DELAYED is no longer supported. The statement was converted to INSERT.
REPLACE DELAYED INTO t1 VALUES ( 1 );
Warnings:
-Warning 1866 REPLACE DELAYED is no longer supported. The statement was converted to REPLACE.
+Warning 1867 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 revid:ramil.kalimullin@stripped
+++ b/mysql-test/suite/rpl/r/rpl_loaddata.result revid:mattias.jonsson@stripped
@@ -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: 1863");
+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: 1864");
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=1863,1756]
+include/wait_for_slave_sql_error.inc [errno=1864,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_stm_000001.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_000001.result revid:ramil.kalimullin@stripped
+++ b/mysql-test/suite/rpl/r/rpl_stm_000001.result revid:mattias.jonsson@stripped
@@ -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=1862]
+include/wait_for_slave_sql_error.inc [errno=1863]
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 revid:ramil.kalimullin@stripped
+++ b/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result revid:mattias.jonsson@stripped
@@ -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: 1863");
+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: 1864");
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=1863,1756]
+include/wait_for_slave_sql_error.inc [errno=1864,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 revid:ramil.kalimullin@stripped
+++ b/mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result revid:mattias.jonsson@stripped
@@ -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: 1863");
+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: 1864");
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=1863,1756]
+include/wait_for_slave_sql_error.inc [errno=1864,1756]
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).
| Thread |
|---|
| • bzr push into mysql-trunk branch (mattias.jonsson:5254 to 5255) Bug#15961327 | Mattias Jonsson | 17 Dec |
