Merge 5.5 -> 10.0-base

19 files changed, 156 insertions, 36 deletions

diff --git a/mysql-test/extra/binlog_tests/binlog.test b/mysql-test/extra/binlog_tests/binlog.test
index a87f1f351cc..190aa9e04b9 100644
--- a/mysql-test/extra/binlog_tests/binlog.test
+++ b/mysql-test/extra/binlog_tests/binlog.test
@@ -216,7 +216,7 @@ reset master;
 create table t1 (id tinyint auto_increment primary key);
 insert into t1 values(5);
 set insert_id=128;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 insert into t1 values(null) /* Not binlogged */;
 
 # The followin insert ignore will be put in binlog
@@ -238,7 +238,7 @@ drop table t1;
 
 create table t1 (id tinyint auto_increment primary key) engine=myisam;
 set insert_id=128;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 insert into t1 values(5),(null) /* Insert_id 128 */;
 
 # The followin insert ignore will be put in binlog
diff --git a/mysql-test/include/ctype_str_to_date.inc b/mysql-test/include/ctype_str_to_date.inc
new file mode 100644
index 00000000000..62adb05b094
--- /dev/null
+++ b/mysql-test/include/ctype_str_to_date.inc
@@ -0,0 +1,12 @@
+--echo #
+--echo # MDEV-4842 STR_TO_DATE does not work with UCS2/UTF16/UTF32
+--echo #
+
+SELECT @@character_set_connection, HEX(CAST(_utf8'÷' AS CHAR));
+SELECT STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR));
+CREATE TABLE t1 AS SELECT REPEAT(' ', 64) AS subject, REPEAT(' ',64) AS pattern LIMIT 0;
+SHOW COLUMNS FROM t1;
+INSERT INTO t1 VALUES (_utf8'2001÷01÷01',_utf8'%Y÷%m÷%d');
+SELECT HEX(subject),HEX(pattern),STR_TO_DATE(subject, pattern) FROM t1;
+DROP TABLE t1;
+
diff --git a/mysql-test/r/ctype_latin1.result b/mysql-test/r/ctype_latin1.result
index 5ed8159aae3..2debf288f44 100644
--- a/mysql-test/r/ctype_latin1.result
+++ b/mysql-test/r/ctype_latin1.result
@@ -336,6 +336,25 @@ select c1 as c2h from t1 where c1 like 'ab#_def' escape '#';
 c2h
 ab_def
 drop table t1;
+#
+# MDEV-4842 STR_TO_DATE does not work with UCS2/UTF16/UTF32
+#
+SELECT @@character_set_connection, HEX(CAST(_utf8'÷' AS CHAR));
+@@character_set_connection	HEX(CAST(_utf8'÷' AS CHAR))
+latin1	F7
+SELECT STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR));
+STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR))
+2001-01-01
+CREATE TABLE t1 AS SELECT REPEAT(' ', 64) AS subject, REPEAT(' ',64) AS pattern LIMIT 0;
+SHOW COLUMNS FROM t1;
+Field	Type	Null	Key	Default	Extra
+subject	varchar(64)	NO			
+pattern	varchar(64)	NO			
+INSERT INTO t1 VALUES (_utf8'2001÷01÷01',_utf8'%Y÷%m÷%d');
+SELECT HEX(subject),HEX(pattern),STR_TO_DATE(subject, pattern) FROM t1;
+HEX(subject)	HEX(pattern)	STR_TO_DATE(subject, pattern)
+32303031F73031F73031	2559F7256DF72564	2001-01-01 00:00:00
+DROP TABLE t1;
 SET collation_connection='latin1_bin';
 create table t1 select repeat('a',4000) a;
 delete from t1;
diff --git a/mysql-test/r/ctype_sjis.result b/mysql-test/r/ctype_sjis.result
index abeb19c0c8f..b776f1cf7d6 100644
--- a/mysql-test/r/ctype_sjis.result
+++ b/mysql-test/r/ctype_sjis.result
@@ -138,6 +138,25 @@ a	hex(b)	c
 3	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	
 4	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	
 DROP TABLE t1;
+#
+# MDEV-4842 STR_TO_DATE does not work with UCS2/UTF16/UTF32
+#
+SELECT @@character_set_connection, HEX(CAST(_utf8'÷' AS CHAR));
+@@character_set_connection	HEX(CAST(_utf8'÷' AS CHAR))
+sjis	8180
+SELECT STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR));
+STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR))
+2001-01-01
+CREATE TABLE t1 AS SELECT REPEAT(' ', 64) AS subject, REPEAT(' ',64) AS pattern LIMIT 0;
+SHOW COLUMNS FROM t1;
+Field	Type	Null	Key	Default	Extra
+subject	varchar(64)	NO			
+pattern	varchar(64)	NO			
+INSERT INTO t1 VALUES (_utf8'2001÷01÷01',_utf8'%Y÷%m÷%d');
+SELECT HEX(subject),HEX(pattern),STR_TO_DATE(subject, pattern) FROM t1;
+HEX(subject)	HEX(pattern)	STR_TO_DATE(subject, pattern)
+323030318180303181803031	25598180256D81802564	2001-01-01 00:00:00
+DROP TABLE t1;
 SET collation_connection='sjis_bin';
 create table t1 select repeat('a',4000) a;
 delete from t1;
diff --git a/mysql-test/r/ctype_ucs.result b/mysql-test/r/ctype_ucs.result
index f73ea4bdbee..20aabdb528b 100644
--- a/mysql-test/r/ctype_ucs.result
+++ b/mysql-test/r/ctype_ucs.result
@@ -804,6 +804,25 @@ a	hex(b)	c
 3	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	
 4	F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2F1F2	
 DROP TABLE t1;
+#
+# MDEV-4842 STR_TO_DATE does not work with UCS2/UTF16/UTF32
+#
+SELECT @@character_set_connection, HEX(CAST(_utf8'÷' AS CHAR));
+@@character_set_connection	HEX(CAST(_utf8'÷' AS CHAR))
+ucs2	00F7
+SELECT STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR));
+STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR))
+2001-01-01
+CREATE TABLE t1 AS SELECT REPEAT(' ', 64) AS subject, REPEAT(' ',64) AS pattern LIMIT 0;
+SHOW COLUMNS FROM t1;
+Field	Type	Null	Key	Default	Extra
+subject	varchar(64)	NO			
+pattern	varchar(64)	NO			
+INSERT INTO t1 VALUES (_utf8'2001÷01÷01',_utf8'%Y÷%m÷%d');
+SELECT HEX(subject),HEX(pattern),STR_TO_DATE(subject, pattern) FROM t1;
+HEX(subject)	HEX(pattern)	STR_TO_DATE(subject, pattern)
+003200300030003100F70030003100F700300031	0025005900F70025006D00F700250064	2001-01-01 00:00:00
+DROP TABLE t1;
 SET NAMES latin1;
 SET collation_connection='ucs2_bin';
 create table t1 select repeat('a',4000) a;
diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result
index e7aaf68b271..a2324ff9dee 100644
--- a/mysql-test/r/ctype_utf8.result
+++ b/mysql-test/r/ctype_utf8.result
@@ -977,6 +977,25 @@ ss
 u,ü
 ue
 drop table t1;
+#
+# MDEV-4842 STR_TO_DATE does not work with UCS2/UTF16/UTF32
+#
+SELECT @@character_set_connection, HEX(CAST(_utf8'÷' AS CHAR));
+@@character_set_connection	HEX(CAST(_utf8'÷' AS CHAR))
+utf8	C3B7
+SELECT STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR));
+STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR))
+2001-01-01
+CREATE TABLE t1 AS SELECT REPEAT(' ', 64) AS subject, REPEAT(' ',64) AS pattern LIMIT 0;
+SHOW COLUMNS FROM t1;
+Field	Type	Null	Key	Default	Extra
+subject	varchar(64)	NO			
+pattern	varchar(64)	NO			
+INSERT INTO t1 VALUES (_utf8'2001÷01÷01',_utf8'%Y÷%m÷%d');
+SELECT HEX(subject),HEX(pattern),STR_TO_DATE(subject, pattern) FROM t1;
+HEX(subject)	HEX(pattern)	STR_TO_DATE(subject, pattern)
+32303031C3B73031C3B73031	2559C3B7256DC3B72564	2001-01-01 00:00:00
+DROP TABLE t1;
 SET collation_connection='utf8_bin';
 create table t1 select repeat('a',4000) a;
 delete from t1;
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index 811861a6d93..7228daa2712 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -232,7 +232,7 @@ mysqltest: At line 2: Spurious text after `query` expression
 mysqltest: At line 1: Missing argument(s) to 'error'
 mysqltest: At line 1: Missing argument(s) to 'error'
 mysqltest: At line 1: The sqlstate definition must start with an uppercase S
-mysqltest: At line 1: The error name definition must start with an uppercase E or W
+mysqltest: At line 1: The error name definition must start with an uppercase E or W or H
 mysqltest: At line 1: Invalid argument to error: '9eeeee' - the errno may only consist of digits[0-9]
 mysqltest: At line 1: Invalid argument to error: '1sssss' - the errno may only consist of digits[0-9]
 mysqltest: At line 1: The sqlstate must be exactly 5 chars long
diff --git a/mysql-test/suite/sys_vars/r/thread_pool_size_high.result b/mysql-test/suite/sys_vars/r/thread_pool_size_high.result
new file mode 100644
index 00000000000..f581ae8e315
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/thread_pool_size_high.result
@@ -0,0 +1,11 @@
+SELECT @@global.thread_pool_size;
+@@global.thread_pool_size
+200
+SET @@global.thread_pool_size=150;
+SET @@global.thread_pool_size=200;
+SET @@global.thread_pool_size=201;
+Warnings:
+Warning	1292	Truncated incorrect thread_pool_size value: '201'
+SELECT @@global.thread_pool_size;
+@@global.thread_pool_size
+200
diff --git a/mysql-test/suite/sys_vars/t/thread_pool_size_basic.opt b/mysql-test/suite/sys_vars/t/thread_pool_size_basic.opt
new file mode 100644
index 00000000000..7a2696875b8
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/thread_pool_size_basic.opt
@@ -0,0 +1 @@
+--loose-thread-handling=pool-of-threads
diff --git a/mysql-test/suite/sys_vars/t/thread_pool_size_basic.test b/mysql-test/suite/sys_vars/t/thread_pool_size_basic.test
index eeed58956a4..5d432eb9940 100644
--- a/mysql-test/suite/sys_vars/t/thread_pool_size_basic.test
+++ b/mysql-test/suite/sys_vars/t/thread_pool_size_basic.test
@@ -1,6 +1,7 @@
 # uint global
 --source include/not_windows.inc
 --source include/not_embedded.inc
+--source include/have_pool_of_threads.inc
 SET @start_global_value = @@global.thread_pool_size;
 
 #
diff --git a/mysql-test/suite/sys_vars/t/thread_pool_size_high.opt b/mysql-test/suite/sys_vars/t/thread_pool_size_high.opt
new file mode 100644
index 00000000000..fe54a37c4ce
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/thread_pool_size_high.opt
@@ -0,0 +1 @@
+--loose-thread-handling=pool-of-threads --loose-thread-pool-size=200
diff --git a/mysql-test/suite/sys_vars/t/thread_pool_size_high.test b/mysql-test/suite/sys_vars/t/thread_pool_size_high.test
new file mode 100644
index 00000000000..761aeee2b0a
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/thread_pool_size_high.test
@@ -0,0 +1,14 @@
+--source include/not_windows.inc
+--source include/not_embedded.inc
+--source include/have_pool_of_threads.inc
+
+SELECT @@global.thread_pool_size;
+
+# Set lower value
+SET @@global.thread_pool_size=150;
+# Set original value
+SET @@global.thread_pool_size=200;
+# Try higher value
+SET @@global.thread_pool_size=201;
+
+SELECT @@global.thread_pool_size;
diff --git a/mysql-test/t/auto_increment.test b/mysql-test/t/auto_increment.test
index 15156b89d8e..7f0ab5dc169 100644
--- a/mysql-test/t/auto_increment.test
+++ b/mysql-test/t/auto_increment.test
@@ -104,7 +104,7 @@ explain extended select last_insert_id();
 --error ER_DUP_ENTRY
 insert into t1 set i = 254;
 select last_insert_id();
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 insert into t1 set i = null;
 select last_insert_id();
 drop table t1;
@@ -113,7 +113,7 @@ create table t1 (i tinyint unsigned not null auto_increment, key (i));
 insert into t1 set i = 254;
 insert into t1 set i = null;
 select last_insert_id();
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 insert into t1 set i = null;
 select last_insert_id();
 drop table t1;
@@ -354,7 +354,7 @@ INSERT INTO t1 VALUES (18446744073709551601);
 SET @@SESSION.AUTO_INCREMENT_INCREMENT=10;
 
 SELECT @@SESSION.AUTO_INCREMENT_OFFSET;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 INSERT INTO t1 VALUES (NULL), (NULL), (NULL);
 SELECT * FROM t1;
 
diff --git a/mysql-test/t/auto_increment_ranges.inc b/mysql-test/t/auto_increment_ranges.inc
index a94aa46d38e..1540be0828e 100644
--- a/mysql-test/t/auto_increment_ranges.inc
+++ b/mysql-test/t/auto_increment_ranges.inc
@@ -13,25 +13,25 @@ let $range_max=32767;
 
 eval create table t1 (a $type primary key auto_increment);
 eval insert into t1 values($range_max);
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 insert into t1 values(NULL);
 truncate table t1;
 eval insert into t1 values($range_max-1);
 insert into t1 values(NULL);
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 insert into t1 values(NULL);
 select * from t1;
 truncate table t1;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 eval insert into t1 values($range_max),(NULL);
 select * from t1;
 truncate table t1;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 eval insert into t1 values($range_max-1),(NULL),(NULL);
 truncate table t1;
 eval insert into t1 values($range_max+1);
 select * from t1;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 eval insert into t1 values(NULL);
 drop table t1;
 
@@ -44,25 +44,25 @@ let $range_max=65535;
 
 eval create table t1 (a $type primary key auto_increment);
 eval insert into t1 values($range_max);
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 insert into t1 values(NULL);
 truncate table t1;
 eval insert into t1 values($range_max-1);
 insert into t1 values(NULL);
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 insert into t1 values(NULL);
 select * from t1;
 truncate table t1;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 eval insert into t1 values($range_max),(NULL);
 select * from t1;
 truncate table t1;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 eval insert into t1 values($range_max-1),(NULL),(NULL);
 truncate table t1;
 eval insert into t1 values($range_max+1);
 select * from t1;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 eval insert into t1 values(NULL);
 drop table t1;
 
@@ -75,25 +75,25 @@ let $range_max=2147483647;
 
 eval create table t1 (a $type primary key auto_increment);
 eval insert into t1 values($range_max);
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 insert into t1 values(NULL);
 truncate table t1;
 eval insert into t1 values($range_max-1);
 insert into t1 values(NULL);
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 insert into t1 values(NULL);
 select * from t1;
 truncate table t1;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 eval insert into t1 values($range_max),(NULL);
 select * from t1;
 truncate table t1;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 eval insert into t1 values($range_max-1),(NULL),(NULL);
 truncate table t1;
 eval insert into t1 values($range_max+1);
 select * from t1;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 eval insert into t1 values(NULL);
 drop table t1;
 
@@ -106,25 +106,25 @@ let $range_max=4294967295;
 
 eval create table t1 (a $type primary key auto_increment);
 eval insert into t1 values($range_max);
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 insert into t1 values(NULL);
 truncate table t1;
 eval insert into t1 values($range_max-1);
 insert into t1 values(NULL);
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 insert into t1 values(NULL);
 select * from t1;
 truncate table t1;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 eval insert into t1 values($range_max),(NULL);
 select * from t1;
 truncate table t1;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 eval insert into t1 values($range_max-1),(NULL),(NULL);
 truncate table t1;
 eval insert into t1 values($range_max+1);
 select * from t1;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 eval insert into t1 values(NULL);
 drop table t1;
 
@@ -137,25 +137,25 @@ let $range_max=cast(9223372036854775807 as unsigned);
 
 eval create table t1 (a $type primary key auto_increment);
 eval insert into t1 values($range_max);
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 insert into t1 values(NULL);
 truncate table t1;
 eval insert into t1 values($range_max-1);
 insert into t1 values(NULL);
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 insert into t1 values(NULL);
 select * from t1;
 truncate table t1;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 eval insert into t1 values($range_max),(NULL);
 select * from t1;
 truncate table t1;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 eval insert into t1 values($range_max-1),(NULL),(NULL);
 truncate table t1;
 eval insert into t1 values($range_max+1);
 select * from t1;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 eval insert into t1 values(NULL);
 drop table t1;
 
@@ -200,7 +200,7 @@ set @org_mode=@@sql_mode;
 set @@sql_mode='ansi,traditional';
 insert ignore into t1 values(32766),(NULL),(NULL);
 truncate table t1;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 insert into t1 values(32766),(NULL),(NULL);
 set @@sql_mode=@org_mode;
 drop table t1;
@@ -223,7 +223,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (a smallint AUTO_INCREMENT, PRIMARY KEY (a));
 INSERT INTO t1 VALUES (2);
 INSERT INTO t1 VALUES (32768);
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 INSERT INTO t1 VALUES (NULL);
 SELECT * FROM t1;
 DROP TABLE t1;
@@ -235,6 +235,6 @@ DROP TABLE t1;
 create table t1 (a smallint primary key auto_increment);
 insert into t1 values(32766),(NULL);
 delete from t1 where a=32767;
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 insert into t1 values(NULL);
 drop table t1;
diff --git a/mysql-test/t/ctype_latin1.test b/mysql-test/t/ctype_latin1.test
index 5d1acf107d7..ec9b836a78b 100644
--- a/mysql-test/t/ctype_latin1.test
+++ b/mysql-test/t/ctype_latin1.test
@@ -82,6 +82,7 @@ select 'a' regexp 'A' collate latin1_bin;
 SET collation_connection='latin1_swedish_ci';
 -- source include/ctype_filesort.inc
 -- source include/ctype_like_escape.inc
+-- source include/ctype_str_to_date.inc
 SET collation_connection='latin1_bin';
 -- source include/ctype_filesort.inc
 -- source include/ctype_like_escape.inc
diff --git a/mysql-test/t/ctype_sjis.test b/mysql-test/t/ctype_sjis.test
index f45e6ab9b54..a988c07ebe0 100644
--- a/mysql-test/t/ctype_sjis.test
+++ b/mysql-test/t/ctype_sjis.test
@@ -69,6 +69,7 @@ SET collation_connection='sjis_japanese_ci';
 -- source include/ctype_innodb_like.inc
 -- source include/ctype_like_escape.inc
 -- source include/ctype_like_range_f1f2.inc
+-- source include/ctype_str_to_date.inc
 SET collation_connection='sjis_bin';
 -- source include/ctype_filesort.inc
 -- source include/ctype_innodb_like.inc
diff --git a/mysql-test/t/ctype_ucs.test b/mysql-test/t/ctype_ucs.test
index 9f5b4153bce..343adcd5712 100644
--- a/mysql-test/t/ctype_ucs.test
+++ b/mysql-test/t/ctype_ucs.test
@@ -421,6 +421,7 @@ SET collation_connection='ucs2_general_ci';
 -- source include/ctype_like_escape.inc
 -- source include/ctype_german.inc
 -- source include/ctype_like_range_f1f2.inc
+-- source include/ctype_str_to_date.inc
 SET NAMES latin1;
 SET collation_connection='ucs2_bin';
 -- source include/ctype_filesort.inc
diff --git a/mysql-test/t/ctype_utf8.test b/mysql-test/t/ctype_utf8.test
index 176d7e58c77..cb47391471e 100644
--- a/mysql-test/t/ctype_utf8.test
+++ b/mysql-test/t/ctype_utf8.test
@@ -714,6 +714,7 @@ SET collation_connection='utf8_general_ci';
 -- source include/ctype_filesort.inc
 -- source include/ctype_like_escape.inc
 -- source include/ctype_german.inc
+-- source include/ctype_str_to_date.inc
 SET collation_connection='utf8_bin';
 -- source include/ctype_filesort.inc
 -- source include/ctype_like_escape.inc
diff --git a/mysql-test/t/replace.test b/mysql-test/t/replace.test
index 3d32a8c0da6..3f2569b0c62 100644
--- a/mysql-test/t/replace.test
+++ b/mysql-test/t/replace.test
@@ -25,9 +25,9 @@ drop table t1;
 
 create table t1 (a tinyint not null auto_increment primary key, b char(20) default "default_value");
 insert into t1 values (126,"first"),(63, "middle"),(0,"last");
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 insert into t1 values (0,"error");
---error 167
+--error HA_ERR_AUTOINC_ERANGE
 replace into t1 values (0,"error");
 replace into t1 values (126,"first updated");
 replace into t1 values (63,default);