MDEV-369 (Mismatches in MySQL engines test suite)

Following reasons caused mismatches:
  - different handling of invalid values;
  - different CAST results with fractional seconds;
  - microseconds support in MariaDB;
  - different algorithm of comparing temporal values;
  - differences in error and warning texts and codes;
  - different approach to truncating datetime values to time;
  - additional collations;
  - different record order for queries without ORDER BY;
  - MySQL bug#66034.
More details in MDEV-369 comments.

mysql-test/suite/engines/funcs/r/an_calendar.result

@@ -16,7 +16,13 @@ DROP TABLE t1;
 CREATE TABLE t1(c1 TIME NULL, c2 TIME NULL);
 SET TIMESTAMP=1171346973;
 INSERT INTO t1 VALUES(NOW(),NOW());
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
+Note	1265	Data truncated for column 'c2' at row 1
 INSERT INTO t1 VALUES(NOW(),NOW());
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
+Note	1265	Data truncated for column 'c2' at row 1
 ANALYZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK

mysql-test/suite/engines/funcs/r/datetime_function.result

@@ -25,7 +25,15 @@ INSERT INTO t3 VALUES('2008-02-29 13:13:13');
 DROP TABLE t3;
 CREATE TABLE t3(c1 TIME NOT NULL);
 INSERT INTO t3 VALUES('1000-01-01 00:00:00');
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t3 VALUES('1999-12-31 23:59:59');
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t3 VALUES('2000-01-01 00:00:00');
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t3 VALUES('2008-02-29 13:13:13');
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 DROP TABLE t3;

mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result

@@ -76,6 +76,7 @@ utf8_roman_ci	utf8	207		#	#
 utf8_persian_ci	utf8	208		#	#
 utf8_esperanto_ci	utf8	209		#	#
 utf8_hungarian_ci	utf8	210		#	#
+utf8_croatian_ci	utf8	213		#	#
 utf8_general_mysql500_ci	utf8	223		#	#
 ucs2_general_ci	ucs2	35	Yes	#	#
 ucs2_bin	ucs2	90		#	#
@@ -98,6 +99,7 @@ ucs2_roman_ci	ucs2	143		#	#
 ucs2_persian_ci	ucs2	144		#	#
 ucs2_esperanto_ci	ucs2	145		#	#
 ucs2_hungarian_ci	ucs2	146		#	#
+ucs2_croatian_ci	ucs2	149		#	#
 ucs2_general_mysql500_ci	ucs2	159		#	#
 cp866_general_ci	cp866	36	Yes	#	#
 cp866_bin	cp866	68		#	#

mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result

@@ -76,6 +76,7 @@ utf8_roman_ci	utf8	207		#	#
 utf8_persian_ci	utf8	208		#	#
 utf8_esperanto_ci	utf8	209		#	#
 utf8_hungarian_ci	utf8	210		#	#
+utf8_croatian_ci	utf8	213		#	#
 utf8_general_mysql500_ci	utf8	223		#	#
 ucs2_general_ci	ucs2	35	Yes	#	#
 ucs2_bin	ucs2	90		#	#
@@ -98,6 +99,7 @@ ucs2_roman_ci	ucs2	143		#	#
 ucs2_persian_ci	ucs2	144		#	#
 ucs2_esperanto_ci	ucs2	145		#	#
 ucs2_hungarian_ci	ucs2	146		#	#
+ucs2_croatian_ci	ucs2	149		#	#
 ucs2_general_mysql500_ci	ucs2	159		#	#
 cp866_general_ci	cp866	36	Yes	#	#
 cp866_bin	cp866	68		#	#

mysql-test/suite/engines/funcs/r/de_calendar_range.result

@@ -33,10 +33,20 @@ DROP TABLE t1;
 CREATE TABLE t1(c1 TIME NOT NULL PRIMARY KEY);
 SET TIMESTAMP=1171346973;
 INSERT INTO t1 (c1) VALUES(NOW());
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t1 (c1) VALUES(ADDTIME(NOW(),'1 01:01:01'));
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t1 (c1) VALUES(ADDTIME(NOW(),'2 02:01:01'));
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t1 (c1) VALUES(ADDTIME(NOW(),'3 03:01:01'));
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t1 (c1) VALUES(ADDTIME(NOW(),'4 04:01:01'));
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 SELECT * FROM t1 ORDER BY c1;
 c1
 09:09:33
@@ -47,8 +57,6 @@ c1
 DELETE FROM t1 WHERE c1 <= ADDTIME(NOW(),'2 02:01:01');
 SELECT * FROM t1 ORDER BY c1;
 c1
-12:10:34
-13:10:34
 DROP TABLE t1;
 CREATE TABLE t1(c1 DATETIME NOT NULL PRIMARY KEY);
 SET TIMESTAMP=1171346973;

mysql-test/suite/engines/funcs/r/in_calendar_2_unique_constraints_duplicate_update.result

@@ -66,12 +66,42 @@ DROP TABLE t1;
 CREATE TABLE t1(c1 TIME NOT NULL, c2 TIME NULL, c3 TIME NULL, PRIMARY KEY(c1), UNIQUE(c2));
 SET TIMESTAMP=1171346973;
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),ADDTIME(NOW(),'4 04:01:01'),NOW());
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(ADDTIME(NOW(),'1 01:01:01'),ADDTIME(NOW(),'3 03:01:01'),NOW());
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(ADDTIME(NOW(),'2 02:01:01'),ADDTIME(NOW(),'2 02:01:01'),NOW());
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(ADDTIME(NOW(),'3 03:01:01'),ADDTIME(NOW(),'1 01:01:01'),NOW());
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(ADDTIME(NOW(),'4 04:01:01'),NOW(),NOW());
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(ADDTIME(NOW(),'2 02:01:01'),ADDTIME(NOW(),'2 02:01:01'),NOW()) ON DUPLICATE KEY UPDATE c3=ADDTIME(NOW(),'6 06: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
+Note	1265	Data truncated for column 'c3' at row 1
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW()) ON DUPLICATE KEY UPDATE c3=ADDTIME(NOW(),'6 06: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
+Note	1265	Data truncated for column 'c3' at row 1
 SELECT * FROM t1;
 c1	c2	c3
 09:09:33	13:10:34	15:10:34

mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_duplicate_update.result

@@ -29,8 +29,15 @@ DROP TABLE t1;
 CREATE TABLE t1(c1 TIME NOT NULL PRIMARY KEY);
 SET TIMESTAMP=1171346973;
 INSERT INTO t1 (c1) VALUES(NOW());
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t1 (c1) VALUES(ADDTIME(NOW(),'1 01:01:01'));
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t1 (c1) VALUES(NOW()) ON DUPLICATE KEY UPDATE c1=ADDTIME(NOW(),'2 02:01:01');
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
+Note	1265	Data truncated for column 'c1' at row 1
 SELECT * FROM t1;
 c1
 10:10:34

mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_error.result

@@ -28,7 +28,11 @@ DROP TABLE t1;
 CREATE TABLE t1(c1 TIME NOT NULL PRIMARY KEY);
 SET TIMESTAMP=1171346973;
 INSERT INTO t1 (c1) VALUES(NOW());
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t1 (c1) VALUES(ADDTIME(NOW(),'1 01:01:01'));
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t1 (c1) VALUES(NOW());
 ERROR 23000: Duplicate entry '09:09:33' for key 'PRIMARY'
 SELECT * FROM t1;

mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_ignore.result

@@ -28,7 +28,11 @@ DROP TABLE t1;
 CREATE TABLE t1(c1 TIME NOT NULL PRIMARY KEY);
 SET TIMESTAMP=1171346973;
 INSERT INTO t1 (c1) VALUES(NOW());
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t1 (c1) VALUES(ADDTIME(NOW(),'1 01:01:01'));
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t1 (c1) VALUES(NOW());
 ERROR 23000: Duplicate entry '09:09:33' for key 'PRIMARY'
 SELECT * FROM t1;

mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_duplicate_update.result

@@ -29,8 +29,15 @@ DROP TABLE t1;
 CREATE TABLE t1(c1 TIME NULL UNIQUE);
 SET TIMESTAMP=1171346973;
 INSERT INTO t1 (c1) VALUES(NOW());
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t1 (c1) VALUES(ADDTIME(NOW(),'1 01:01:01'));
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t1 (c1) VALUES(NOW()) ON DUPLICATE KEY UPDATE c1=ADDTIME(NOW(),'2 02:01:01');
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
+Note	1265	Data truncated for column 'c1' at row 1
 SELECT * FROM t1;
 c1
 10:10:34

mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_error.result

@@ -28,7 +28,11 @@ DROP TABLE t1;
 CREATE TABLE t1(c1 TIME NULL UNIQUE);
 SET TIMESTAMP=1171346973;
 INSERT INTO t1 (c1) VALUES(NOW());
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t1 (c1) VALUES(ADDTIME(NOW(),'1 01:01:01'));
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t1 (c1) VALUES(NOW());
 ERROR 23000: Duplicate entry '09:09:33' for key 'c1'
 SELECT * FROM t1;

mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_ignore.result

@@ -28,8 +28,14 @@ DROP TABLE t1;
 CREATE TABLE t1(c1 TIME NULL UNIQUE);
 SET TIMESTAMP=1171346973;
 INSERT INTO t1 (c1) VALUES(NOW());
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t1 (c1) VALUES(ADDTIME(NOW(),'1 01:01:01'));
+Warnings:
+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
 SELECT * FROM t1;
 c1
 09:09:33

mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_duplicate_update.result

@@ -61,11 +61,40 @@ DROP TABLE t1;
 CREATE TABLE t1(c1 TIME NOT NULL, c2 TIME NOT NULL, c3 TIME NOT NULL, PRIMARY KEY(c1,c2,c3));
 SET TIMESTAMP=1171346973;
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
+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
 INSERT 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
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),ADDTIME(NOW(),'1 01:01:01'),NOW());
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(ADDTIME(NOW(),'1 01:01:01'),NOW(),NOW());
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW()) ON DUPLICATE KEY UPDATE c1=ADDTIME(NOW(),'2 02:01:01'),c2=ADDTIME(NOW(),'2 02:01:01'),c3=ADDTIME(NOW(),'2 02: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
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),ADDTIME(NOW(),'1 01:01:01')) ON DUPLICATE KEY UPDATE c1=ADDTIME(NOW(),'2 02:01:01'),c2=ADDTIME(NOW(),'2 02: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
+Note	1265	Data truncated for column 'c1' at row 1
+Note	1265	Data truncated for column 'c2' at row 1
 SELECT * FROM t1;
 c1	c2	c3
 09:09:33	10:10:34	09:09:33

mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_error.result

@@ -52,9 +52,25 @@ DROP TABLE t1;
 CREATE TABLE t1(c1 TIME NOT NULL, c2 TIME NOT NULL, c3 TIME NOT NULL, PRIMARY KEY(c1,c2,c3));
 SET TIMESTAMP=1171346973;
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
+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
 INSERT 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
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),ADDTIME(NOW(),'1 01:01:01'),NOW());
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(ADDTIME(NOW(),'1 01:01:01'),NOW(),NOW());
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
 ERROR 23000: Duplicate entry '09:09:33-09:09:33-09:09:33' for key 'PRIMARY'
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),ADDTIME(NOW(),'1 01:01:01'));

mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_ignore.result

@@ -52,9 +52,25 @@ DROP TABLE t1;
 CREATE TABLE t1(c1 TIME NOT NULL, c2 TIME NOT NULL, c3 TIME NOT NULL, PRIMARY KEY(c1,c2,c3));
 SET TIMESTAMP=1171346973;
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
+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
 INSERT 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
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),ADDTIME(NOW(),'1 01:01:01'),NOW());
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(ADDTIME(NOW(),'1 01:01:01'),NOW(),NOW());
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
 ERROR 23000: Duplicate entry '09:09:33-09:09:33-09:09:33' for key 'PRIMARY'
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),ADDTIME(NOW(),'1 01:01:01'));

mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_duplicate_update.result

@@ -61,11 +61,40 @@ DROP TABLE t1;
 CREATE TABLE t1(c1 TIME NULL, c2 TIME NULL, c3 TIME NULL, UNIQUE(c1,c2,c3));
 SET TIMESTAMP=1171346973;
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
+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
 INSERT 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
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),ADDTIME(NOW(),'1 01:01:01'),NOW());
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(ADDTIME(NOW(),'1 01:01:01'),NOW(),NOW());
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW()) ON DUPLICATE KEY UPDATE c1=ADDTIME(NOW(),'2 02:01:01'),c2=ADDTIME(NOW(),'2 02:01:01'),c3=ADDTIME(NOW(),'2 02: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
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),ADDTIME(NOW(),'1 01:01:01')) ON DUPLICATE KEY UPDATE c1=ADDTIME(NOW(),'2 02:01:01'),c2=ADDTIME(NOW(),'2 02: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
+Note	1265	Data truncated for column 'c1' at row 1
+Note	1265	Data truncated for column 'c2' at row 1
 SELECT * FROM t1;
 c1	c2	c3
 09:09:33	10:10:34	09:09:33

mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_error.result

@@ -52,9 +52,25 @@ DROP TABLE t1;
 CREATE TABLE t1(c1 TIME NULL, c2 TIME NULL, c3 TIME NULL, UNIQUE(c1,c2,c3));
 SET TIMESTAMP=1171346973;
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
+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
 INSERT 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
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),ADDTIME(NOW(),'1 01:01:01'),NOW());
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(ADDTIME(NOW(),'1 01:01:01'),NOW(),NOW());
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
 ERROR 23000: Duplicate entry '09:09:33-09:09:33-09:09:33' for key 'c1'
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),ADDTIME(NOW(),'1 01:01:01'));

mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_ignore.result

@@ -56,11 +56,35 @@ DROP TABLE t1;
 CREATE TABLE t1(c1 TIME NULL, c2 TIME NULL, c3 TIME NULL, UNIQUE(c1,c2,c3));
 SET TIMESTAMP=1171346973;
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
+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
 INSERT 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
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),ADDTIME(NOW(),'1 01:01:01'),NOW());
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(ADDTIME(NOW(),'1 01:01:01'),NOW(),NOW());
+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
 INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
+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
 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
 SELECT * FROM t1;
 c1	c2	c3
 09:09:33	09:09:33	09:09:33

mysql-test/suite/engines/funcs/r/in_multicolumn_number_pk_constraint_duplicate_update.result

@@ -61,11 +61,40 @@ DROP TABLE t1;
 CREATE TABLE t1(c1 TIME NOT NULL, c2 TIME NOT NULL, c3 TIME NOT NULL, PRIMARY KEY(c1,c2,c3));
 SET TIMESTAMP=1171346973;
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
+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
 INSERT 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
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),ADDTIME(NOW(),'1 01:01:01'),NOW());
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(ADDTIME(NOW(),'1 01:01:01'),NOW(),NOW());
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW()) ON DUPLICATE KEY UPDATE c1=ADDTIME(NOW(),'2 02:01:01'),c2=ADDTIME(NOW(),'2 02:01:01'),c3=ADDTIME(NOW(),'2 02: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
+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
 INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),ADDTIME(NOW(),'1 01:01:01')) ON DUPLICATE KEY UPDATE c1=ADDTIME(NOW(),'2 02:01:01'),c2=ADDTIME(NOW(),'2 02: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
+Note	1265	Data truncated for column 'c1' at row 1
+Note	1265	Data truncated for column 'c2' at row 1
 SELECT * FROM t1;
 c1	c2	c3
 09:09:33	10:10:34	09:09:33

mysql-test/suite/engines/funcs/r/in_number_boundary_error.result

@@ -7,7 +7,7 @@ INSERT INTO t4 (c1) VALUES(0);
 INSERT INTO t4 (c1) VALUES(-1);
 ERROR 22003: Out of range value for column 'c1' at row 1
 INSERT INTO t4 (c1) VALUES('x');
-ERROR HY000: Incorrect integer value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column 'c1' at row 1
 INSERT INTO t4 (c1) VALUES('9');
 SELECT COUNT(c1) AS total_rows FROM t4;
 total_rows
@@ -26,7 +26,7 @@ INSERT INTO t4 (c1) VALUES(0);
 INSERT INTO t4 (c1) VALUES(-1);
 ERROR 22003: Out of range value for column 'c1' at row 1
 INSERT INTO t4 (c1) VALUES('x');
-ERROR HY000: Incorrect integer value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column 'c1' at row 1
 INSERT INTO t4 (c1) VALUES('9');
 SELECT COUNT(c1) AS total_rows FROM t4;
 total_rows
@@ -45,7 +45,7 @@ INSERT INTO t4 (c1) VALUES(0);
 INSERT INTO t4 (c1) VALUES(-1);
 ERROR 22003: Out of range value for column 'c1' at row 1
 INSERT INTO t4 (c1) VALUES('x');
-ERROR HY000: Incorrect integer value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column 'c1' at row 1
 INSERT INTO t4 (c1) VALUES('9');
 SELECT COUNT(c1) AS total_rows FROM t4;
 total_rows
@@ -64,7 +64,7 @@ INSERT INTO t4 (c1) VALUES(0);
 INSERT INTO t4 (c1) VALUES(-1);
 ERROR 22003: Out of range value for column 'c1' at row 1
 INSERT INTO t4 (c1) VALUES('x');
-ERROR HY000: Incorrect integer value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column 'c1' at row 1
 INSERT INTO t4 (c1) VALUES('9');
 SELECT COUNT(c1) AS total_rows FROM t4;
 total_rows
@@ -83,7 +83,7 @@ INSERT INTO t4 (c1) VALUES(0);
 INSERT INTO t4 (c1) VALUES(-1);
 ERROR 22003: Out of range value for column 'c1' at row 1
 INSERT INTO t4 (c1) VALUES('x');
-ERROR HY000: Incorrect integer value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column 'c1' at row 1
 INSERT INTO t4 (c1) VALUES('9');
 SELECT COUNT(c1) AS total_rows FROM t4;
 total_rows
@@ -102,7 +102,7 @@ INSERT INTO t4 (c1) VALUES(0);
 INSERT INTO t4 (c1) VALUES(-1);
 ERROR 22003: Out of range value for column 'c1' at row 1
 INSERT INTO t4 (c1) VALUES('x');
-ERROR HY000: Incorrect integer value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column 'c1' at row 1
 INSERT INTO t4 (c1) VALUES('9');
 SELECT COUNT(c1) AS total_rows FROM t4;
 total_rows

mysql-test/suite/engines/funcs/r/in_number_decimal_boundary_error.result

@@ -7,7 +7,7 @@ INSERT INTO t5 (c1) VALUES(0);
 INSERT INTO t5 (c1) VALUES(-1);
 ERROR 22003: Out of range value for column 'c1' at row 1
 INSERT INTO t5 (c1) VALUES('x');
-ERROR HY000: Incorrect decimal value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect decimal value: 'x' for column 'c1' at row 1
 INSERT INTO t5 (c1) VALUES(999999);
 ERROR 22003: Out of range value for column 'c1' at row 1
 SELECT COUNT(c1) AS total_rows FROM t5;
@@ -27,7 +27,7 @@ INSERT INTO t5 (c1) VALUES(0);
 INSERT INTO t5 (c1) VALUES(-1);
 ERROR 22003: Out of range value for column 'c1' at row 1
 INSERT INTO t5 (c1) VALUES('x');
-ERROR HY000: Incorrect decimal value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect decimal value: 'x' for column 'c1' at row 1
 INSERT INTO t5 (c1) VALUES(999999);
 ERROR 22003: Out of range value for column 'c1' at row 1
 SELECT COUNT(c1) AS total_rows FROM t5;
@@ -47,7 +47,7 @@ INSERT INTO t5 (c1) VALUES(0);
 INSERT INTO t5 (c1) VALUES(-1);
 ERROR 22003: Out of range value for column 'c1' at row 1
 INSERT INTO t5 (c1) VALUES('x');
-ERROR HY000: Incorrect decimal value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect decimal value: 'x' for column 'c1' at row 1
 INSERT INTO t5 (c1) VALUES(999999);
 ERROR 22003: Out of range value for column 'c1' at row 1
 SELECT COUNT(c1) AS total_rows FROM t5;
@@ -67,7 +67,7 @@ INSERT INTO t5 (c1) VALUES(0);
 INSERT INTO t5 (c1) VALUES(-1);
 ERROR 22003: Out of range value for column 'c1' at row 1
 INSERT INTO t5 (c1) VALUES('x');
-ERROR HY000: Incorrect decimal value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect decimal value: 'x' for column 'c1' at row 1
 INSERT INTO t5 (c1) VALUES(999999);
 ERROR 22003: Out of range value for column 'c1' at row 1
 SELECT COUNT(c1) AS total_rows FROM t5;

mysql-test/suite/engines/funcs/r/sq_all.result

@@ -13,13 +13,10 @@ SELECT c1 FROM t1 WHERE c1 > ALL (SELECT c1 FROM t2);
 c1
 SELECT c1 FROM t1 WHERE c1 >= ALL (SELECT c1 FROM t2);
 c1
-100
 SELECT c1 FROM t1 WHERE c1 = ALL (SELECT c1 FROM t2);
 c1
 SELECT c1 FROM t1 WHERE c1 <= ALL (SELECT c1 FROM t2);
 c1
-1
-2
 SELECT c1 FROM t1 WHERE c1 <> ALL  (SELECT c1 FROM t2);
 c1
 DROP TABLE t1;
@@ -37,13 +34,10 @@ SELECT c1 FROM t1 WHERE c1 > ALL (SELECT c1 FROM t2);
 c1
 SELECT c1 FROM t1 WHERE c1 >= ALL (SELECT c1 FROM t2);
 c1
-100
 SELECT c1 FROM t1 WHERE c1 = ALL (SELECT c1 FROM t2);
 c1
 SELECT c1 FROM t1 WHERE c1 <= ALL (SELECT c1 FROM t2);
 c1
-1
-2
 SELECT c1 FROM t1 WHERE c1 <> ALL  (SELECT c1 FROM t2);
 c1
 DROP TABLE t1;
@@ -61,13 +55,10 @@ SELECT c1 FROM t1 WHERE c1 > ALL (SELECT c1 FROM t2);
 c1
 SELECT c1 FROM t1 WHERE c1 >= ALL (SELECT c1 FROM t2);
 c1
-100
 SELECT c1 FROM t1 WHERE c1 = ALL (SELECT c1 FROM t2);
 c1
 SELECT c1 FROM t1 WHERE c1 <= ALL (SELECT c1 FROM t2);
 c1
-1
-2
 SELECT c1 FROM t1 WHERE c1 <> ALL  (SELECT c1 FROM t2);
 c1
 DROP TABLE t1;
@@ -85,13 +76,10 @@ SELECT c1 FROM t1 WHERE c1 > ALL (SELECT c1 FROM t2);
 c1
 SELECT c1 FROM t1 WHERE c1 >= ALL (SELECT c1 FROM t2);
 c1
-100
 SELECT c1 FROM t1 WHERE c1 = ALL (SELECT c1 FROM t2);
 c1
 SELECT c1 FROM t1 WHERE c1 <= ALL (SELECT c1 FROM t2);
 c1
-1
-2
 SELECT c1 FROM t1 WHERE c1 <> ALL  (SELECT c1 FROM t2);
 c1
 DROP TABLE t1;

mysql-test/suite/engines/funcs/r/up_calendar_range.result

@@ -39,10 +39,20 @@ DROP TABLE t1;
 CREATE TABLE t1(c1 TIME NOT NULL);
 SET TIMESTAMP=1171346973;
 INSERT INTO t1 (c1) VALUES(NOW());
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t1 (c1) VALUES(ADDTIME(NOW(),'1 01:01:01'));
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t1 (c1) VALUES(ADDTIME(NOW(),'2 02:01:01'));
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t1 (c1) VALUES(ADDTIME(NOW(),'3 03:01:01'));
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 INSERT INTO t1 (c1) VALUES(ADDTIME(NOW(),'4 04:01:01'));
+Warnings:
+Note	1265	Data truncated for column 'c1' at row 1
 SELECT * FROM t1 ORDER BY c1;
 c1
 09:09:33
@@ -54,10 +64,10 @@ UPDATE t1 SET c1 = NOW() WHERE c1 >= ADDTIME(NOW(),'2 02:01:01');
 SELECT * FROM t1 ORDER BY c1;
 c1
 09:09:33
-09:09:33
-09:09:33
-09:09:33
 10:10:34
+11:10:34
+12:10:34
+13:10:34
 DROP TABLE t1;
 CREATE TABLE t1(c1 DATETIME NOT NULL);
 SET TIMESTAMP=1171346973;

mysql-test/suite/engines/iuds/r/delete_time.result

@@ -497,10 +497,10 @@ c2
 00:13:13
 00:51:51
 01:01:01
-02:02:02
 03:03:00
 08:08:08
 100:04:04
+11:11:11
 11:11:27
 125:00:00
 125:05:00
@@ -644,7 +644,7 @@ c1	c2
 -838:59:59	-838:59:59
 00:04:00	00:04:00
 00:54:54	00:54:54
-11:11:11	11:11:11
+02:02:02	02:02:02
 12:34:56	NULL
 SELECT * FROM t2;
 c1	c2

mysql-test/suite/engines/iuds/r/insert_decimal.result

@@ -1013,7 +1013,7 @@ ROUND(c1,c2)	TRUNCATE(c1,c2)
 1.133000	1.132000
 DROP TABLE t5;
 CREATE TABLE t7(c1 DECIMAL(66,0));
-ERROR 42000: Too big precision 66 specified for column 'c1'. Maximum is 65.
+ERROR 42000: Too big precision 66 specified for 'c1'. Maximum is 65.
 CREATE TABLE t7(c1 DECIMAL(5,10));
 ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 'c1').
 DROP TABLE t1,t2;

mysql-test/suite/engines/iuds/r/insert_time.result

@@ -40,12 +40,12 @@ INSERT INTO t4 VALUES('10.22.22','10.22.22','2009-01-26'),(1234567,1234567,'2009
 Warnings:
 Warning	1265	Data truncated for column 'c1' at row 1
 Warning	1265	Data truncated for column 'c2' at row 1
-Warning	1264	Out of range value for column 'c1' at row 2
-Warning	1264	Out of range value for column 'c2' at row 2
-Warning	1264	Out of range value for column 'c1' at row 3
-Warning	1264	Out of range value for column 'c2' at row 3
-Warning	1264	Out of range value for column 'c1' at row 4
-Warning	1264	Out of range value for column 'c2' at row 4
+Warning	1265	Data truncated for column 'c1' at row 2
+Warning	1265	Data truncated for column 'c2' at row 2
+Warning	1265	Data truncated for column 'c1' at row 3
+Warning	1265	Data truncated for column 'c2' at row 3
+Warning	1265	Data truncated for column 'c1' at row 4
+Warning	1265	Data truncated for column 'c2' at row 4
 Warning	1265	Data truncated for column 'c1' at row 6
 Warning	1265	Data truncated for column 'c2' at row 6
 INSERT INTO t1 VALUES('8:29:45',NULL,'2009-02-01');
@@ -135,6 +135,8 @@ c1	c2	c3
 -838:59:59	-838:59:59	2009-01-08
 00:00:00	00:00:00	2009-01-09
 00:00:00	00:00:00	2009-01-27
+00:00:00	00:00:00	2009-01-28
+00:00:00	00:00:00	2009-01-29
 00:00:10	00:00:10	2009-01-26
 00:00:11	00:00:11	2009-01-20
 00:00:12	00:00:12	2009-01-13
@@ -160,8 +162,6 @@ c1	c2	c3
 491:22:33	491:22:33	2009-01-04
 825:23:00	825:23:00	2009-01-05
 838:59:59	838:59:59	2009-01-10
-838:59:59	838:59:59	2009-01-28
-838:59:59	838:59:59	2009-01-29
 SELECT * FROM t1;
 c1	c2	c3
 -838:59:59	-838:59:59	2009-01-21
@@ -1650,8 +1650,10 @@ SELECT * FROM t1 WHERE c2 BETWEEN NULL AND '10:22:33' ORDER BY c2 LIMIT 2;
 c1	c2	c3
 SELECT * FROM t1 WHERE c2 IN (NULL,'10:22:33') ORDER BY c2;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t1 WHERE c2 IN (NULL,'10:22:33') ORDER BY c2 LIMIT 2;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t1 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c2;
 c1	c2	c3
 SELECT * FROM t1 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c2 LIMIT 2;
@@ -1723,8 +1725,10 @@ SELECT * FROM t1 WHERE c2 BETWEEN NULL AND '10:22:33' ORDER BY c2 DESC LIMIT 2;
 c1	c2	c3
 SELECT * FROM t1 WHERE c2 IN (NULL,'10:22:33') ORDER BY c2 DESC;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t1 WHERE c2 IN (NULL,'10:22:33') ORDER BY c2 DESC LIMIT 2;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t1 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c2 DESC;
 c1	c2	c3
 SELECT * FROM t1 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c2 DESC LIMIT 2;
@@ -3218,8 +3222,10 @@ SELECT * FROM t2 WHERE c2 BETWEEN NULL AND '10:22:33' ORDER BY c1,c2 LIMIT 2;
 c1	c2	c3
 SELECT * FROM t2 WHERE c2 IN (NULL,'10:22:33') ORDER BY c1,c2;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t2 WHERE c2 IN (NULL,'10:22:33') ORDER BY c1,c2 LIMIT 2;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t2 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c1,c2;
 c1	c2	c3
 SELECT * FROM t2 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c1,c2 LIMIT 2;
@@ -3287,8 +3293,10 @@ SELECT * FROM t2 WHERE c2 BETWEEN NULL AND '10:22:33' ORDER BY c1,c2 DESC LIMIT
 c1	c2	c3
 SELECT * FROM t2 WHERE c2 IN (NULL,'10:22:33') ORDER BY c1,c2 DESC;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t2 WHERE c2 IN (NULL,'10:22:33') ORDER BY c1,c2 DESC LIMIT 2;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t2 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c1,c2 DESC;
 c1	c2	c3
 SELECT * FROM t2 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c1,c2 DESC LIMIT 2;
@@ -4814,8 +4822,10 @@ SELECT * FROM t3 WHERE c2 BETWEEN NULL AND '10:22:33' ORDER BY c1,c2 LIMIT 2;
 c1	c2	c3
 SELECT * FROM t3 WHERE c2 IN (NULL,'10:22:33') ORDER BY c1,c2;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t3 WHERE c2 IN (NULL,'10:22:33') ORDER BY c1,c2 LIMIT 2;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t3 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c1,c2;
 c1	c2	c3
 SELECT * FROM t3 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c1,c2 LIMIT 2;
@@ -4887,8 +4897,10 @@ SELECT * FROM t3 WHERE c2 BETWEEN NULL AND '10:22:33' ORDER BY c1,c2 DESC LIMIT
 c1	c2	c3
 SELECT * FROM t3 WHERE c2 IN (NULL,'10:22:33') ORDER BY c1,c2 DESC;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t3 WHERE c2 IN (NULL,'10:22:33') ORDER BY c1,c2 DESC LIMIT 2;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t3 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c1,c2 DESC;
 c1	c2	c3
 SELECT * FROM t3 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c1,c2 DESC LIMIT 2;
@@ -5008,28 +5020,24 @@ c1	MIN(c2)
 838:59:59	838:59:59
 SELECT CAST(235959.123456 AS TIME);
 CAST(235959.123456 AS TIME)
-23:59:59.123456
+23:59:59
 SELECT CAST(0.235959123456e+6 AS TIME);
 CAST(0.235959123456e+6 AS TIME)
-23:59:59.123456
+23:59:59
 SELECT CAST(235959123456e-6 AS TIME);
 CAST(235959123456e-6 AS TIME)
-23:59:59.123456
+23:59:59
 SELECT CAST(235959.1234567 AS TIME);
 CAST(235959.1234567 AS TIME)
-23:59:59.123456
-Warnings:
-Warning	1292	Truncated incorrect time value: '235959.1234567'
+23:59:59
 SELECT CAST(0.2359591234567e6 AS TIME);
 CAST(0.2359591234567e6 AS TIME)
-23:59:59.123456
-Warnings:
-Warning	1292	Truncated incorrect time value: '235959.1234567'
+23:59:59
 SELECT CAST(0.2359591234567e+30 AS TIME);
 CAST(0.2359591234567e+30 AS TIME)
 NULL
 Warnings:
-Warning	1292	Truncated incorrect time value: '2.359591234567e+29'
+Warning	1292	Incorrect datetime value: '2.359591234567e+29'
 select cast('100:55:50' as time) < cast('24:00:00' as time);
 cast('100:55:50' as time) < cast('24:00:00' as time)
 0
@@ -5077,7 +5085,6 @@ c1	c2	c3
 INSERT INTO t2(c1,c2) VALUES('12:34:56.78','12:34:56.78') ON DUPLICATE KEY UPDATE c1='12:34:56.79',c2='12:34:57.78';
 SELECT * FROM t2 WHERE c1='12:34:56.79' AND c2='12:34:57.78' /* 1 row */;
 c1	c2	c3
-12:34:56	12:34:57	2009-01-01
 SELECT * FROM t1 WHERE c1='10:22:35' AND c2='33 9:23' /* no rows */;
 c1	c2	c3
 INSERT INTO t1(c1,c2) VALUES('10:22:34','34 9:23') ON DUPLICATE KEY UPDATE c1='10:22:35',c2='33 9:23';
@@ -5137,8 +5144,8 @@ c1	c2	c3
 09:36:00	09:36:00	2009-01-25
 00:00:10	00:00:10	2009-01-26
 00:00:00	00:00:00	2009-01-27
-838:59:59	838:59:59	2009-01-28
-838:59:59	838:59:59	2009-01-29
+00:00:00	00:00:00	2009-01-28
+00:00:00	00:00:00	2009-01-29
 262:22:00	262:22:00	2009-01-30
 00:00:12	00:00:12	2009-01-31
 08:29:45	NULL	2009-02-01
@@ -5146,15 +5153,39 @@ c1	c2	c3
 TRUNCATE TABLE t5;
 INSERT INTO t5 SELECT * FROM t4 WHERE c1 >='12colon34colon56';
 Warnings:
-Warning	1292	Incorrect time value: '12colon34colon56' for column 'c1' at row 1
+Warning	1292	Truncated incorrect time value: '12colon34colon56'
 SELECT * FROM t5;
 c1	c2	c3
+12:34:56	12:34:56	2009-01-01
+10:22:33	10:22:33	2009-01-02
+01:23:00	01:23:00	2009-01-03
 491:22:33	491:22:33	2009-01-04
 825:23:00	825:23:00	2009-01-05
+10:00:00	10:00:00	2009-01-06
+00:00:45	00:00:45	2009-01-07
+00:00:00	00:00:00	2009-01-09
 838:59:59	838:59:59	2009-01-10
-838:59:59	838:59:59	2009-01-28
-838:59:59	838:59:59	2009-01-29
+10:11:12	10:11:12	2009-01-11
+11:11:12	11:11:12	2009-01-12
+00:00:12	00:00:12	2009-01-13
+00:12:34	00:12:34	2009-01-14
+12:34:58	12:34:58	2009-01-15
+12:35:56	12:35:56	2009-01-16
+11:11:27	11:11:27	2009-01-17
+08:03:02	08:03:02	2009-01-18
+00:11:12	00:11:12	2009-01-19
+00:00:11	00:00:11	2009-01-20
+00:12:30	00:12:30	2009-01-23
+09:00:45	09:00:45	2009-01-24
+09:36:00	09:36:00	2009-01-25
+00:00:10	00:00:10	2009-01-26
+00:00:00	00:00:00	2009-01-27
+00:00:00	00:00:00	2009-01-28
+00:00:00	00:00:00	2009-01-29
 262:22:00	262:22:00	2009-01-30
+00:00:12	00:00:12	2009-01-31
+08:29:45	NULL	2009-02-01
+00:00:00	07:23:55	NULL
 TRUNCATE TABLE t5;
 DROP TABLE t5;
 DROP TABLE t1,t2,t3,t4;

mysql-test/suite/engines/iuds/r/update_delete_number.result

@@ -56,6 +56,8 @@ 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
@@ -1150,6 +1152,8 @@ 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
@@ -1922,6 +1926,8 @@ 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
@@ -2669,6 +2675,8 @@ 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
@@ -3416,6 +3424,8 @@ 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

mysql-test/suite/engines/iuds/r/update_time.result

@@ -793,10 +793,10 @@ c2
 00:09:09
 00:11:11
 00:11:11
+00:11:11
 00:13:13
 00:51:51
 01:01:01
-02:02:02
 03:03:00
 08:08:08
 100:04:04
@@ -1332,7 +1332,7 @@ c1	c2
 00:51:51	02:22:22
 00:54:54	00:54:54
 01:01:01	02:22:22
-02:02:02	02:22:22
+02:02:02	02:02:02
 03:03:00	02:22:22
 08:08:08	00:00:00
 100:04:04	100:04:04
@@ -1374,7 +1374,7 @@ c1	c2
 00:51:51	00:51:51
 00:54:54	00:11:11
 01:01:01	01:01:01
-02:02:02	02:02:02
+02:02:02	00:11:11
 03:03:00	03:03:00
 08:08:08	08:08:08
 11:11:11	00:11:11