storage_engine tests and upstream engines/* suites went out of sync with...

storage_engine tests and upstream engines/* suites went out of sync with current MariaDB code. Reasons: - as of 5.5.27, YEAR(2) is deprecated, hence the new warning; - MDEV-553 - different error code/message on out-of-range autoincrement; - INSERT IGNORE now produces a warning if a duplicate was encountered (change pushed along with MDEV-553)

storage_engine tests and upstream engines/* suites went out of sync with...
storage_engine tests and upstream engines/* suites went out of sync with current MariaDB code. Reasons: - as of 5.5.27, YEAR(2) is deprecated, hence the new warning; - MDEV-553 - different error code/message on out-of-range autoincrement; - INSERT IGNORE now produces a warning if a duplicate was encountered (change pushed along with MDEV-553)
2371b6df · Elena Stepanova · 85272603 · 2371b6df · 2371b6df · 2371b6df
Commit 2371b6df authored Dec 28, 2012 by Elena Stepanova
25 changed files
--- a/mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_ignore.result
+++ b/mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_ignore.result
@@ -11,6 +11,7 @@ Note	1265	Data truncated for column 'c1' at row 1
 INSERT IGNORE INTO t1 (c1) VALUES(NOW());
 Warnings:
 Note	1265	Data truncated for column 'c1' at row 1
+Warning	1062	Duplicate entry '2007-02-13' for key 'c1'
 SELECT * FROM t1;
 c1
 2007-02-13
@@ -20,6 +21,8 @@ CREATE TABLE t1(c1 YEAR NULL UNIQUE);
 INSERT INTO t1 (c1) VALUES(1999);
 INSERT INTO t1 (c1) VALUES(2000);
 INSERT IGNORE INTO t1 (c1) VALUES(1999);
+Warnings:
+Warning	1062	Duplicate entry '1999' for key 'c1'
 SELECT * FROM t1;
 c1
 1999
@@ -36,6 +39,7 @@ Note	1265	Data truncated for column 'c1' at row 1
 INSERT IGNORE INTO t1 (c1) VALUES(NOW());
 Warnings:
 Note	1265	Data truncated for column 'c1' at row 1
+Warning	1062	Duplicate entry '09:09:33' for key 'c1'
 SELECT * FROM t1;
 c1
 09:09:33
@@ -45,6 +49,8 @@ CREATE TABLE t1(c1 YEAR NULL UNIQUE);
 INSERT INTO t1 (c1) VALUES(1999);
 INSERT INTO t1 (c1) VALUES(2000);
 INSERT IGNORE INTO t1 (c1) VALUES(1999);
+Warnings:
+Warning	1062	Duplicate entry '1999' for key 'c1'
 SELECT * FROM t1;
 c1
 1999
@@ -55,6 +61,8 @@ SET TIMESTAMP=1171346973;
 INSERT INTO t1 (c1) VALUES(NOW());
 INSERT INTO t1 (c1) VALUES(ADDTIME(NOW(),'1 01:01:01'));
 INSERT IGNORE INTO t1 (c1) VALUES(NOW());
+Warnings:
+Warning	1062	Duplicate entry '2007-02-13 09:09:33' for key 'c1'
 SELECT * FROM t1;
 c1
 2007-02-13 09:09:33
@@ -64,6 +72,8 @@ CREATE TABLE t1(c1 YEAR NULL UNIQUE);
 INSERT INTO t1 (c1) VALUES(1999);
 INSERT INTO t1 (c1) VALUES(2000);
 INSERT IGNORE INTO t1 (c1) VALUES(1999);
+Warnings:
+Warning	1062	Duplicate entry '1999' for key 'c1'
 SELECT * FROM t1;
 c1
 1999
@@ -74,6 +84,8 @@ SET TIMESTAMP=1171346973;
 INSERT INTO t1 (c1) VALUES(NOW());
 INSERT INTO t1 (c1) VALUES(ADDTIME(NOW(),'1 01:01:01'));
 INSERT IGNORE INTO t1 (c1) VALUES(NOW());
+Warnings:
+Warning	1062	Duplicate entry '2007-02-13 09:09:33' for key 'c1'
 SELECT * FROM t1;
 c1
 2007-02-13 09:09:33
@@ -83,6 +95,8 @@ CREATE TABLE t1(c1 YEAR NULL UNIQUE);
 INSERT INTO t1 (c1) VALUES(1999);
 INSERT INTO t1 (c1) VALUES(2000);
 INSERT IGNORE INTO t1 (c1) VALUES(1999);
+Warnings:
+Warning	1062	Duplicate entry '1999' for key 'c1'
 SELECT * FROM t1;
 c1
 1999

--- a/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_ignore.result
+++ b/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_ignore.result
@@ -27,11 +27,13 @@ Warnings:
 Note	1265	Data truncated for column 'c1' at row 1
 Note	1265	Data truncated for column 'c2' at row 1
 Note	1265	Data truncated for column 'c3' at row 1
+Warning	1062	Duplicate entry '2007-02-13-2007-02-13-2007-02-13' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),ADDTIME(NOW(),'1 01:01:01'));
 Warnings:
 Note	1265	Data truncated for column 'c1' at row 1
 Note	1265	Data truncated for column 'c2' at row 1
 Note	1265	Data truncated for column 'c3' at row 1
+Warning	1062	Duplicate entry '2007-02-13-2007-02-13-2007-02-14' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 2007-02-13	2007-02-13	2007-02-13
@@ -45,7 +47,11 @@ INSERT INTO t1 (c1,c2,c3) VALUES(1999,1999,2000);
 INSERT INTO t1 (c1,c2,c3) VALUES(1999,2000,1999);
 INSERT INTO t1 (c1,c2,c3) VALUES(2000,1999,1999);
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(1999,1999,1999);
+Warnings:
+Warning	1062	Duplicate entry '1999-1999-1999' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(1999,1999,2000);
+Warnings:
+Warning	1062	Duplicate entry '1999-1999-2000' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 1999	1999	1999
@@ -80,11 +86,13 @@ Warnings:
 Note	1265	Data truncated for column 'c1' at row 1
 Note	1265	Data truncated for column 'c2' at row 1
 Note	1265	Data truncated for column 'c3' at row 1
+Warning	1062	Duplicate entry '09:09:33-09:09:33-09:09:33' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),ADDTIME(NOW(),'1 01:01:01'));
 Warnings:
 Note	1265	Data truncated for column 'c1' at row 1
 Note	1265	Data truncated for column 'c2' at row 1
 Note	1265	Data truncated for column 'c3' at row 1
+Warning	1062	Duplicate entry '09:09:33-09:09:33-10:10:34' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 09:09:33	09:09:33	09:09:33
@@ -98,7 +106,11 @@ INSERT INTO t1 (c1,c2,c3) VALUES(1999,1999,2000);
 INSERT INTO t1 (c1,c2,c3) VALUES(1999,2000,1999);
 INSERT INTO t1 (c1,c2,c3) VALUES(2000,1999,1999);
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(1999,1999,1999);
+Warnings:
+Warning	1062	Duplicate entry '1999-1999-1999' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(1999,1999,2000);
+Warnings:
+Warning	1062	Duplicate entry '1999-1999-2000' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 1999	1999	1999
@@ -113,7 +125,11 @@ INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),ADDTIME(NOW(),'1 01:01:01'));
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),ADDTIME(NOW(),'1 01:01:01'),NOW());
 INSERT INTO t1 (c1,c2,c3) VALUES(ADDTIME(NOW(),'1 01:01:01'),NOW(),NOW());
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
+Warnings:
+Warning	1062	Duplicate entry '2007-02-13 09:09:33-2007-02-13 09:09:33-2007-02-13 09:09:33' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),ADDTIME(NOW(),'1 01:01:01'));
+Warnings:
+Warning	1062	Duplicate entry '2007-02-13 09:09:33-2007-02-13 09:09:33-2007-02-14 10:10:34' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 2007-02-13 09:09:33	2007-02-13 09:09:33	2007-02-13 09:09:33
@@ -127,7 +143,11 @@ INSERT INTO t1 (c1,c2,c3) VALUES(1999,1999,2000);
 INSERT INTO t1 (c1,c2,c3) VALUES(1999,2000,1999);
 INSERT INTO t1 (c1,c2,c3) VALUES(2000,1999,1999);
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(1999,1999,1999);
+Warnings:
+Warning	1062	Duplicate entry '1999-1999-1999' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(1999,1999,2000);
+Warnings:
+Warning	1062	Duplicate entry '1999-1999-2000' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 1999	1999	1999
@@ -142,7 +162,11 @@ INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),ADDTIME(NOW(),'1 01:01:01'));
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),ADDTIME(NOW(),'1 01:01:01'),NOW());
 INSERT INTO t1 (c1,c2,c3) VALUES(ADDTIME(NOW(),'1 01:01:01'),NOW(),NOW());
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
+Warnings:
+Warning	1062	Duplicate entry '2007-02-13 09:09:33-2007-02-13 09:09:33-2007-02-13 09:09:33' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),ADDTIME(NOW(),'1 01:01:01'));
+Warnings:
+Warning	1062	Duplicate entry '2007-02-13 09:09:33-2007-02-13 09:09:33-2007-02-14 10:10:34' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 2007-02-13 09:09:33	2007-02-13 09:09:33	2007-02-13 09:09:33
@@ -156,7 +180,11 @@ INSERT INTO t1 (c1,c2,c3) VALUES(1999,1999,2000);
 INSERT INTO t1 (c1,c2,c3) VALUES(1999,2000,1999);
 INSERT INTO t1 (c1,c2,c3) VALUES(2000,1999,1999);
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(1999,1999,1999);
+Warnings:
+Warning	1062	Duplicate entry '1999-1999-1999' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(1999,1999,2000);
+Warnings:
+Warning	1062	Duplicate entry '1999-1999-2000' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 1999	1999	1999

--- a/mysql-test/suite/engines/funcs/r/in_multicolumn_number_unique_constraint_ignore.result
+++ b/mysql-test/suite/engines/funcs/r/in_multicolumn_number_unique_constraint_ignore.result
@@ -8,8 +8,14 @@ INSERT INTO t1 (c1,c2,c3) VALUES(11,11,10);
 INSERT INTO t1 (c1,c2,c3) VALUES(11,10,11);
 INSERT INTO t1 (c1,c2,c3) VALUES(10,11,11);
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,10);
+Warnings:
+Warning	1062	Duplicate entry '10-10-10' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,11);
+Warnings:
+Warning	1062	Duplicate entry '10-10-11' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,11,11);
+Warnings:
+Warning	1062	Duplicate entry '10-11-11' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 10	10	10
@@ -29,8 +35,14 @@ INSERT INTO t1 (c1,c2,c3) VALUES(11,11,10);
 INSERT INTO t1 (c1,c2,c3) VALUES(11,10,11);
 INSERT INTO t1 (c1,c2,c3) VALUES(10,11,11);
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,10);
+Warnings:
+Warning	1062	Duplicate entry '10-10-10' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,11);
+Warnings:
+Warning	1062	Duplicate entry '10-10-11' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,11,11);
+Warnings:
+Warning	1062	Duplicate entry '10-11-11' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 10	10	10
@@ -50,8 +62,14 @@ INSERT INTO t1 (c1,c2,c3) VALUES(11,11,10);
 INSERT INTO t1 (c1,c2,c3) VALUES(11,10,11);
 INSERT INTO t1 (c1,c2,c3) VALUES(10,11,11);
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,10);
+Warnings:
+Warning	1062	Duplicate entry '10-10-10' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,11);
+Warnings:
+Warning	1062	Duplicate entry '10-10-11' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,11,11);
+Warnings:
+Warning	1062	Duplicate entry '10-11-11' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 10	10	10
@@ -71,8 +89,14 @@ INSERT INTO t1 (c1,c2,c3) VALUES(11,11,10);
 INSERT INTO t1 (c1,c2,c3) VALUES(11,10,11);
 INSERT INTO t1 (c1,c2,c3) VALUES(10,11,11);
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,10);
+Warnings:
+Warning	1062	Duplicate entry '10-10-10' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,11);
+Warnings:
+Warning	1062	Duplicate entry '10-10-11' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,11,11);
+Warnings:
+Warning	1062	Duplicate entry '10-11-11' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 10	10	10
@@ -92,8 +116,14 @@ INSERT INTO t1 (c1,c2,c3) VALUES(11,11,10);
 INSERT INTO t1 (c1,c2,c3) VALUES(11,10,11);
 INSERT INTO t1 (c1,c2,c3) VALUES(10,11,11);
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,10);
+Warnings:
+Warning	1062	Duplicate entry '10-10-10' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,11);
+Warnings:
+Warning	1062	Duplicate entry '10-10-11' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,11,11);
+Warnings:
+Warning	1062	Duplicate entry '10-11-11' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 10	10	10
@@ -113,8 +143,14 @@ INSERT INTO t1 (c1,c2,c3) VALUES(11,11,10);
 INSERT INTO t1 (c1,c2,c3) VALUES(11,10,11);
 INSERT INTO t1 (c1,c2,c3) VALUES(10,11,11);
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,10);
+Warnings:
+Warning	1062	Duplicate entry '10-10-10' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,11);
+Warnings:
+Warning	1062	Duplicate entry '10-10-11' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,11,11);
+Warnings:
+Warning	1062	Duplicate entry '10-11-11' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 10	10	10
@@ -134,8 +170,14 @@ INSERT INTO t1 (c1,c2,c3) VALUES(11,11,10);
 INSERT INTO t1 (c1,c2,c3) VALUES(11,10,11);
 INSERT INTO t1 (c1,c2,c3) VALUES(10,11,11);
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,10);
+Warnings:
+Warning	1062	Duplicate entry '10-10-10' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,11);
+Warnings:
+Warning	1062	Duplicate entry '10-10-11' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,11,11);
+Warnings:
+Warning	1062	Duplicate entry '10-11-11' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 10	10	10
@@ -155,8 +197,14 @@ INSERT INTO t1 (c1,c2,c3) VALUES(11,11,10);
 INSERT INTO t1 (c1,c2,c3) VALUES(11,10,11);
 INSERT INTO t1 (c1,c2,c3) VALUES(10,11,11);
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,10);
+Warnings:
+Warning	1062	Duplicate entry '10-10-10' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,11);
+Warnings:
+Warning	1062	Duplicate entry '10-10-11' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,11,11);
+Warnings:
+Warning	1062	Duplicate entry '10-11-11' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 10	10	10
@@ -176,8 +224,14 @@ INSERT INTO t1 (c1,c2,c3) VALUES(11,11,10);
 INSERT INTO t1 (c1,c2,c3) VALUES(11,10,11);
 INSERT INTO t1 (c1,c2,c3) VALUES(10,11,11);
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,10);
+Warnings:
+Warning	1062	Duplicate entry '10-10-10' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,11);
+Warnings:
+Warning	1062	Duplicate entry '10-10-11' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,11,11);
+Warnings:
+Warning	1062	Duplicate entry '10-11-11' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 10	10	10
@@ -197,8 +251,14 @@ INSERT INTO t1 (c1,c2,c3) VALUES(11,11,10);
 INSERT INTO t1 (c1,c2,c3) VALUES(11,10,11);
 INSERT INTO t1 (c1,c2,c3) VALUES(10,11,11);
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,10);
+Warnings:
+Warning	1062	Duplicate entry '10-10-10' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,11);
+Warnings:
+Warning	1062	Duplicate entry '10-10-11' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,11,11);
+Warnings:
+Warning	1062	Duplicate entry '10-11-11' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 10	10	10
@@ -218,8 +278,14 @@ INSERT INTO t1 (c1,c2,c3) VALUES(11,11,10);
 INSERT INTO t1 (c1,c2,c3) VALUES(11,10,11);
 INSERT INTO t1 (c1,c2,c3) VALUES(10,11,11);
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,10);
+Warnings:
+Warning	1062	Duplicate entry '10-10-10' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,11);
+Warnings:
+Warning	1062	Duplicate entry '10-10-11' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,11,11);
+Warnings:
+Warning	1062	Duplicate entry '10-11-11' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 10	10	10
@@ -239,8 +305,14 @@ INSERT INTO t1 (c1,c2,c3) VALUES(11,11,10);
 INSERT INTO t1 (c1,c2,c3) VALUES(11,10,11);
 INSERT INTO t1 (c1,c2,c3) VALUES(10,11,11);
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,10);
+Warnings:
+Warning	1062	Duplicate entry '10-10-10' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,11);
+Warnings:
+Warning	1062	Duplicate entry '10-10-11' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,11,11);
+Warnings:
+Warning	1062	Duplicate entry '10-11-11' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 10	10	10
@@ -260,8 +332,14 @@ INSERT INTO t1 (c1,c2,c3) VALUES(11,11,10);
 INSERT INTO t1 (c1,c2,c3) VALUES(11,10,11);
 INSERT INTO t1 (c1,c2,c3) VALUES(10,11,11);
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,10);
+Warnings:
+Warning	1062	Duplicate entry '10-10-10' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,11);
+Warnings:
+Warning	1062	Duplicate entry '10-10-11' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,11,11);
+Warnings:
+Warning	1062	Duplicate entry '10-11-11' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 10	10	10
@@ -281,8 +359,14 @@ INSERT INTO t1 (c1,c2,c3) VALUES(11,11,10);
 INSERT INTO t1 (c1,c2,c3) VALUES(11,10,11);
 INSERT INTO t1 (c1,c2,c3) VALUES(10,11,11);
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,10);
+Warnings:
+Warning	1062	Duplicate entry '10-10-10' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,10,11);
+Warnings:
+Warning	1062	Duplicate entry '10-10-11' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(10,11,11);
+Warnings:
+Warning	1062	Duplicate entry '10-11-11' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 10	10	10

--- a/mysql-test/suite/engines/funcs/r/in_multicolumn_string_unique_constraint_ignore.result
+++ b/mysql-test/suite/engines/funcs/r/in_multicolumn_string_unique_constraint_ignore.result
@@ -8,8 +8,14 @@ INSERT INTO t1 (c1,c2,c3) VALUES('def','def','abc');
 INSERT INTO t1 (c1,c2,c3) VALUES('def','abc','def');
 INSERT INTO t1 (c1,c2,c3) VALUES('abc','def','def');
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES('abc','abc','abc');
+Warnings:
+Warning	1062	Duplicate entry 'abc-abc-abc' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES('abc','abc','def');
+Warnings:
+Warning	1062	Duplicate entry 'abc-abc-def' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES('abc','def','def');
+Warnings:
+Warning	1062	Duplicate entry 'abc-def-def' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 abc	abc	abc
@@ -29,8 +35,14 @@ INSERT INTO t1 (c1,c2,c3) VALUES('def','def','abc');
 INSERT INTO t1 (c1,c2,c3) VALUES('def','abc','def');
 INSERT INTO t1 (c1,c2,c3) VALUES('abc','def','def');
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES('abc','abc','abc');
+Warnings:
+Warning	1062	Duplicate entry 'abc-abc-abc' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES('abc','abc','def');
+Warnings:
+Warning	1062	Duplicate entry 'abc-abc-def' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES('abc','def','def');
+Warnings:
+Warning	1062	Duplicate entry 'abc-def-def' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 abc	abc	abc
@@ -50,8 +62,14 @@ INSERT INTO t1 (c1,c2,c3) VALUES('def','def','abc');
 INSERT INTO t1 (c1,c2,c3) VALUES('def','abc','def');
 INSERT INTO t1 (c1,c2,c3) VALUES('abc','def','def');
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES('abc','abc','abc');
+Warnings:
+Warning	1062	Duplicate entry 'abc-abc-abc' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES('abc','abc','def');
+Warnings:
+Warning	1062	Duplicate entry 'abc-abc-def' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES('abc','def','def');
+Warnings:
+Warning	1062	Duplicate entry 'abc-def-def' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 abc
@@ -65,8 +83,14 @@ INSERT INTO t1 (c1,c2,c3) VALUES('def','def','abc');
 INSERT INTO t1 (c1,c2,c3) VALUES('def','abc','def');
 INSERT INTO t1 (c1,c2,c3) VALUES('abc','def','def');
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES('abc','abc','abc');
+Warnings:
+Warning	1062	Duplicate entry 'abc-abc-abc' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES('abc','abc','def');
+Warnings:
+Warning	1062	Duplicate entry 'abc-abc-def' for key 'c1'
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES('abc','def','def');
+Warnings:
+Warning	1062	Duplicate entry 'abc-def-def' for key 'c1'
 SELECT * FROM t1;
 c1	c2	c3
 abc	abc	abc

--- a/mysql-test/suite/engines/funcs/r/in_number_pk_constraint_ignore.result
+++ b/mysql-test/suite/engines/funcs/r/in_number_pk_constraint_ignore.result
@@ -3,6 +3,8 @@ CREATE TABLE t1(c1 TINYINT NOT NULL PRIMARY KEY);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'PRIMARY'
 SELECT * FROM t1;
 c1
 10
@@ -12,6 +14,8 @@ CREATE TABLE t1(c1 SMALLINT NOT NULL PRIMARY KEY);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'PRIMARY'
 SELECT * FROM t1;
 c1
 10
@@ -21,6 +25,8 @@ CREATE TABLE t1(c1 MEDIUMINT NOT NULL PRIMARY KEY);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'PRIMARY'
 SELECT * FROM t1;
 c1
 10
@@ -30,6 +36,8 @@ CREATE TABLE t1(c1 INT NOT NULL PRIMARY KEY);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'PRIMARY'
 SELECT * FROM t1;
 c1
 10
@@ -39,6 +47,8 @@ CREATE TABLE t1(c1 INTEGER NOT NULL PRIMARY KEY);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'PRIMARY'
 SELECT * FROM t1;
 c1
 10
@@ -48,6 +58,8 @@ CREATE TABLE t1(c1 BIGINT NOT NULL PRIMARY KEY);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'PRIMARY'
 SELECT * FROM t1;
 c1
 10
@@ -57,6 +69,8 @@ CREATE TABLE t1(c1 DECIMAL NOT NULL PRIMARY KEY);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'PRIMARY'
 SELECT * FROM t1;
 c1
 10
@@ -66,6 +80,8 @@ CREATE TABLE t1(c1 DEC NOT NULL PRIMARY KEY);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'PRIMARY'
 SELECT * FROM t1;
 c1
 10
@@ -75,6 +91,8 @@ CREATE TABLE t1(c1 FIXED NOT NULL PRIMARY KEY);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'PRIMARY'
 SELECT * FROM t1;
 c1
 10
@@ -84,6 +102,8 @@ CREATE TABLE t1(c1 NUMERIC NOT NULL PRIMARY KEY);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'PRIMARY'
 SELECT * FROM t1;
 c1
 10
@@ -93,6 +113,8 @@ CREATE TABLE t1(c1 DOUBLE NOT NULL PRIMARY KEY);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'PRIMARY'
 SELECT * FROM t1;
 c1
 10
@@ -102,6 +124,8 @@ CREATE TABLE t1(c1 REAL NOT NULL PRIMARY KEY);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'PRIMARY'
 SELECT * FROM t1;
 c1
 10
@@ -111,6 +135,8 @@ CREATE TABLE t1(c1 DOUBLE PRECISION NOT NULL PRIMARY KEY);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'PRIMARY'
 SELECT * FROM t1;
 c1
 10
@@ -120,6 +146,8 @@ CREATE TABLE t1(c1 FLOAT NOT NULL PRIMARY KEY);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'PRIMARY'
 SELECT * FROM t1;
 c1
 10

--- a/mysql-test/suite/engines/funcs/r/in_number_unique_constraint_ignore.result
+++ b/mysql-test/suite/engines/funcs/r/in_number_unique_constraint_ignore.result
@@ -3,6 +3,8 @@ CREATE TABLE t1(c1 TINYINT NULL UNIQUE);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'c1'
 SELECT * FROM t1;
 c1
 10
@@ -12,6 +14,8 @@ CREATE TABLE t1(c1 SMALLINT NULL UNIQUE);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'c1'
 SELECT * FROM t1;
 c1
 10
@@ -21,6 +25,8 @@ CREATE TABLE t1(c1 MEDIUMINT NULL UNIQUE);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'c1'
 SELECT * FROM t1;
 c1
 10
@@ -30,6 +36,8 @@ CREATE TABLE t1(c1 INT NULL UNIQUE);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'c1'
 SELECT * FROM t1;
 c1
 10
@@ -39,6 +47,8 @@ CREATE TABLE t1(c1 INTEGER NULL UNIQUE);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'c1'
 SELECT * FROM t1;
 c1
 10
@@ -48,6 +58,8 @@ CREATE TABLE t1(c1 BIGINT NULL UNIQUE);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'c1'
 SELECT * FROM t1;
 c1
 10
@@ -57,6 +69,8 @@ CREATE TABLE t1(c1 DECIMAL NULL UNIQUE);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'c1'
 SELECT * FROM t1;
 c1
 10
@@ -66,6 +80,8 @@ CREATE TABLE t1(c1 DEC NULL UNIQUE);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'c1'
 SELECT * FROM t1;
 c1
 10
@@ -75,6 +91,8 @@ CREATE TABLE t1(c1 FIXED NULL UNIQUE);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'c1'
 SELECT * FROM t1;
 c1
 10
@@ -84,6 +102,8 @@ CREATE TABLE t1(c1 NUMERIC NULL UNIQUE);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'c1'
 SELECT * FROM t1;
 c1
 10
@@ -93,6 +113,8 @@ CREATE TABLE t1(c1 DOUBLE NULL UNIQUE);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'c1'
 SELECT * FROM t1;
 c1
 10
@@ -102,6 +124,8 @@ CREATE TABLE t1(c1 REAL NULL UNIQUE);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'c1'
 SELECT * FROM t1;
 c1
 10
@@ -111,6 +135,8 @@ CREATE TABLE t1(c1 DOUBLE PRECISION NULL UNIQUE);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'c1'
 SELECT * FROM t1;
 c1
 10
@@ -120,6 +146,8 @@ CREATE TABLE t1(c1 FLOAT NULL UNIQUE);
 INSERT INTO t1 (c1) VALUES(10);
 INSERT INTO t1 (c1) VALUES(11);
 INSERT IGNORE INTO t1 (c1) VALUES(10);
+Warnings:
+Warning	1062	Duplicate entry '10' for key 'c1'
 SELECT * FROM t1;
 c1
 10

--- a/mysql-test/suite/engines/funcs/r/in_string_pk_constraint_ignore.result
+++ b/mysql-test/suite/engines/funcs/r/in_string_pk_constraint_ignore.result
--- a/mysql-test/suite/engines/funcs/r/in_string_unique_constraint_ignore.result
+++ b/mysql-test/suite/engines/funcs/r/in_string_unique_constraint_ignore.result
--- a/mysql-test/suite/engines/funcs/r/ld_unique_error1.result
+++ b/mysql-test/suite/engines/funcs/r/ld_unique_error1.result
@@ -2,6 +2,8 @@ DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (c1 INTEGER NOT NULL PRIMARY KEY, c2 TEXT);
 ERROR 23000: Duplicate entry '3' for key 'PRIMARY'
 TRUNCATE TABLE t1;
+Warnings:
+Warning	1062	Duplicate entry '3' for key 'PRIMARY'
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
 1	abc

--- a/mysql-test/suite/engines/funcs/r/ld_unique_error1_local.result
+++ b/mysql-test/suite/engines/funcs/r/ld_unique_error1_local.result
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (c1 INTEGER NOT NULL PRIMARY KEY, c2 TEXT);
 LOAD DATA LOCAL INFILE 'suite/engines/funcs/t/load_unique_error1.inc'   INTO TABLE t1 FIELDS TERMINATED BY ',' LINES TERMINATED BY '\n';
+Warnings:
+Warning	1062	Duplicate entry '3' for key 'PRIMARY'
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
 1	abc
@@ -10,6 +12,8 @@ c1	c2
 DROP TABLE t1;
 CREATE TABLE t1 (c1 INTEGER NOT NULL PRIMARY KEY, c2 TEXT);
 LOAD DATA LOCAL INFILE 'suite/engines/funcs/t/load_unique_error1.inc' IGNORE INTO TABLE t1 FIELDS TERMINATED BY ',' LINES TERMINATED BY '\n';
+Warnings:
+Warning	1062	Duplicate entry '3' for key 'PRIMARY'
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
 1	abc

--- a/mysql-test/suite/engines/funcs/r/ld_unique_error2.result
+++ b/mysql-test/suite/engines/funcs/r/ld_unique_error2.result
@@ -4,6 +4,9 @@ INSERT INTO t1 VALUES(3,'a');
 ERROR 23000: Duplicate entry '3' for key 'PRIMARY'
 TRUNCATE TABLE t1;
 INSERT INTO t1 VALUES(3,'a');
+Warnings:
+Warning	1062	Duplicate entry '3' for key 'PRIMARY'
+Warning	1062	Duplicate entry '3' for key 'PRIMARY'
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
 1	abc

--- a/mysql-test/suite/engines/funcs/r/ld_unique_error2_local.result
+++ b/mysql-test/suite/engines/funcs/r/ld_unique_error2_local.result
@@ -2,6 +2,8 @@ DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (c1 INTEGER NOT NULL PRIMARY KEY, c2 TEXT);
 INSERT INTO t1 VALUES(3,'a');
 LOAD DATA LOCAL INFILE 'suite/engines/funcs/t/load_unique_error2.inc'   INTO TABLE t1 FIELDS TERMINATED BY ',' LINES TERMINATED BY '\n';
+Warnings:
+Warning	1062	Duplicate entry '3' for key 'PRIMARY'
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
 1	abc
@@ -12,6 +14,8 @@ DROP TABLE t1;
 CREATE TABLE t1 (c1 INTEGER NOT NULL PRIMARY KEY, c2 TEXT);
 INSERT INTO t1 VALUES(3,'a');
 LOAD DATA LOCAL INFILE 'suite/engines/funcs/t/load_unique_error2.inc' IGNORE INTO TABLE t1 FIELDS TERMINATED BY ',' LINES TERMINATED BY '\n';
+Warnings:
+Warning	1062	Duplicate entry '3' for key 'PRIMARY'
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
 1	abc

--- a/mysql-test/suite/engines/funcs/r/ld_unique_error3.result
+++ b/mysql-test/suite/engines/funcs/r/ld_unique_error3.result
@@ -12,6 +12,10 @@ Tables_in_test
 t1
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
 TRUNCATE TABLE t1;
+Warnings:
+Warning	1062	Duplicate entry '1' for key 'PRIMARY'
+Warning	1062	Duplicate entry '1' for key 'PRIMARY'
+Warning	1062	Duplicate entry '0' for key 'PRIMARY'
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
 0	def

--- a/mysql-test/suite/engines/funcs/r/ld_unique_error3_local.result
+++ b/mysql-test/suite/engines/funcs/r/ld_unique_error3_local.result
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (c1 INTEGER NOT NULL PRIMARY KEY, c2 TEXT);
 LOAD DATA LOCAL INFILE 'suite/engines/funcs/t/load_unique_error1.inc'   INTO TABLE t1 FIELDS TERMINATED BY ',' LINES TERMINATED BY '\n' (@c1,c2) SET c1 = @c1 % 2;
+Warnings:
+Warning	1062	Duplicate entry '1' for key 'PRIMARY'
+Warning	1062	Duplicate entry '1' for key 'PRIMARY'
+Warning	1062	Duplicate entry '0' for key 'PRIMARY'
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
 0	def
@@ -8,6 +12,10 @@ c1	c2
 DROP TABLE t1;
 CREATE TABLE t1 (c1 INTEGER NOT NULL PRIMARY KEY, c2 TEXT);
 LOAD DATA LOCAL INFILE 'suite/engines/funcs/t/load_unique_error1.inc' IGNORE INTO TABLE t1 FIELDS TERMINATED BY ',' LINES TERMINATED BY '\n' (@c1,c2) SET c1 = @c1 % 2;
+Warnings:
+Warning	1062	Duplicate entry '1' for key 'PRIMARY'
+Warning	1062	Duplicate entry '1' for key 'PRIMARY'
+Warning	1062	Duplicate entry '0' for key 'PRIMARY'
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
 0	def

--- a/mysql-test/suite/engines/iuds/r/insert_number.result
+++ b/mysql-test/suite/engines/iuds/r/insert_number.result
@@ -2399,8 +2399,9 @@ INSERT INTO t3 VALUES(0,-128,1,2,3,4,5),(255,127,6,7,8,9,10);
 INSERT INTO t4 VALUES(-128,0,1,2,3,4,5,5),(127,255,6,7,8,9,10,10);
 INSERT INTO t5 VALUES(0,-128,1,2,3,4,5,5),(255,127,6,7,8,9,10,10);
 INSERT INTO t4(c2,c3) VALUES(31,32) /* tries to increment out of range */;
-ERROR 23000: Duplicate entry '127' for key 'PRIMARY'
+ERROR 22003: Out of range value for column 'c1' at row 1
 INSERT INTO t5(c2,c3) VALUES(33,34) /* tries to increment out of range */;
+ERROR 22003: Out of range value for column 'c1' at row 1
 SELECT * FROM t4;
 c1	c2	c3	c4	c5	c6	c7	c8
 -101	102	103	104	105	106	107	108
@@ -3760,20 +3761,12 @@ c1	c2	c3	c4	c5	c6	c7
 0	124	27	28	29	30	31
 SELECT * FROM t2 WHERE c1 = 256 ORDER BY c1,c6;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 = 256 ORDER BY c1,c6 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 = 256 ORDER BY c1,c6 DESC;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 = 256 ORDER BY c1,c6 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 <> 256 ORDER BY c1,c6;
 c1	c2	c3	c4	c5	c6	c7
 0	NULL	5	6	NULL	0	NULL
@@ -5316,20 +5309,12 @@ c1	c2	c3	c4	c5	c6	c7
 0	-128	26	27	28	29	30
 SELECT * FROM t3 WHERE c2 = 128 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 128 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 128 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 128 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 <> 128 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-128	1	2	3	4	5
@@ -8006,8 +7991,9 @@ INSERT INTO t3 VALUES(0,-32768,1,2,3,4,5),(255,-128,6,7,8,9,10),(65535,32767,11,
 INSERT INTO t4 VALUES(-32768,0,1,2,3,4,5,5),(-128,255,6,7,8,9,10,10),(32767,65535,11,12,13,14,15,15);
 INSERT INTO t5 VALUES(0,-32768,1,2,3,4,5,5),(255,-128,6,7,8,9,10,10),(65535,32767,11,12,13,14,15,15);
 INSERT INTO t4(c2,c3) VALUES(31,32) /* tries to increment out of range */;
-ERROR 23000: Duplicate entry '32767' for key 'PRIMARY'
+ERROR 22003: Out of range value for column 'c1' at row 1
 INSERT INTO t5(c2,c3) VALUES(33,34) /* tries to increment out of range */;
+ERROR 22003: Out of range value for column 'c1' at row 1
 SELECT * FROM t4;
 c1	c2	c3	c4	c5	c6	c7	c8
 -101	102	103	104	105	106	107	108
@@ -9410,20 +9396,12 @@ c1	c2	c3	c4	c5	c6	c7
 0	124	27	28	29	30	31
 SELECT * FROM t2 WHERE c1 = 65536 ORDER BY c1,c6;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 = 65536 ORDER BY c1,c6 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 = 65536 ORDER BY c1,c6 DESC;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 = 65536 ORDER BY c1,c6 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 <> 65536 ORDER BY c1,c6;
 c1	c2	c3	c4	c5	c6	c7
 0	NULL	5	6	NULL	0	NULL
@@ -11018,20 +10996,12 @@ c1	c2	c3	c4	c5	c6	c7
 0	-32768	26	27	28	29	30
 SELECT * FROM t3 WHERE c2 = 32768 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 32768 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 32768 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 32768 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 <> 32768 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-32768	1	2	3	4	5
@@ -13718,8 +13688,9 @@ INSERT INTO t3 VALUES(0,-8388608,1,2,3,4,5),(255,-32768,6,7,8,9,10),(65535,-128,
 INSERT INTO t4 VALUES(-8388608,0,1,2,3,4,5,5),(-32768,255,6,7,8,9,10,10),(-128,65535,11,12,13,14,15,15),(8388607,16777215,16,17,18,19,20,20);
 INSERT INTO t5 VALUES(0,-8388608,1,2,3,4,5,5),(255,-32768,6,7,8,9,10,10),(65535,-128,11,12,13,14,15,15),(16777215,8388607,16,17,18,19,20,20);
 INSERT INTO t4(c2,c3) VALUES(31,32) /* tries to increment out of range */;
-ERROR 23000: Duplicate entry '8388607' for key 'PRIMARY'
+ERROR 22003: Out of range value for column 'c1' at row 1
 INSERT INTO t5(c2,c3) VALUES(33,34) /* tries to increment out of range */;
+ERROR 22003: Out of range value for column 'c1' at row 1
 SELECT * FROM t4;
 c1	c2	c3	c4	c5	c6	c7	c8
 -101	102	103	104	105	106	107	108
@@ -15165,20 +15136,12 @@ c1	c2	c3	c4	c5	c6	c7
 0	124	27	28	29	30	31
 SELECT * FROM t2 WHERE c1 = 16777216 ORDER BY c1,c6;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 = 16777216 ORDER BY c1,c6 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 = 16777216 ORDER BY c1,c6 DESC;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 = 16777216 ORDER BY c1,c6 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 <> 16777216 ORDER BY c1,c6;
 c1	c2	c3	c4	c5	c6	c7
 0	NULL	5	6	NULL	0	NULL
@@ -16825,20 +16788,12 @@ c1	c2	c3	c4	c5	c6	c7
 0	-8388608	26	27	28	29	30
 SELECT * FROM t3 WHERE c2 = 8388608 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 8388608 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 8388608 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 8388608 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 <> 8388608 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-8388608	1	2	3	4	5
@@ -19535,8 +19490,9 @@ INSERT INTO t3 VALUES(0,-2147483648,1,2,3,4,5),(255,-8388608,6,7,8,9,10),(65535,
 INSERT INTO t4 VALUES(-2147483648,0,1,2,3,4,5,5),(-8388608,255,6,7,8,9,10,10),(-32768,65535,11,12,13,14,15,15),(-128,16777215,16,17,18,19,20,20),(2147483647,4294967295,21,22,23,24,25,25);
 INSERT INTO t5 VALUES(0,-2147483648,1,2,3,4,5,5),(255,-8388608,6,7,8,9,10,10),(65535,-32768,11,12,13,14,15,15),(16777215,-128,16,17,18,19,20,20),(4294967295,2147483647,21,22,23,24,25,25);
 INSERT INTO t4(c2,c3) VALUES(31,32) /* tries to increment out of range */;
-ERROR 23000: Duplicate entry '2147483647' for key 'PRIMARY'
+ERROR 22003: Out of range value for column 'c1' at row 1
 INSERT INTO t5(c2,c3) VALUES(33,34) /* tries to increment out of range */;
+ERROR 22003: Out of range value for column 'c1' at row 1
 SELECT * FROM t4;
 c1	c2	c3	c4	c5	c6	c7	c8
 -101	102	103	104	105	106	107	108
@@ -21025,20 +20981,12 @@ c1	c2	c3	c4	c5	c6	c7
 0	124	27	28	29	30	31
 SELECT * FROM t2 WHERE c1 = 4294967296 ORDER BY c1,c6;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 = 4294967296 ORDER BY c1,c6 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 = 4294967296 ORDER BY c1,c6 DESC;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 = 4294967296 ORDER BY c1,c6 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 <> 4294967296 ORDER BY c1,c6;
 c1	c2	c3	c4	c5	c6	c7
 0	NULL	5	6	NULL	0	NULL
@@ -22737,20 +22685,12 @@ c1	c2	c3	c4	c5	c6	c7
 0	-2147483648	26	27	28	29	30
 SELECT * FROM t3 WHERE c2 = 2147483648 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 2147483648 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 2147483648 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 2147483648 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 <> 2147483648 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-2147483648	1	2	3	4	5
@@ -25457,8 +25397,9 @@ INSERT INTO t3 VALUES(0,-2147483648,1,2,3,4,5),(255,-8388608,6,7,8,9,10),(65535,
 INSERT INTO t4 VALUES(-2147483648,0,1,2,3,4,5,5),(-8388608,255,6,7,8,9,10,10),(-32768,65535,11,12,13,14,15,15),(-128,16777215,16,17,18,19,20,20),(2147483647,4294967295,21,22,23,24,25,25);
 INSERT INTO t5 VALUES(0,-2147483648,1,2,3,4,5,5),(255,-8388608,6,7,8,9,10,10),(65535,-32768,11,12,13,14,15,15),(16777215,-128,16,17,18,19,20,20),(4294967295,2147483647,21,22,23,24,25,25);
 INSERT INTO t4(c2,c3) VALUES(31,32) /* tries to increment out of range */;
-ERROR 23000: Duplicate entry '2147483647' for key 'PRIMARY'
+ERROR 22003: Out of range value for column 'c1' at row 1
 INSERT INTO t5(c2,c3) VALUES(33,34) /* tries to increment out of range */;
+ERROR 22003: Out of range value for column 'c1' at row 1
 SELECT * FROM t4;
 c1	c2	c3	c4	c5	c6	c7	c8
 -101	102	103	104	105	106	107	108
@@ -26947,20 +26888,12 @@ c1	c2	c3	c4	c5	c6	c7
 0	124	27	28	29	30	31
 SELECT * FROM t2 WHERE c1 = 4294967296 ORDER BY c1,c6;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 = 4294967296 ORDER BY c1,c6 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 = 4294967296 ORDER BY c1,c6 DESC;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 = 4294967296 ORDER BY c1,c6 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
 SELECT * FROM t2 WHERE c1 <> 4294967296 ORDER BY c1,c6;
 c1	c2	c3	c4	c5	c6	c7
 0	NULL	5	6	NULL	0	NULL
@@ -28659,20 +28592,12 @@ c1	c2	c3	c4	c5	c6	c7
 0	-2147483648	26	27	28	29	30
 SELECT * FROM t3 WHERE c2 = 2147483648 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 2147483648 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 2147483648 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 2147483648 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 <> 2147483648 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-2147483648	1	2	3	4	5
@@ -31379,7 +31304,7 @@ INSERT INTO t3 VALUES(0,-9223372036854775808,1,2,3,4,5),(255,-2147483648,6,7,8,9
 INSERT INTO t4 VALUES(-9223372036854775808,0,1,2,3,4,5,5),(-2147483648,255,6,7,8,9,10,10),(-8388608,65535,11,12,13,14,15,15),(-32768,16777215,16,17,18,19,20,20),(-128,4294967295,21,22,23,24,25,25),(9223372036854775807,18446744073709551615,26,27,28,29,30,30);
 INSERT INTO t5 VALUES(0,-9223372036854775808,1,2,3,4,5,5),(255,-2147483648,6,7,8,9,10,10),(65535,-8388608,11,12,13,14,15,15),(16777215,-32768,16,17,18,19,20,20),(4294967295,-128,21,22,23,24,25,25),(18446744073709551615,9223372036854775807,26,27,28,29,30,30);
 INSERT INTO t4(c2,c3) VALUES(31,32) /* tries to increment out of range */;
-ERROR 23000: Duplicate entry '9223372036854775807' for key 'PRIMARY'
+ERROR 22003: Out of range value for column 'c1' at row 1
 INSERT INTO t5(c2,c3) VALUES(33,34) /* tries to increment out of range */;
 ERROR HY000: Failed to read auto-increment value from storage engine
 SELECT * FROM t4;
@@ -34577,20 +34502,12 @@ c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
 SELECT * FROM t3 WHERE c2 = 9223372036854775808 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 9223372036854775808 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 9223372036854775808 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 9223372036854775808 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 <> 9223372036854775808 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	1	2	3	4	5

--- a/mysql-test/suite/engines/iuds/r/insert_time.result
+++ b/mysql-test/suite/engines/iuds/r/insert_time.result
@@ -5072,8 +5072,12 @@ INSERT INTO t3(c1,c2) VALUES('34 9:23','34 9:23') /* throws error as row exists
 ERROR 23000: Duplicate entry '825:23:00-825:23:00' for key 'idx'
 INSERT IGNORE INTO t1(c1,c2) VALUES('10:22:33','10:22:34') /* doesn't throw error */;
 INSERT IGNORE INTO t2(c1,c2) VALUES('12:34:56.78','12:34:56.78') /*doesn't throw error */;
+Warnings:
+Warning	1062	Duplicate entry '12:34:56-12:34:56' for key 'PRIMARY'
 INSERT IGNORE INTO t1(c1,c2) VALUES('10:22:34','34 9:23') /*doesn't throw error */;
 INSERT IGNORE INTO t3(c1,c2) VALUES('34 9:23','34 9:23') /*doesn't throw error */;
+Warnings:
+Warning	1062	Duplicate entry '825:23:00-825:23:00' for key 'idx'
 SELECT * FROM t1 WHERE c1='10:23:33' /* no rows */;
 c1	c2	c3
 INSERT INTO t1(c1) VALUES('10:22:33') ON DUPLICATE KEY UPDATE c1='10:23:33';

--- a/mysql-test/suite/engines/iuds/r/insert_year.result
+++ b/mysql-test/suite/engines/iuds/r/insert_year.result
@@ -3124,9 +3124,17 @@ ERROR 23000: Duplicate entry '2069' for key 'c2'
 INSERT INTO t3(c1,c2) VALUES(00,00);
 ERROR 23000: Duplicate entry '0000-0000' for key 'idx'
 INSERT IGNORE INTO t1(c1,c2) VALUES(01,'99');
+Warnings:
+Warning	1062	Duplicate entry '2001' for key 'PRIMARY'
 INSERT IGNORE INTO t2(c1,c2) VALUES('1999','1999');
+Warnings:
+Warning	1062	Duplicate entry '1999-1999' for key 'PRIMARY'
 INSERT IGNORE INTO t1(c1,c2) VALUES('2098','69');
+Warnings:
+Warning	1062	Duplicate entry '2069' for key 'c2'
 INSERT IGNORE INTO t3(c1,c2) VALUES(00,00);
+Warnings:
+Warning	1062	Duplicate entry '0000-0000' for key 'idx'
 SELECT * FROM t1 WHERE c1='01' /* Returns 1 row */;
 c1	c2	c3	c4
 2001	2001	1998-12-28	1998-12-28 11:30:45
@@ -6081,9 +6089,17 @@ ERROR 23000: Duplicate entry '69' for key 'c2'
 INSERT INTO t3(c1,c2) VALUES(00,00);
 ERROR 23000: Duplicate entry '00-00' for key 'idx'
 INSERT IGNORE INTO t1(c1,c2) VALUES(01,'99');
+Warnings:
+Warning	1062	Duplicate entry '01' for key 'PRIMARY'
 INSERT IGNORE INTO t2(c1,c2) VALUES('1999','1999');
+Warnings:
+Warning	1062	Duplicate entry '99-99' for key 'PRIMARY'
 INSERT IGNORE INTO t1(c1,c2) VALUES('2098','69');
+Warnings:
+Warning	1062	Duplicate entry '69' for key 'c2'
 INSERT IGNORE INTO t3(c1,c2) VALUES(00,00);
+Warnings:
+Warning	1062	Duplicate entry '00-00' for key 'idx'
 SELECT * FROM t1 WHERE c1='01' /* Returns 1 row */;
 c1	c2	c3	c4
 01	01	1998-12-28	1998-12-28 11:30:45

--- a/mysql-test/suite/engines/iuds/r/type_bit_iuds.result
+++ b/mysql-test/suite/engines/iuds/r/type_bit_iuds.result
--- a/mysql-test/suite/engines/iuds/r/update_delete_number.result
+++ b/mysql-test/suite/engines/iuds/r/update_delete_number.result
@@ -56,8 +56,6 @@ Warning	1264	Out of range value for column 'c2' at row 3
 SELECT COUNT(*) FROM t1 WHERE c1=4294967296 AND c2=2147483648 /* no rows */;
 COUNT(*)
 0
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t1 WHERE c1=4294967295 AND c2=2147483647;
 c1	c2	c3
 4294967295	2147483647	10
@@ -1152,8 +1150,6 @@ Warning	1264	Out of range value for column 'c2' at row 3
 SELECT COUNT(*) FROM t1 WHERE c1=256 AND c2=128 /* no rows */;
 COUNT(*)
 0
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t1 WHERE c1=255 AND c2=127;
 c1	c2	c3
 255	127	10
@@ -1926,8 +1922,6 @@ Warning	1264	Out of range value for column 'c2' at row 3
 SELECT COUNT(*) FROM t1 WHERE c1=65536 AND c2=32768 /* no rows */;
 COUNT(*)
 0
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t1 WHERE c1=65535 AND c2=32767;
 c1	c2	c3
 65535	32767	10
@@ -2675,8 +2669,6 @@ Warning	1264	Out of range value for column 'c2' at row 3
 SELECT COUNT(*) FROM t1 WHERE c1=16777216 AND c2=8388608 /* no rows */;
 COUNT(*)
 0
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t1 WHERE c1=16777215 AND c2=8388607;
 c1	c2	c3
 16777215	8388607	10
@@ -3424,8 +3416,6 @@ Warning	1264	Out of range value for column 'c2' at row 3
 SELECT COUNT(*) FROM t1 WHERE c1=18446744073709551616 AND c2=9223372036854775808 /* no rows */;
 COUNT(*)
 0
-Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t1 WHERE c1=18446744073709551615 AND c2=9223372036854775807;
 c1	c2	c3
 18446744073709551615	9223372036854775807	10

--- a/mysql-test/suite/engines/iuds/t/insert_number.test
+++ b/mysql-test/suite/engines/iuds/t/insert_number.test
@@ -761,11 +761,10 @@ INSERT INTO t2 VALUES(0,-128,1,2,3,4,5),(255,127,6,7,8,9,10);
 INSERT INTO t3 VALUES(0,-128,1,2,3,4,5),(255,127,6,7,8,9,10);
 INSERT INTO t4 VALUES(-128,0,1,2,3,4,5,5),(127,255,6,7,8,9,10,10);
 INSERT INTO t5 VALUES(0,-128,1,2,3,4,5,5),(255,127,6,7,8,9,10,10);
--error ER_DUP_ENTRY
+--error 167
 INSERT INTO t4(c2,c3) VALUES(31,32) /* tries to increment out of range */;
--disable_warnings
+--error 167
 INSERT INTO t5(c2,c3) VALUES(33,34) /* tries to increment out of range */;
--enable_warnings
 --sorted_result
 SELECT * FROM t4;
@@ -2120,11 +2119,10 @@ INSERT INTO t2 VALUES(0,-32768,1,2,3,4,5),(255,-128,6,7,8,9,10),(65535,32767,11,
 INSERT INTO t3 VALUES(0,-32768,1,2,3,4,5),(255,-128,6,7,8,9,10),(65535,32767,11,12,13,14,15);
 INSERT INTO t4 VALUES(-32768,0,1,2,3,4,5,5),(-128,255,6,7,8,9,10,10),(32767,65535,11,12,13,14,15,15);
 INSERT INTO t5 VALUES(0,-32768,1,2,3,4,5,5),(255,-128,6,7,8,9,10,10),(65535,32767,11,12,13,14,15,15);
--error ER_DUP_ENTRY
+--error 167
 INSERT INTO t4(c2,c3) VALUES(31,32) /* tries to increment out of range */;
--disable_warnings
+--error 167
 INSERT INTO t5(c2,c3) VALUES(33,34) /* tries to increment out of range */;
--enable_warnings
 --sorted_result
 SELECT * FROM t4;
@@ -3479,11 +3477,10 @@ INSERT INTO t2 VALUES(0,-8388608,1,2,3,4,5),(255,-32768,6,7,8,9,10),(65535,-128,
 INSERT INTO t3 VALUES(0,-8388608,1,2,3,4,5),(255,-32768,6,7,8,9,10),(65535,-128,11,12,13,14,15),(16777215,8388607,16,17,18,19,20);
 INSERT INTO t4 VALUES(-8388608,0,1,2,3,4,5,5),(-32768,255,6,7,8,9,10,10),(-128,65535,11,12,13,14,15,15),(8388607,16777215,16,17,18,19,20,20);
 INSERT INTO t5 VALUES(0,-8388608,1,2,3,4,5,5),(255,-32768,6,7,8,9,10,10),(65535,-128,11,12,13,14,15,15),(16777215,8388607,16,17,18,19,20,20);
--error ER_DUP_ENTRY
+--error 167
 INSERT INTO t4(c2,c3) VALUES(31,32) /* tries to increment out of range */;
--disable_warnings
+--error 167
 INSERT INTO t5(c2,c3) VALUES(33,34) /* tries to increment out of range */;
--enable_warnings
 --sorted_result
 SELECT * FROM t4;
@@ -4838,11 +4835,10 @@ INSERT INTO t2 VALUES(0,-2147483648,1,2,3,4,5),(255,-8388608,6,7,8,9,10),(65535,
 INSERT INTO t3 VALUES(0,-2147483648,1,2,3,4,5),(255,-8388608,6,7,8,9,10),(65535,-32768,11,12,13,14,15),(16777215,-128,16,17,18,19,20),(4294967295,2147483647,21,22,23,24,25);
 INSERT INTO t4 VALUES(-2147483648,0,1,2,3,4,5,5),(-8388608,255,6,7,8,9,10,10),(-32768,65535,11,12,13,14,15,15),(-128,16777215,16,17,18,19,20,20),(2147483647,4294967295,21,22,23,24,25,25);
 INSERT INTO t5 VALUES(0,-2147483648,1,2,3,4,5,5),(255,-8388608,6,7,8,9,10,10),(65535,-32768,11,12,13,14,15,15),(16777215,-128,16,17,18,19,20,20),(4294967295,2147483647,21,22,23,24,25,25);
--error ER_DUP_ENTRY
+--error 167
 INSERT INTO t4(c2,c3) VALUES(31,32) /* tries to increment out of range */;
--disable_warnings
+--error 167
 INSERT INTO t5(c2,c3) VALUES(33,34) /* tries to increment out of range */;
--enable_warnings
 --sorted_result
 SELECT * FROM t4;
@@ -6197,11 +6193,10 @@ INSERT INTO t2 VALUES(0,-2147483648,1,2,3,4,5),(255,-8388608,6,7,8,9,10),(65535,
 INSERT INTO t3 VALUES(0,-2147483648,1,2,3,4,5),(255,-8388608,6,7,8,9,10),(65535,-32768,11,12,13,14,15),(16777215,-128,16,17,18,19,20),(4294967295,2147483647,21,22,23,24,25);
 INSERT INTO t4 VALUES(-2147483648,0,1,2,3,4,5,5),(-8388608,255,6,7,8,9,10,10),(-32768,65535,11,12,13,14,15,15),(-128,16777215,16,17,18,19,20,20),(2147483647,4294967295,21,22,23,24,25,25);
 INSERT INTO t5 VALUES(0,-2147483648,1,2,3,4,5,5),(255,-8388608,6,7,8,9,10,10),(65535,-32768,11,12,13,14,15,15),(16777215,-128,16,17,18,19,20,20),(4294967295,2147483647,21,22,23,24,25,25);
--error ER_DUP_ENTRY
+--error 167
 INSERT INTO t4(c2,c3) VALUES(31,32) /* tries to increment out of range */;
--disable_warnings
+--error 167
 INSERT INTO t5(c2,c3) VALUES(33,34) /* tries to increment out of range */;
--enable_warnings
 --sorted_result
 SELECT * FROM t4;
@@ -7555,7 +7550,7 @@ INSERT INTO t2 VALUES(0,-9223372036854775808,1,2,3,4,5),(255,-2147483648,6,7,8,9
 INSERT INTO t3 VALUES(0,-9223372036854775808,1,2,3,4,5),(255,-2147483648,6,7,8,9,10),(65535,-8388608,11,12,13,14,15),(16777215,-32768,16,17,18,19,20),(4294967295,-128,21,22,23,24,25),(18446744073709551615,9223372036854775807,26,27,28,29,30);
 INSERT INTO t4 VALUES(-9223372036854775808,0,1,2,3,4,5,5),(-2147483648,255,6,7,8,9,10,10),(-8388608,65535,11,12,13,14,15,15),(-32768,16777215,16,17,18,19,20,20),(-128,4294967295,21,22,23,24,25,25),(9223372036854775807,18446744073709551615,26,27,28,29,30,30);
 INSERT INTO t5 VALUES(0,-9223372036854775808,1,2,3,4,5,5),(255,-2147483648,6,7,8,9,10,10),(65535,-8388608,11,12,13,14,15,15),(16777215,-32768,16,17,18,19,20,20),(4294967295,-128,21,22,23,24,25,25),(18446744073709551615,9223372036854775807,26,27,28,29,30,30);
--error ER_DUP_ENTRY
+--error 167
 INSERT INTO t4(c2,c3) VALUES(31,32) /* tries to increment out of range */;
 --error ER_AUTOINC_READ_FAILED
 INSERT INTO t5(c2,c3) VALUES(33,34) /* tries to increment out of range */;

--- a/mysql-test/suite/storage_engine/autoinc_vars.result
+++ b/mysql-test/suite/storage_engine/autoinc_vars.result
@@ -44,12 +44,10 @@ SET auto_increment_increment = 500;
 SET auto_increment_offset = 300;
 CREATE TABLE t1 (a TINYINT <CUSTOM_COL_OPTIONS> AUTO_INCREMENT, <CUSTOM_INDEX>(a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 INSERT INTO t1 (a) VALUES (NULL);
-Warnings:
+ERROR 22003: Out of range value for column 'a' at row 1
-Warning	1264	Out of range value for column 'a' at row 1
 SELECT LAST_INSERT_ID();
 LAST_INSERT_ID()
-127
+850
 SELECT * FROM t1;
 a
-127
 DROP TABLE t1;
--- a/mysql-test/suite/storage_engine/col_opt_not_null.result
+++ b/mysql-test/suite/storage_engine/col_opt_not_null.result
@@ -739,6 +739,8 @@ y YEAR <CUSTOM_COL_OPTIONS> NOT NULL,
 y4 YEAR(4) <CUSTOM_COL_OPTIONS> NOT NULL,
 y2 YEAR(2) <CUSTOM_COL_OPTIONS> NOT NULL
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
+Warnings:
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
 SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 d	date	#	#	#	
@@ -913,6 +915,8 @@ COUNT(c)	COUNT(c2)
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (c YEAR(2) <CUSTOM_COL_OPTIONS> NOT NULL) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
+Warnings:
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
 SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 c	year(2)	NO		NULL	
@@ -922,6 +926,9 @@ DROP TABLE t1;
 CREATE TABLE t1 (c YEAR(2) <CUSTOM_COL_OPTIONS> NOT NULL,
 c2 YEAR(2) <CUSTOM_COL_OPTIONS> NOT NULL DEFAULT '12'
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
+Warnings:
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
 SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 c	year(2)	NO		NULL	

--- a/mysql-test/suite/storage_engine/col_opt_null.result
+++ b/mysql-test/suite/storage_engine/col_opt_null.result
@@ -723,6 +723,8 @@ y YEAR <CUSTOM_COL_OPTIONS> NULL,
 y4 YEAR(4) <CUSTOM_COL_OPTIONS> NULL,
 y2 YEAR(2) <CUSTOM_COL_OPTIONS> NULL
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
+Warnings:
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
 SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 d	date	#	#	#	
@@ -884,6 +886,8 @@ COUNT(c2)	COUNT(c1)	COUNT(c)	COUNT(*)
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (c YEAR(2) <CUSTOM_COL_OPTIONS> NULL) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
+Warnings:
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
 SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 c	year(2)	YES		NULL	
@@ -896,6 +900,10 @@ CREATE TABLE t1 (c YEAR(2) <CUSTOM_COL_OPTIONS> NULL,
 c1 YEAR(2) <CUSTOM_COL_OPTIONS> NULL DEFAULT NULL,
 c2 YEAR(2) <CUSTOM_COL_OPTIONS> NULL DEFAULT '12'
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
+Warnings:
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
 SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 c	year(2)	YES		NULL	

--- a/mysql-test/suite/storage_engine/insert_with_keys.result
+++ b/mysql-test/suite/storage_engine/insert_with_keys.result
@@ -47,6 +47,8 @@ a	b
 5	e
 6	f
 INSERT IGNORE INTO t1 (a,b) VALUES (1,'a'),(12345,'z');
+Warnings:
+Warning	1062	Duplicate entry '1' for key 'a'
 INSERT INTO t1 (a,b) VALUES (3,'a'),(4,'d') ON DUPLICATE KEY UPDATE a = a+10;
 SELECT * FROM t1;
 a	b
@@ -85,6 +87,8 @@ a	b
 5	e
 6	f
 INSERT IGNORE INTO t1 (a,b) VALUES (1,'a'),(12345,'z');
+Warnings:
+Warning	1062	Duplicate entry '1-a' for key 'a'
 INSERT INTO t1 (a,b) VALUES (1,'a'),(12345,'z') ON DUPLICATE KEY UPDATE a = a+VALUES(a);
 SELECT * FROM t1;
 a	b
@@ -131,6 +135,8 @@ a	b
 5	e
 6	f
 INSERT IGNORE INTO t1 (a,b) VALUES (1,'a'),(12345,'z');
+Warnings:
+Warning	1062	Duplicate entry '1' for key 'PRIMARY'
 INSERT INTO t1 (a,b) VALUES (1,'a'),(12345,'z') ON DUPLICATE KEY UPDATE b = CONCAT(b,b);
 SELECT * FROM t1;
 a	b

--- a/mysql-test/suite/storage_engine/type_date_time.result
+++ b/mysql-test/suite/storage_engine/type_date_time.result
@@ -7,6 +7,8 @@ y YEAR <CUSTOM_COL_OPTIONS>,
 y4 YEAR(4) <CUSTOM_COL_OPTIONS>,
 y2 YEAR(2) <CUSTOM_COL_OPTIONS>
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
+Warnings:
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
 SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 d	date	#	#	#