Skip to content

Commit 0cebdcb

Browse files
author
gopal.shankar@oracle.com
committed
Post fix after push for Bug#11815557. Error codes were shifted by 1 in trunk, due to addition of new error code in 5.5.
1 parent 4e100bb commit 0cebdcb

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

mysql-test/extra/rpl_tests/rpl_loaddata.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ if (`SELECT @@global.binlog_format != 'ROW'`)
161161
# Query causes error on master but not on slave. This causes the slave to
162162
# stop with error code 0 (which is wrong: see BUG#57287)
163163
# ER_MTS_INCONSISTENT_DATA
164-
--let $slave_sql_errno= 0,1754
164+
--let $slave_sql_errno= 0,1755
165165
--source include/wait_for_slave_sql_error.inc
166166
drop table t1, t2;
167167
}

mysql-test/suite/rpl/r/rpl_loaddata.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields
8282
terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
8383
'\n##\n' starting by '>' ignore 1 lines;
8484
ERROR 23000: Duplicate entry '2003-03-22' for key 'day'
85-
include/wait_for_slave_sql_error.inc [errno=0,1754]
85+
include/wait_for_slave_sql_error.inc [errno=0,1755]
8686
drop table t1, t2;
8787
drop table t1, t2;
8888
CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB;

mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ load data CONCURRENT infile '../../std_data/rpl_loaddata2.dat' into table t2 fie
9898
terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
9999
'\n##\n' starting by '>' ignore 1 lines;
100100
ERROR 23000: Duplicate entry '2003-03-22' for key 'day'
101-
include/wait_for_slave_sql_error.inc [errno=0,1754]
101+
include/wait_for_slave_sql_error.inc [errno=0,1755]
102102
drop table t1, t2;
103103
drop table t1, t2;
104104
CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB;

0 commit comments

Comments
 (0)