Merge with Sergei's tree to get in latest microsecond patches and also fixes to innodb_plugin.

client/mysqlbinlog.cc

@@ -1445,7 +1445,7 @@ static my_time_t convert_str_to_timestamp(const char* str)
   int was_cut;
   MYSQL_TIME l_time;
   long dummy_my_timezone;
-  my_bool dummy_in_dst_time_gap;
+  uint dummy_in_dst_time_gap;
   /* We require a total specification (date AND time) */
   if (str_to_datetime(str, (uint) strlen(str), &l_time, 0, &was_cut) !=
       MYSQL_TIMESTAMP_DATETIME || was_cut)

include/my_time.h

@@ -85,9 +85,7 @@ typedef long my_time_t;
 #define TIME_MAX_SECOND_PART 999999
 #define TIME_SECOND_PART_FACTOR (TIME_MAX_SECOND_PART+1)
 #define TIME_SECOND_PART_DIGITS 6
-#define TIME_MAX_VALUE (TIME_MAX_HOUR*10000 + TIME_MAX_MINUTE*100 + \
-                        TIME_MAX_SECOND +                           \
-                        TIME_MAX_SECOND_PART/(double)TIME_SECOND_PART_FACTOR)
+#define TIME_MAX_VALUE (TIME_MAX_HOUR*10000 + TIME_MAX_MINUTE*100 + TIME_MAX_SECOND)
 #define TIME_MAX_VALUE_SECONDS (TIME_MAX_HOUR * 3600L + \
                                 TIME_MAX_MINUTE * 60L + TIME_MAX_SECOND)
 
@@ -99,11 +97,21 @@ str_to_time(const char *str, uint length, MYSQL_TIME *l_time,
 enum enum_mysql_timestamp_type
 str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time,
                 ulong flags, int *was_cut);
-longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
+longlong number_to_datetime(longlong nr, ulong sec_part, MYSQL_TIME *time_res,
                             uint flags, int *was_cut);
-int number_to_time(double nr, MYSQL_TIME *ltime, int *was_cut);
-my_bool double_to_datetime(double nr, MYSQL_TIME *time_res,
-                           uint flags);
+
+static inline
+longlong double_to_datetime(double nr, MYSQL_TIME *ltime, uint flags, int *cut)
+{
+  if (nr < 0 || nr > LONGLONG_MAX)
+    nr= (double)LONGLONG_MAX;
+  return number_to_datetime((longlong) floor(nr),
+                            (ulong)((nr-floor(nr))*TIME_SECOND_PART_FACTOR),
+                            ltime, flags, cut);
+}
+
+int number_to_time(my_bool neg, longlong nr, ulong sec_part,
+                   MYSQL_TIME *ltime, int *was_cut);
 ulonglong TIME_to_ulonglong_datetime(const MYSQL_TIME *);
 ulonglong TIME_to_ulonglong_date(const MYSQL_TIME *);
 ulonglong TIME_to_ulonglong_time(const MYSQL_TIME *);
@@ -146,8 +154,7 @@ static inline my_bool validate_timestamp_range(const MYSQL_TIME *t)
 }
 
 my_time_t 
-my_system_gmt_sec(const MYSQL_TIME *t, long *my_timezone,
-                  my_bool *in_dst_time_gap);
+my_system_gmt_sec(const MYSQL_TIME *t, long *my_timezone, uint *error_code);
 
 void set_zero_time(MYSQL_TIME *tm, enum enum_mysql_timestamp_type time_type);
 

libmysql/libmysql.c

@@ -3681,7 +3681,8 @@ static void fetch_long_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
   case MYSQL_TYPE_DATETIME:
   {
     int error;
-    value= number_to_datetime(value, (MYSQL_TIME *) buffer, TIME_FUZZY_DATE,
+    value= number_to_datetime(value, 0,
+                              (MYSQL_TIME *) buffer, TIME_FUZZY_DATE,
                               &error);
     *param->error= test(error);
     break;

mysql-test/include/type_hrtime.inc

@@ -54,11 +54,40 @@ select * from t1;
 create table t2 select * from t1;
 create table t3 like t1;
 
+show create table t2;
+show create table t3;
+drop table t2, t3;
+
+# math, aggregation
+insert t1 values ('2010-12-13 14:15:16.222222');
+select a, a+0, a-1, a*1, a/2 from t1;
+select max(a), min(a), sum(a), avg(a) from t1;
+create table t2 select a, a+0, a-1, a*1, a/2 from t1;
+create table t3 select max(a), min(a), sum(a), avg(a) from t1;
 show create table t2;
 show create table t3;
 
 drop table t1, t2, t3;
 
+# insert, alter with conversion
+--vertical_results
+eval create table t1 (f0_$type $type(0), f1_$type $type(1), f2_$type $type(2), f3_$type $type(3), f4_$type $type(4), f5_$type $type(5), f6_$type $type(6));
+insert t1 values ( '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432');
+select * from t1;
+eval select cast(f0_$type as time(4)) time4_f0_$type, cast(f1_$type as datetime(3)) datetime3_f1_$type, cast(f2_$type as date) date_f2_$type, cast(f4_$type as double) double_f3_$type, cast(f4_$type as decimal(40,5)) decimal5_f4_$type, cast(f5_$type as signed) bigint_f5_$type, cast(f6_$type as char(255)) varchar_f6_$type from t1;
+eval create table t2 (time4_f0_$type time(4), datetime3_f1_$type datetime(3), date_f2_$type date, double_f3_$type double, decimal5_f4_$type decimal(40,5), bigint_f5_$type bigint, varchar_f6_$type varchar(255));
+insert t2 select * from t1;
+select * from t2;
+eval alter table t1 change f0_$type time4_f0_$type time(4), change f1_$type datetime3_f1_$type datetime(3), change f2_$type date_f2_$type date, change f3_$type double_f3_$type double, change f4_$type decimal5_f4_$type decimal(40,5), change f5_$type bigint_f5_$type bigint, change f6_$type varchar_f6_$type varchar(255);
+select * from t1;
+eval alter table t1 modify time4_f0_$type $type(0), modify datetime3_f1_$type $type(1), modify date_f2_$type $type(2), modify double_f3_$type $type(3), modify decimal5_f4_$type $type(4), modify bigint_f5_$type $type(5), modify varchar_f6_$type $type(6);
+select * from t1;
+delete from t1;
+insert t1 select * from t2;
+select * from t1;
+drop table t1, t2;
+--horizontal_results
+
 #
 # SP
 #

mysql-test/r/cast.result

@@ -65,10 +65,10 @@ cast(cast("20:01:01" as time) as datetime)
 0000-00-00 20:01:01
 select cast(cast("8:46:06.23434" AS time) as decimal(32,10));
 cast(cast("8:46:06.23434" AS time) as decimal(32,10))
-84606.2343400000
+84606.0000000000
 select cast(cast("2011-04-05 8:46:06.23434" AS datetime) as decimal(32,6));
 cast(cast("2011-04-05 8:46:06.23434" AS datetime) as decimal(32,6))
-20110405084606.234340
+20110405084606.000000
 #
 # Check handling of cast with microseconds
 #
@@ -77,7 +77,7 @@ cast(cast(20010203101112.121314 as double) as datetime)
 2001-02-03 10:11:12
 select cast(cast(010203101112.12 as double) as datetime);
 cast(cast(010203101112.12 as double) as datetime)
-2001-02-03 10:11:12
+0001-02-03 10:11:12
 select cast(cast(20010203101112.121314 as decimal(32,6)) as datetime);
 cast(cast(20010203101112.121314 as decimal(32,6)) as datetime)
 2001-02-03 10:11:12
@@ -86,10 +86,10 @@ cast(20010203101112.121314 as datetime)
 2001-02-03 10:11:12
 select cast(110203101112.121314 as datetime);
 cast(110203101112.121314 as datetime)
-2011-02-03 10:11:12
+0011-02-03 10:11:12
 select cast(cast(010203101112.12 as double) as datetime);
 cast(cast(010203101112.12 as double) as datetime)
-2001-02-03 10:11:12
+0001-02-03 10:11:12
 select cast("2011-02-03 10:11:12.123456" as datetime);
 cast("2011-02-03 10:11:12.123456" as datetime)
 2011-02-03 10:11:12
@@ -110,7 +110,7 @@ cast(cast(20010203101112.1 as double) as datetime(1))
 2001-02-03 10:11:12.1
 select cast(cast(010203101112.12 as double) as datetime(2));
 cast(cast(010203101112.12 as double) as datetime(2))
-2001-02-03 10:11:12.12
+0001-02-03 10:11:12.12
 select cast(cast(20010203101112.121314 as decimal(32,6)) as datetime(6));
 cast(cast(20010203101112.121314 as decimal(32,6)) as datetime(6))
 2001-02-03 10:11:12.121314
@@ -119,10 +119,10 @@ cast(20010203101112.121314 as datetime(6))
 2001-02-03 10:11:12.121314
 select cast(110203101112.121314 as datetime(6));
 cast(110203101112.121314 as datetime(6))
-2011-02-03 10:11:12.121314
+0011-02-03 10:11:12.121314
 select cast(cast(010203101112.12 as double) as datetime(6));
 cast(cast(010203101112.12 as double) as datetime(6))
-2001-02-03 10:11:12.120000
+0001-02-03 10:11:12.120000
 select cast("2011-02-03 10:11:12.123456" as time);
 cast("2011-02-03 10:11:12.123456" as time)
 10:11:12
@@ -149,7 +149,7 @@ cast(cast("2011-04-05 8:46:06.123456" AS datetime) as time)
 08:46:06
 select cast(cast("2011-04-05 8:46:06.123456" AS datetime) as time(6));
 cast(cast("2011-04-05 8:46:06.123456" AS datetime) as time(6))
-08:46:06.123456
+08:46:06.000000
 select cast(cast("2011-04-05 8:46:06.123456" AS datetime(6)) as time);
 cast(cast("2011-04-05 8:46:06.123456" AS datetime(6)) as time)
 08:46:06
@@ -265,9 +265,7 @@ Warnings:
 Warning	1264	Out of range value for column 'cast(-1000 as double(5,2))' at row 1
 select cast(010203101112.121314 as datetime);
 cast(010203101112.121314 as datetime)
-NULL
-Warnings:
-Warning	1292	Incorrect datetime value: '10203101112.121314'
+0001-02-03 10:11:12
 select cast(120010203101112.121314 as datetime);
 cast(120010203101112.121314 as datetime)
 NULL
@@ -328,10 +326,10 @@ cast(cast(120010203101112.121314 as double) as datetime)
 NULL
 select cast(cast(1.1 as double) as datetime);
 cast(cast(1.1 as double) as datetime)
-NULL
+0000-00-00 00:00:01
 select cast(cast(-1.1 as double) as datetime);
 cast(cast(-1.1 as double) as datetime)
-NULL
+0000-00-00 00:00:01
 explain extended select cast(10 as double(5,2));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used

mysql-test/r/distinct.result

@@ -804,6 +804,32 @@ select distinct a from t1 where a = DATE('2010-10-10');
 a
 2010-10-10
 20101010
+explain select distinct a from t1 where a = DATE('2010-10-10');
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where; Using temporary
+drop table t1;
+# date = string
+create table t1 (a date);
+insert t1 values ('2010-10-10'), ('20101010');
+explain select distinct a from t1 where a = '2010-10-10';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+drop table t1;
+# double = string
+create table t1 (a double);
+insert t1 values (2), (2);
+explain select distinct a from t1 where a = '2';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+# double = int
+explain select distinct a from t1 where a = 2;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+# string = double
+alter table t1 modify a varchar(100);
+explain select distinct a from t1 where a = 2e0;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where; Using temporary
 drop table t1;
 create table t1 (f1 varchar(40));
 insert into t1 values ('2010-10-10 00:00:00.0001'),('2010-10-10 00:00:00.0002'),('2010-10-10 00:00:00.0003');

mysql-test/r/dyncol.result

@@ -295,6 +295,9 @@ column_get(column_create(1, "8:46:06.23434" AS time), 1 as int)
 select column_get(column_create(1, "8:46:06.23434" AS time(6)), 1 as int);
 column_get(column_create(1, "8:46:06.23434" AS time(6)), 1 as int)
 84606
+select column_get(column_create(1, "-808:46:06.23434" AS time(6)), 1 as int);
+column_get(column_create(1, "-808:46:06.23434" AS time(6)), 1 as int)
+-8084606
 select column_get(column_create(1, "2011-04-05 8:46:06.23434" AS datetime(6)), 1 as int);
 column_get(column_create(1, "2011-04-05 8:46:06.23434" AS datetime(6)), 1 as int)
 20110405084606
@@ -402,6 +405,9 @@ column_get(column_create(1, "8:46:06.23434" AS time(0)), 1 as char charset utf8)
 select column_get(column_create(1, "8:46:06.23434" AS time(6)), 1 as char charset utf8);
 column_get(column_create(1, "8:46:06.23434" AS time(6)), 1 as char charset utf8)
 08:46:06.234340
+select column_get(column_create(1, "-808:46:06.23434" AS time(6)), 1 as char charset utf8);
+column_get(column_create(1, "-808:46:06.23434" AS time(6)), 1 as char charset utf8)
+-808:46:06.234340
 select column_get(column_create(1, "2011-04-05 8:46:06.23434" AS datetime), 1 as char charset utf8);
 column_get(column_create(1, "2011-04-05 8:46:06.23434" AS datetime), 1 as char charset utf8)
 2011-04-05 08:46:06.234340
@@ -465,6 +471,9 @@ column_get(column_create(1, "8:46:06.23434" AS time), 1 as double)
 select column_get(column_create(1, "8:46:06.23434" AS time(6)), 1 as double);
 column_get(column_create(1, "8:46:06.23434" AS time(6)), 1 as double)
 84606.23434
+select column_get(column_create(1, "-808:46:06.23434" AS time(6)), 1 as double);
+column_get(column_create(1, "-808:46:06.23434" AS time(6)), 1 as double)
+-8084606.23434
 select column_get(column_create(1, "2011-04-05 8:46:06.23434" AS datetime), 1 as double);
 column_get(column_create(1, "2011-04-05 8:46:06.23434" AS datetime), 1 as double)
 20110405084606.2
@@ -540,6 +549,9 @@ column_get(column_create(1, "8:46:06.23434" AS time), 1 as decimal(32,6))
 select column_get(column_create(1, "8:46:06.23434" AS time(6)), 1 as decimal(32,6));
 column_get(column_create(1, "8:46:06.23434" AS time(6)), 1 as decimal(32,6))
 84606.234340
+select column_get(column_create(1, "-808:46:06.23434" AS time(6)), 1 as decimal(32,6));
+column_get(column_create(1, "-808:46:06.23434" AS time(6)), 1 as decimal(32,6))
+-8084606.234340
 select column_get(column_create(1, "2011-04-05 8:46:06.123456" AS datetime), 1 as decimal(32,6));
 column_get(column_create(1, "2011-04-05 8:46:06.123456" AS datetime), 1 as decimal(32,6))
 20110405084606.123456
@@ -688,6 +700,11 @@ column_get(column_create(1, "2001021"), 1 as datetime)
 select column_get(column_create(1, "8:46:06.23434" AS time), 1 as datetime);
 column_get(column_create(1, "8:46:06.23434" AS time), 1 as datetime)
 0000-00-00 08:46:06
+select column_get(column_create(1, "-808:46:06.23434" AS time), 1 as datetime);
+column_get(column_create(1, "-808:46:06.23434" AS time), 1 as datetime)
+NULL
+Warnings:
+Warning	1292	Truncated incorrect datetime value: '-808:46:06'
 set @@sql_mode="allow_invalid_dates";
 select column_get(column_create(1, "2011-02-30 18:46:06.23434" AS CHAR), 1 as datetime);
 column_get(column_create(1, "2011-02-30 18:46:06.23434" AS CHAR), 1 as datetime)
@@ -709,17 +726,17 @@ select column_get(column_create(1, 18446744073709551615 AS unsigned int), 1 as d
 column_get(column_create(1, 18446744073709551615 AS unsigned int), 1 as datetime)
 NULL
 Warnings:
-Warning	1918	Encountered illegal value '18446744073709551615' when converting to DATE or DATETIME
+Warning	1292	Incorrect datetime value: '1.84467440737096e+19'
 select column_get(column_create(1, 9223372036854775807 AS int), 1 as datetime);
 column_get(column_create(1, 9223372036854775807 AS int), 1 as datetime)
 NULL
 Warnings:
-Warning	1918	Encountered illegal value '9223372036854775807' when converting to DATE or DATETIME
+Warning	1292	Incorrect datetime value: '9223372036854775807'
 select column_get(column_create(1, -9223372036854775808 AS int), 1 as datetime);
 column_get(column_create(1, -9223372036854775808 AS int), 1 as datetime)
 NULL
 Warnings:
-Warning	1918	Encountered illegal value '-9223372036854775808' when converting to DATE or DATETIME
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
 select column_get(column_create(1, 99999999999999999999999999999 AS decimal(32,10)), 1 as datetime);
 column_get(column_create(1, 99999999999999999999999999999 AS decimal(32,10)), 1 as datetime)
 NULL
@@ -729,7 +746,7 @@ select column_get(column_create(1, 99999999999999999999999999999 AS double), 1 a
 column_get(column_create(1, 99999999999999999999999999999 AS double), 1 as datetime)
 NULL
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '9.99999999999999914332e+28    '
+Warning	1292	Incorrect datetime value: '1e+29'
 select column_get(column_create(1, "2011-02-32 8:46:06.23434" AS CHAR), 1 as datetime);
 column_get(column_create(1, "2011-02-32 8:46:06.23434" AS CHAR), 1 as datetime)
 NULL
@@ -839,17 +856,17 @@ select column_get(column_create(1, 18446744073709551615 AS unsigned int), 1 as d
 column_get(column_create(1, 18446744073709551615 AS unsigned int), 1 as date)
 NULL
 Warnings:
-Warning	1918	Encountered illegal value '18446744073709551615' when converting to DATE or DATETIME
+Warning	1292	Incorrect datetime value: '1.84467440737096e+19'
 select column_get(column_create(1, 9223372036854775807 AS int), 1 as date);
 column_get(column_create(1, 9223372036854775807 AS int), 1 as date)
 NULL
 Warnings:
-Warning	1918	Encountered illegal value '9223372036854775807' when converting to DATE or DATETIME
+Warning	1292	Incorrect datetime value: '9223372036854775807'
 select column_get(column_create(1, -9223372036854775808 AS int), 1 as date);
 column_get(column_create(1, -9223372036854775808 AS int), 1 as date)
 NULL
 Warnings:
-Warning	1918	Encountered illegal value '-9223372036854775808' when converting to DATE or DATETIME
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
 select column_get(column_create(1, 99999999999999999999999999999 AS decimal(32,10)), 1 as date);
 column_get(column_create(1, 99999999999999999999999999999 AS decimal(32,10)), 1 as date)
 NULL
@@ -859,7 +876,7 @@ select column_get(column_create(1, 99999999999999999999999999999 AS double), 1 a
 column_get(column_create(1, 99999999999999999999999999999 AS double), 1 as date)
 NULL
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '9.99999999999999914332e+28    '
+Warning	1292	Incorrect datetime value: '1e+29'
 select column_get(column_create(1, "2011-02-32 8:46:06.23434" AS CHAR), 1 as date);
 column_get(column_create(1, "2011-02-32 8:46:06.23434" AS CHAR), 1 as date)
 NULL
@@ -897,9 +914,15 @@ column_get(column_create(1, 20010203101112.121314 as decimal), 1 as time)
 select column_get(column_create(1, 20010203101112 as unsigned int), 1 as time);
 column_get(column_create(1, 20010203101112 as unsigned int), 1 as time)
 10:11:12
+select column_get(column_create(1, 8080102 as unsigned int), 1 as time);
+column_get(column_create(1, 8080102 as unsigned int), 1 as time)
+808:01:02
 select column_get(column_create(1, 20010203101112 as int), 1 as time);
 column_get(column_create(1, 20010203101112 as int), 1 as time)
 10:11:12
+select column_get(column_create(1, -8080102 as int), 1 as time);
+column_get(column_create(1, -8080102 as int), 1 as time)
+-808:01:02
 select column_get(column_create(1, "20010203101112" as char), 1 as time);
 column_get(column_create(1, "20010203101112" as char), 1 as time)
 10:11:12
@@ -980,27 +1003,27 @@ select column_get(column_create(1, 18446744073709551615 AS unsigned int), 1 as t
 column_get(column_create(1, 18446744073709551615 AS unsigned int), 1 as time)
 NULL
 Warnings:
-Warning	1292	Truncated incorrect time value: '18446744073709551615'
+Warning	1292	Incorrect datetime value: '1.84467440737096e+19'
 select column_get(column_create(1, 9223372036854775807 AS int), 1 as time);
 column_get(column_create(1, 9223372036854775807 AS int), 1 as time)
 NULL
 Warnings:
-Warning	1292	Truncated incorrect time value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
 select column_get(column_create(1, -9223372036854775808 AS int), 1 as time);
 column_get(column_create(1, -9223372036854775808 AS int), 1 as time)
 NULL
 Warnings:
-Warning	1292	Truncated incorrect time value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
 select column_get(column_create(1, 99999999999999999999999999999 AS decimal(32,10)), 1 as time);
 column_get(column_create(1, 99999999999999999999999999999 AS decimal(32,10)), 1 as time)
 NULL
 Warnings:
-Warning	1292	Truncated incorrect time value: '99999999999999999999999999999'
+Warning	1292	Incorrect datetime value: '99999999999999999999999999999'
 select column_get(column_create(1, 99999999999999999999999999999 AS double), 1 as time);
 column_get(column_create(1, 99999999999999999999999999999 AS double), 1 as time)
 NULL
 Warnings:
-Warning	1292	Truncated incorrect time value: '1e+29'
+Warning	1292	Incorrect datetime value: '1e+29'
 select column_get(column_create(1, "2011-02-32 8:46:06.23434" AS CHAR), 1 as time);
 column_get(column_create(1, "2011-02-32 8:46:06.23434" AS CHAR), 1 as time)
 NULL

mysql-test/r/func_group.result

@@ -1530,7 +1530,8 @@ insert into t1 values
 (02,2002,20020101,"2002-01-01 23:59:59"),
 (60,2060,20600101,"2060-01-01 11:11:11"),
 (70,1970,19700101,"1970-11-11 22:22:22"),
-(NULL,NULL,NULL,NULL);
+(NULL,NULL,NULL,NULL),
+(71,1971,19710101,"1971-11-11 22:22:22");
 select min(f1),max(f1) from t1;
 min(f1)	max(f1)
 70	60
@@ -1553,36 +1554,49 @@ a	b	gt	lt	eq
 60	98	1	0	0
 70	98	0	1	0
 NULL	98	NULL	NULL	0
+71	98	0	1	0
 98	00	0	1	0
 00	00	0	0	1
 02	00	1	0	0
 60	00	1	0	0
 70	00	0	1	0
 NULL	00	NULL	NULL	0
+71	00	0	1	0
 98	02	0	1	0
 00	02	0	1	0
 02	02	0	0	1
 60	02	1	0	0
 70	02	0	1	0
 NULL	02	NULL	NULL	0
+71	02	0	1	0
 98	60	0	1	0
 00	60	0	1	0
 02	60	0	1	0
 60	60	0	0	1
 70	60	0	1	0
 NULL	60	NULL	NULL	0
+71	60	0	1	0
 98	70	1	0	0
 00	70	1	0	0
 02	70	1	0	0
 60	70	1	0	0
 70	70	0	0	1
 NULL	70	NULL	NULL	0
+71	70	1	0	0
 98	NULL	NULL	NULL	0
 00	NULL	NULL	NULL	0
 02	NULL	NULL	NULL	0
 60	NULL	NULL	NULL	0
 70	NULL	NULL	NULL	0
 NULL	NULL	NULL	NULL	1
+71	NULL	NULL	NULL	0
+98	71	1	0	0
+00	71	1	0	0
+02	71	1	0	0
+60	71	1	0	0
+70	71	0	1	0
+NULL	71	NULL	NULL	0
+71	71	0	0	1
 select a.f1 as a, b.f2 as b, a.f1 > b.f2 as gt,
 a.f1 < b.f2 as lt, a.f1<=>b.f2 as eq
 from t1 a, t1 b;
@@ -1593,36 +1607,49 @@ a	b	gt	lt	eq
 60	1998	1	0	0
 70	1998	0	1	0
 NULL	1998	NULL	NULL	0
+71	1998	0	1	0
 98	2000	0	1	0
 00	2000	0	0	1
 02	2000	1	0	0
 60	2000	1	0	0
 70	2000	0	1	0
 NULL	2000	NULL	NULL	0
+71	2000	0	1	0
 98	2002	0	1	0
 00	2002	0	1	0
 02	2002	0	0	1
 60	2002	1	0	0
 70	2002	0	1	0
 NULL	2002	NULL	NULL	0
+71	2002	0	1	0
 98	2060	0	1	0
 00	2060	0	1	0
 02	2060	0	1	0
 60	2060	0	0	1
 70	2060	0	1	0
 NULL	2060	NULL	NULL	0
+71	2060	0	1	0
 98	1970	1	0	0
 00	1970	1	0	0
 02	1970	1	0	0
 60	1970	1	0	0
 70	1970	0	0	1
 NULL	1970	NULL	NULL	0
+71	1970	1	0	0
 98	NULL	NULL	NULL	0
 00	NULL	NULL	NULL	0
 02	NULL	NULL	NULL	0
 60	NULL	NULL	NULL	0
 70	NULL	NULL	NULL	0
 NULL	NULL	NULL	NULL	1
+71	NULL	NULL	NULL	0
+98	1971	1	0	0
+00	1971	1	0	0
+02	1971	1	0	0
+60	1971	1	0	0
+70	1971	0	1	0
+NULL	1971	NULL	NULL	0
+71	1971	0	0	1
 select a.f1 as a, b.f3 as b, a.f1 > b.f3 as gt,
 a.f1 < b.f3 as lt, a.f1<=>b.f3 as eq
 from t1 a, t1 b;
@@ -1633,36 +1660,49 @@ a	b	gt	lt	eq
 60	1998-01-01	1	0	0
 70	1998-01-01	0	1	0
 NULL	1998-01-01	NULL	NULL	0
+71	1998-01-01	0	1	0
 98	2000-01-01	0	1	0
 00	2000-01-01	0	1	0
 02	2000-01-01	1	0	0
 60	2000-01-01	1	0	0
 70	2000-01-01	0	1	0
 NULL	2000-01-01	NULL	NULL	0
+71	2000-01-01	0	1	0
 98	2002-01-01	0	1	0
 00	2002-01-01	0	1	0
 02	2002-01-01	0	1	0
 60	2002-01-01	1	0	0
 70	2002-01-01	0	1	0
 NULL	2002-01-01	NULL	NULL	0
+71	2002-01-01	0	1	0
 98	2060-01-01	0	1	0
 00	2060-01-01	0	1	0
 02	2060-01-01	0	1	0
 60	2060-01-01	0	1	0
 70	2060-01-01	0	1	0
 NULL	2060-01-01	NULL	NULL	0
+71	2060-01-01	0	1	0
 98	1970-01-01	1	0	0
 00	1970-01-01	1	0	0
 02	1970-01-01	1	0	0
 60	1970-01-01	1	0	0
 70	1970-01-01	0	1	0
 NULL	1970-01-01	NULL	NULL	0
+71	1970-01-01	1	0	0
 98	NULL	NULL	NULL	0
 00	NULL	NULL	NULL	0
 02	NULL	NULL	NULL	0
 60	NULL	NULL	NULL	0
 70	NULL	NULL	NULL	0
 NULL	NULL	NULL	NULL	1
+71	NULL	NULL	NULL	0
+98	1971-01-01	1	0	0
+00	1971-01-01	1	0	0
+02	1971-01-01	1	0	0
+60	1971-01-01	1	0	0
+70	1971-01-01	0	1	0
+NULL	1971-01-01	NULL	NULL	0
+71	1971-01-01	0	1	0
 select a.f1 as a, b.f4 as b, a.f1 > b.f4 as gt,
 a.f1 < b.f4 as lt, a.f1<=>b.f4 as eq
 from t1 a, t1 b;
@@ -1673,36 +1713,49 @@ a	b	gt	lt	eq
 60	1998-01-01 00:00:00	1	0	0
 70	1998-01-01 00:00:00	0	1	0
 NULL	1998-01-01 00:00:00	NULL	NULL	0
+71	1998-01-01 00:00:00	0	1	0
 98	2000-01-01 00:00:01	0	1	0
 00	2000-01-01 00:00:01	0	1	0
 02	2000-01-01 00:00:01	1	0	0
 60	2000-01-01 00:00:01	1	0	0
 70	2000-01-01 00:00:01	0	1	0
 NULL	2000-01-01 00:00:01	NULL	NULL	0
+71	2000-01-01 00:00:01	0	1	0
 98	2002-01-01 23:59:59	0	1	0
 00	2002-01-01 23:59:59	0	1	0
 02	2002-01-01 23:59:59	0	1	0
 60	2002-01-01 23:59:59	1	0	0
 70	2002-01-01 23:59:59	0	1	0
 NULL	2002-01-01 23:59:59	NULL	NULL	0
+71	2002-01-01 23:59:59	0	1	0
 98	2060-01-01 11:11:11	0	1	0
 00	2060-01-01 11:11:11	0	1	0
 02	2060-01-01 11:11:11	0	1	0
 60	2060-01-01 11:11:11	0	1	0
 70	2060-01-01 11:11:11	0	1	0
 NULL	2060-01-01 11:11:11	NULL	NULL	0
+71	2060-01-01 11:11:11	0	1	0
 98	1970-11-11 22:22:22	1	0	0
 00	1970-11-11 22:22:22	1	0	0
 02	1970-11-11 22:22:22	1	0	0
 60	1970-11-11 22:22:22	1	0	0
 70	1970-11-11 22:22:22	0	1	0
 NULL	1970-11-11 22:22:22	NULL	NULL	0
+71	1970-11-11 22:22:22	1	0	0
 98	NULL	NULL	NULL	0
 00	NULL	NULL	NULL	0
 02	NULL	NULL	NULL	0
 60	NULL	NULL	NULL	0
 70	NULL	NULL	NULL	0
 NULL	NULL	NULL	NULL	1
+71	NULL	NULL	NULL	0
+98	1971-11-11 22:22:22	1	0	0
+00	1971-11-11 22:22:22	1	0	0
+02	1971-11-11 22:22:22	1	0	0
+60	1971-11-11 22:22:22	1	0	0
+70	1971-11-11 22:22:22	0	1	0
+NULL	1971-11-11 22:22:22	NULL	NULL	0
+71	1971-11-11 22:22:22	0	1	0
 select *, f1 = f2 from t1;
 f1	f2	f3	f4	f1 = f2
 98	1998	1998-01-01	1998-01-01 00:00:00	1
@@ -1711,6 +1764,7 @@ f1	f2	f3	f4	f1 = f2
 60	2060	2060-01-01	2060-01-01 11:11:11	1
 70	1970	1970-01-01	1970-11-11 22:22:22	1
 NULL	NULL	NULL	NULL	NULL
+71	1971	1971-01-01	1971-11-11 22:22:22	1
 drop table t1;
 #
 # Bug #54465: assert: field_types == 0 || field_types[field_pos] ==

mysql-test/r/func_if.result

@@ -177,12 +177,19 @@ IF((ROUND(t1.a,2)=1), 2,
 IF((R
 DROP TABLE t1;
 CREATE TABLE t1 (c LONGTEXT);
-INSERT INTO t1 VALUES(1), (2), (3), (4), ('12345678901234567890');
+INSERT INTO t1 VALUES(1), (2), (3), (4), ('1234567890123456789');
+SELECT IF(1, CAST(c AS UNSIGNED), 0) FROM t1;
+IF(1, CAST(c AS UNSIGNED), 0)
+1
+2
+3
+4
+1234567890123456789
 SELECT * FROM (SELECT MAX(IF(1, CAST(c AS UNSIGNED), 0)) FROM t1) AS te;
 MAX(IF(1, CAST(c AS UNSIGNED), 0))
-12345678901234567890
+1234567890123456789
 SELECT * FROM (SELECT MAX(IFNULL(CAST(c AS UNSIGNED), 0)) FROM t1) AS te;
 MAX(IFNULL(CAST(c AS UNSIGNED), 0))
-12345678901234567890
+1234567890123456789
 DROP TABLE t1;
 End of 5.0 tests

mysql-test/r/func_in.result

@@ -479,7 +479,7 @@ SELECT * FROM t4 WHERE a IN ('1972-02-06','19772-07-29');
 a
 1972-02-06
 Warnings:
-Warning	1292	Incorrect date value: '19772-07-29' for column 'a' at row 1
+Warning	1292	Incorrect datetime value: '19772-07-29'
 DROP TABLE t1,t2,t3,t4;
 CREATE TABLE t1 (id int not null);
 INSERT INTO t1 VALUES (1),(2);

mysql-test/r/func_sapdb.result

@@ -184,8 +184,8 @@ microsecond("1997-12-31 23:59:59.000001")
 1
 create table t1 
 select makedate(1997,1) as f1,
-addtime(cast("1997-12-31 23:59:59.000001" as datetime), "1 1:1:1.000002") as f2,
-addtime(cast("23:59:59.999999" as time) , "1 1:1:1.000002") as f3,
+addtime(cast("1997-12-31 23:59:59.000001" as datetime(6)), "1 1:1:1.000002") as f2,
+addtime(cast("23:59:59.999999" as time(6)) , "1 1:1:1.000002") as f3,
 timediff("1997-12-31 23:59:59.000001","1997-12-30 01:01:01.000002") as f4,
 timediff("1997-12-30 23:59:59.000001","1997-12-31 23:59:59.000002") as f5,
 maketime(10,11,12) as f6,
@@ -250,6 +250,8 @@ a
 select microsecond(19971231235959.01) as a;
 a
 10000
+Warnings:
+Warning	1292	Truncated incorrect time value: '19971231235959.01'
 select date_add("1997-12-31",INTERVAL "10.09" SECOND_MICROSECOND) as a;
 a
 1997-12-31 00:00:10.090000

mysql-test/r/func_time.result

@@ -11,19 +11,33 @@ now()-now()	weekday(curdate())-weekday(now())	unix_timestamp()-unix_timestamp(no
 0	0	0
 select from_unixtime(unix_timestamp("1994-03-02 10:11:12")),from_unixtime(unix_timestamp("1994-03-02 10:11:12"),"%Y-%m-%d %h:%i:%s"),from_unixtime(unix_timestamp("1994-03-02 10:11:12"))+0;
 from_unixtime(unix_timestamp("1994-03-02 10:11:12"))	from_unixtime(unix_timestamp("1994-03-02 10:11:12"),"%Y-%m-%d %h:%i:%s")	from_unixtime(unix_timestamp("1994-03-02 10:11:12"))+0
-1994-03-02 10:11:12	1994-03-02 10:11:12	19940302101112
+1994-03-02 10:11:12.000000	1994-03-02 10:11:12	19940302101112.000000
 select sec_to_time(9001),sec_to_time(9001)+0,time_to_sec("15:12:22"),
 sec_to_time(time_to_sec("0:30:47")/6.21);
 sec_to_time(9001)	sec_to_time(9001)+0	time_to_sec("15:12:22")	sec_to_time(time_to_sec("0:30:47")/6.21)
-02:30:01	23001	54742	00:04:57.423510
+02:30:01	23001	54742.000000	00:04:57.423510
 select sec_to_time(9001.1), time_to_sec('15:12:22.123456'), time_to_sec(15.5566778899);
 sec_to_time(9001.1)	time_to_sec('15:12:22.123456')	time_to_sec(15.5566778899)
 02:30:01.1	54742.123456	15.556677
-Warnings:
-Warning	1292	Truncated incorrect time value: '15.5566778899'
 select sec_to_time(time_to_sec('-838:59:59'));
 sec_to_time(time_to_sec('-838:59:59'))
--838:59:59
+-838:59:59.000000
+select sec_to_time('9001.1'), sec_to_time('1234567890123.123');
+sec_to_time('9001.1')	sec_to_time('1234567890123.123')
+02:30:01.100000	838:59:59.999999
+Warnings:
+Warning	1292	Truncated incorrect time value: '1234567890123.123'
+select sec_to_time(90011e-1), sec_to_time(1234567890123e30);
+sec_to_time(90011e-1)	sec_to_time(1234567890123e30)
+02:30:01.100000	838:59:59.999999
+Warnings:
+Warning	1292	Truncated incorrect time value: '1.234567890123e+42'
+select sec_to_time(1234567890123), sec_to_time('99999999999999999999999999999');
+sec_to_time(1234567890123)	sec_to_time('99999999999999999999999999999')
+838:59:59	838:59:59.999999
+Warnings:
+Warning	1292	Truncated incorrect time value: '1234567890123'
+Warning	1292	Truncated incorrect time value: '99999999999999999999999999999'
 select now()-curdate()*1000000-curtime();
 now()-curdate()*1000000-curtime()
 0
@@ -145,18 +159,18 @@ Saturday	5
 select monthname("1972-03-04"),monthname("1972-03-04")+0;
 monthname("1972-03-04")	monthname("1972-03-04")+0
 March	3
-select time_format(19980131000000,'%H|%I|%k|%l|%i|%p|%r|%S|%T');
-time_format(19980131000000,'%H|%I|%k|%l|%i|%p|%r|%S|%T')
-00|12|0|12|00|AM|12:00:00 AM|00|00:00:00
-select time_format(19980131010203,'%H|%I|%k|%l|%i|%p|%r|%S|%T');
-time_format(19980131010203,'%H|%I|%k|%l|%i|%p|%r|%S|%T')
-01|01|1|1|02|AM|01:02:03 AM|03|01:02:03
-select time_format(19980131131415,'%H|%I|%k|%l|%i|%p|%r|%S|%T');
-time_format(19980131131415,'%H|%I|%k|%l|%i|%p|%r|%S|%T')
-13|01|13|1|14|PM|01:14:15 PM|15|13:14:15
-select time_format(19980131010015,'%H|%I|%k|%l|%i|%p|%r|%S|%T');
-time_format(19980131010015,'%H|%I|%k|%l|%i|%p|%r|%S|%T')
-01|01|1|1|00|AM|01:00:15 AM|15|01:00:15
+select time_format(000000,'%H|%I|%k|%l|%i|%p|%r|%S|%T'),date_format(19980131000000,'%H|%I|%k|%l|%i|%p|%r|%S|%T');
+time_format(000000,'%H|%I|%k|%l|%i|%p|%r|%S|%T')	date_format(19980131000000,'%H|%I|%k|%l|%i|%p|%r|%S|%T')
+00|12|0|12|00|AM|12:00:00 AM|00|00:00:00	00|12|0|12|00|AM|12:00:00 AM|00|00:00:00
+select time_format(010203,'%H|%I|%k|%l|%i|%p|%r|%S|%T'),date_format(19980131010203,'%H|%I|%k|%l|%i|%p|%r|%S|%T');
+time_format(010203,'%H|%I|%k|%l|%i|%p|%r|%S|%T')	date_format(19980131010203,'%H|%I|%k|%l|%i|%p|%r|%S|%T')
+01|01|1|1|02|AM|01:02:03 AM|03|01:02:03	01|01|1|1|02|AM|01:02:03 AM|03|01:02:03
+select time_format(131415,'%H|%I|%k|%l|%i|%p|%r|%S|%T'),date_format(19980131131415,'%H|%I|%k|%l|%i|%p|%r|%S|%T');
+time_format(131415,'%H|%I|%k|%l|%i|%p|%r|%S|%T')	date_format(19980131131415,'%H|%I|%k|%l|%i|%p|%r|%S|%T')
+13|01|13|1|14|PM|01:14:15 PM|15|13:14:15	13|01|13|1|14|PM|01:14:15 PM|15|13:14:15
+select time_format(010015,'%H|%I|%k|%l|%i|%p|%r|%S|%T'),date_format(19980131010015,'%H|%I|%k|%l|%i|%p|%r|%S|%T');
+time_format(010015,'%H|%I|%k|%l|%i|%p|%r|%S|%T')	date_format(19980131010015,'%H|%I|%k|%l|%i|%p|%r|%S|%T')
+01|01|1|1|00|AM|01:00:15 AM|15|01:00:15	01|01|1|1|00|AM|01:00:15 AM|15|01:00:15
 select date_format(concat('19980131',131415),'%H|%I|%k|%l|%i|%p|%r|%S|%T| %M|%W|%D|%Y|%y|%a|%b|%j|%m|%d|%h|%s|%w');
 date_format(concat('19980131',131415),'%H|%I|%k|%l|%i|%p|%r|%S|%T| %M|%W|%D|%Y|%y|%a|%b|%j|%m|%d|%h|%s|%w')
 13|01|13|1|14|PM|01:14:15 PM|15|13:14:15| January|Saturday|31st|1998|98|Sat|Jan|031|01|31|01|15|6
@@ -551,7 +565,7 @@ select @a:=FROM_UNIXTIME(1);
 1970-01-01 03:00:01
 select unix_timestamp(@a);
 unix_timestamp(@a)
-1
+1.000000
 select unix_timestamp('1969-12-01 19:00:01');
 unix_timestamp('1969-12-01 19:00:01')
 NULL
@@ -593,10 +607,10 @@ unix_timestamp('1969-12-30 01:00:00')
 NULL
 select unix_timestamp('2038-01-17 12:00:00');
 unix_timestamp('2038-01-17 12:00:00')
-2147331600
+2147331600.000000
 select unix_timestamp('1970-01-01 03:00:01');
 unix_timestamp('1970-01-01 03:00:01')
-1
+1.000000
 select unix_timestamp('2038-01-19 07:14:07');
 unix_timestamp('2038-01-19 07:14:07')
 NULL
@@ -947,10 +961,10 @@ sec_to_time(1) + 0, from_unixtime(1) + 0;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `now() - now()` double(17,0) NOT NULL DEFAULT '0',
-  `curtime() - curtime()` double(17,0) NOT NULL DEFAULT '0',
-  `sec_to_time(1) + 0` double(17,0) DEFAULT NULL,
-  `from_unixtime(1) + 0` double(17,0) DEFAULT NULL
+  `now() - now()` decimal(20,0) NOT NULL DEFAULT '0',
+  `curtime() - curtime()` decimal(11,0) NOT NULL DEFAULT '0',
+  `sec_to_time(1) + 0` decimal(11,0) DEFAULT NULL,
+  `from_unixtime(1) + 0` decimal(20,0) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 SELECT SEC_TO_TIME(3300000);
@@ -1041,6 +1055,7 @@ SEC_TO_TIME(CAST(-1 AS UNSIGNED))
 838:59:59
 Warnings:
 Warning	1105	Cast to unsigned converted negative integer to it's positive complement
+Warning	1105	Cast to unsigned converted negative integer to it's positive complement
 Warning	1292	Truncated incorrect time value: '18446744073709551615'
 SET NAMES latin1;
 SET character_set_results = NULL;
@@ -1089,7 +1104,9 @@ NULL
 select isnull(week(now() + 0)), isnull(week(now() + 0.2)),
 week(20061108), week(20061108.01), week(20061108085411.000002);
 isnull(week(now() + 0))	isnull(week(now() + 0.2))	week(20061108)	week(20061108.01)	week(20061108085411.000002)
-0	0	45	45	45
+0	0	45	NULL	45
+Warnings:
+Warning	1292	Incorrect datetime value: '20061108.01'
 End of 4.1 tests
 explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1,
 timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a2;
@@ -1482,6 +1499,16 @@ time('-1 02:03:04') + interval 2 day
 select time('-1 02:03:04') - interval 2 day;
 time('-1 02:03:04') - interval 2 day
 -74:03:04
+select time('10 02:03:04') + interval 30 day;
+time('10 02:03:04') + interval 30 day
+NULL
+Warnings:
+Warning	1441	Datetime function: time field overflow
+select time('10 02:03:04') + interval 1 year;
+time('10 02:03:04') + interval 1 year
+NULL
+Warnings:
+Warning	1441	Datetime function: time field overflow
 select cast('131415.123e0' as time);
 cast('131415.123e0' as time)
 NULL
@@ -1524,8 +1551,6 @@ select * from t1 where f1 > time('-23:00:06');
 f1
 2000-09-12 00:00:00
 2007-04-25 05:08:49
-Warnings:
-Warning	1292	Incorrect datetime value: '-23:00:06' for column 'f1' at row 1
 drop table t1;
 select maketime(20,61,10)+0;
 maketime(20,61,10)+0
@@ -1575,7 +1600,7 @@ select least(1, f1) from t1;
 least(1, f1)
 0000-00-00 00:00:00
 Warnings:
-Warning	1292	Incorrect datetime value: '1' for column 'f1' at row 1
+Warning	1292	Incorrect datetime value: '1'
 drop table t1;
 select now() > coalesce(time('21:43:24'), date('2010-05-03'));
 now() > coalesce(time('21:43:24'), date('2010-05-03'))
@@ -1600,6 +1625,8 @@ insert ignore t1 values ('04:38:11','0000-00-00 00:00:00',0,'0000-00-00 00:00:00
 select least(greatest(f3, f2, f4), f5) from t1;
 least(greatest(f3, f2, f4), f5)
 0000-00-00 00:00:00
+Warnings:
+Warning	1292	Incorrect datetime value: '0'
 drop table t1;
 select day(coalesce(null));
 day(coalesce(null))
@@ -1622,3 +1649,6 @@ greatest(cast("0-0-0" as date), cast("10:20:05" as time)) = '0000-00-00'
 select cast(greatest(cast("0-0-0" as date), cast("10:20:05" as time)) as datetime(6));
 cast(greatest(cast("0-0-0" as date), cast("10:20:05" as time)) as datetime(6))
 0000-00-00 00:00:00.000000
+select microsecond('12:00:00.123456'), microsecond('2009-12-31 23:59:59.000010');
+microsecond('12:00:00.123456')	microsecond('2009-12-31 23:59:59.000010')
+123456	10

mysql-test/r/func_time_hires.result

@@ -15,10 +15,10 @@ current_time(3)	01:01:01.123
 current_timestamp(4)	2011-01-01 01:01:01.1234
 localtime(5)	2011-01-01 01:01:01.12345
 localtimestamp(6)	2011-01-01 01:01:01.123456
-time_to_sec('12:34:56')	45296
-time_to_sec('12:34:56.789')	45296.789
+time_to_sec('12:34:56')	45296.000000
+time_to_sec('12:34:56.789')	45296.789000
 select sec_to_time(time_to_sec('1:2:3')), sec_to_time(time_to_sec('2:3:4.567890'));
-sec_to_time(time_to_sec('1:2:3'))	01:02:03
+sec_to_time(time_to_sec('1:2:3'))	01:02:03.000000
 sec_to_time(time_to_sec('2:3:4.567890'))	02:03:04.567890
 select time_to_sec(sec_to_time(11111)), time_to_sec(sec_to_time(11111.22222));
 time_to_sec(sec_to_time(11111))	11111
@@ -48,7 +48,7 @@ t1	CREATE TABLE `t1` (
   `localtime(5)` datetime(5) NOT NULL DEFAULT '0000-00-00 00:00:00.00000',
   `localtimestamp(6)` datetime(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000',
   `time_to_sec(123456)` bigint(17) DEFAULT NULL,
-  `time_to_sec('12:34:56.789')` double DEFAULT NULL
+  `time_to_sec('12:34:56.789')` decimal(22,6) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t1;
 sec_to_time(12345)	03:25:45
@@ -63,36 +63,30 @@ current_timestamp(4)	2011-01-01 01:01:01.1234
 localtime(5)	2011-01-01 01:01:01.12345
 localtimestamp(6)	2011-01-01 01:01:01.123456
 time_to_sec(123456)	45296
-time_to_sec('12:34:56.789')	45296.789
+time_to_sec('12:34:56.789')	45296.789000
 drop table t1;
 select unix_timestamp('2011-01-01 01:01:01'), unix_timestamp('2011-01-01 01:01:01.123456'), unix_timestamp(cast('2011-01-01 01:01:01.123456' as datetime(0))), unix_timestamp(cast('2011-01-01 01:01:01.123456' as datetime(4)));;
-unix_timestamp('2011-01-01 01:01:01')	1293832861
-unix_timestamp('2011-01-01 01:01:01.123456')	1293832861.12346
+unix_timestamp('2011-01-01 01:01:01')	1293832861.000000
+unix_timestamp('2011-01-01 01:01:01.123456')	1293832861.123456
 unix_timestamp(cast('2011-01-01 01:01:01.123456' as datetime(0)))	1293832861
-unix_timestamp(cast('2011-01-01 01:01:01.123456' as datetime(4)))	1293832861.1235
+unix_timestamp(cast('2011-01-01 01:01:01.123456' as datetime(4)))	1293832861.1234
 select from_unixtime(unix_timestamp('2011/1/1 1:1:1')), from_unixtime(unix_timestamp('2011/1/1 1:1:1.123456')), from_unixtime(unix_timestamp(cast('2011/1/1 1:1:1.123456' as datetime(0)))), from_unixtime(unix_timestamp(cast('2011/1/1 1:1:1.123456' as datetime(4))));;
-from_unixtime(unix_timestamp('2011/1/1 1:1:1'))	2011-01-01 01:01:01
+from_unixtime(unix_timestamp('2011/1/1 1:1:1'))	2011-01-01 01:01:01.000000
 from_unixtime(unix_timestamp('2011/1/1 1:1:1.123456'))	2011-01-01 01:01:01.123456
 from_unixtime(unix_timestamp(cast('2011/1/1 1:1:1.123456' as datetime(0))))	2011-01-01 01:01:01
 from_unixtime(unix_timestamp(cast('2011/1/1 1:1:1.123456' as datetime(4))))	2011-01-01 01:01:01.1234
 select sec_to_time(3020399.99999), sec_to_time(3020399.999999), sec_to_time(3020399.9999999);
 sec_to_time(3020399.99999)	sec_to_time(3020399.999999)	sec_to_time(3020399.9999999)
 838:59:59.99999	838:59:59.999999	838:59:59.999999
-Warnings:
-Warning	1292	Truncated incorrect time value: '3020399.9999999'
 select sec_to_time(-3020399.99999), sec_to_time(-3020399.999999), sec_to_time(-3020399.9999999);
 sec_to_time(-3020399.99999)	sec_to_time(-3020399.999999)	sec_to_time(-3020399.9999999)
 -838:59:59.99999	-838:59:59.999999	-838:59:59.999999
-Warnings:
-Warning	1292	Truncated incorrect time value: '-3020399.9999999'
 select 20010101000203.000000004 + interval 1 day;
 20010101000203.000000004 + interval 1 day
 2001-01-02 00:02:03.000000
-Warnings:
-Warning	1292	Truncated incorrect datetime value: '20010101000203.000000004'
-select 20010101000203.00004 + interval 1 day;
-20010101000203.00004 + interval 1 day
-2001-01-02 00:02:03.00004
+select 20010101000203.4 + interval 1 day;
+20010101000203.4 + interval 1 day
+2001-01-02 00:02:03.4
 set @a=cast('2011-01-02 12:13:14' as datetime);
 select @a + interval 1 minute;
 @a + interval 1 minute
@@ -158,6 +152,14 @@ t4	12:13:14.1234
 t5	12:13:14.12345
 t6	12:13:14.123456
 drop table t1;
+explain extended select cast(cast(@a as datetime(4)) as time(0));
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+Warnings:
+Note	1003	select cast(cast((@a) as datetime(4)) as time) AS `cast(cast(@a as datetime(4)) as time(0))`
+select cast(cast(@a as time(2)) as time(6));
+cast(cast(@a as time(2)) as time(6))
+12:13:14.120000
 select CAST(@a AS DATETIME(7));
 ERROR 42000: Too big precision 7 specified for '(@a)'. Maximum is 6.
 SELECT CONVERT_TZ('2011-01-02 12:00:00', '+00:00', '+03:00');

mysql-test/r/func_timestamp.result

@@ -7,7 +7,7 @@ SELECT CONCAT(Jahr,'-',Monat,'-',Tag,' ',Zeit) AS Date,
 UNIX_TIMESTAMP(CONCAT(Jahr,'-',Monat,'-',Tag,' ',Zeit)) AS Unix
 FROM t1;
 Date	Unix
-1998-9-16 09:26:00	905927160
-1998-9-16 09:26:00	905927160
+1998-9-16 09:26:00	905927160.000000
+1998-9-16 09:26:00	905927160.000000
 drop table t1;
 set time_zone= @@global.time_zone;

mysql-test/r/metadata.result

@@ -212,7 +212,7 @@ DROP TABLE t1;
 End of 5.0 tests
 select cast('01:01:01' as time), cast('01:01:01' as time(2));
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def					cast('01:01:01' as time)	11	9	8	Y	128	0	63
-def					cast('01:01:01' as time(2))	11	12	11	Y	128	2	63
+def					cast('01:01:01' as time)	11	10	8	Y	128	0	63
+def					cast('01:01:01' as time(2))	11	13	11	Y	128	2	63
 cast('01:01:01' as time)	cast('01:01:01' as time(2))
 01:01:01	01:01:01.00

mysql-test/r/multi_update.result

@@ -667,7 +667,7 @@ CREATE TABLE t1 (f1 DATE);
 INSERT INTO t1 VALUES('2001-01-01');
 UPDATE (SELECT 1 FROM t1 WHERE f1 = (SELECT f1() FROM t1)) x, t1 SET f1 = 1;
 Warnings:
-Warning	1292	Truncated incorrect date value: '1'
+Warning	1292	Incorrect datetime value: '1'
 DROP FUNCTION f1;
 DROP TABLE t1;
 end of tests

mysql-test/r/parser_precedence.result

 drop table if exists t1_30237_bool;
+set sql_mode=NO_UNSIGNED_SUBTRACTION;
 create table t1_30237_bool(A boolean, B boolean, C boolean);
 insert into t1_30237_bool values
 (FALSE, FALSE, FALSE),

mysql-test/r/ps_2myisam.result

@@ -64,7 +64,7 @@ def	test	t9	t9	c12	c12	246	10	6	Y	0	4	63
 def	test	t9	t9	c13	c13	10	10	10	Y	128	0	63
 def	test	t9	t9	c14	c14	12	19	19	Y	128	0	63
 def	test	t9	t9	c15	c15	7	19	19	N	9377	0	63
-def	test	t9	t9	c16	c16	11	9	8	Y	128	0	63
+def	test	t9	t9	c16	c16	11	10	8	Y	128	0	63
 def	test	t9	t9	c17	c17	13	4	4	Y	32864	0	63
 def	test	t9	t9	c18	c18	1	4	1	Y	32768	0	63
 def	test	t9	t9	c19	c19	1	1	1	Y	32768	0	63
@@ -1793,8 +1793,8 @@ t5	CREATE TABLE `t5` (
   `param08` longtext,
   `const09` datetime DEFAULT NULL,
   `param09` longblob,
-  `const10` double NOT NULL DEFAULT '0',
-  `param10` double DEFAULT NULL,
+  `const10` decimal(22,6) NOT NULL DEFAULT '0.000000',
+  `param10` decimal(65,30) DEFAULT NULL,
   `const11` int(4) DEFAULT NULL,
   `param11` bigint(20) DEFAULT NULL,
   `const12` binary(0) DEFAULT NULL,
@@ -1823,8 +1823,8 @@ def	test	t5	t5	const08	const08	253	19	19	N	1	0	8
 def	test	t5	t5	param08	param08	252	4294967295	19	Y	16	0	8
 def	test	t5	t5	const09	const09	12	19	19	Y	128	0	63
 def	test	t5	t5	param09	param09	252	4294967295	19	Y	144	0	63
-def	test	t5	t5	const10	const10	5	49	9	N	32769	31	63
-def	test	t5	t5	param10	param10	5	23	9	Y	32768	31	63
+def	test	t5	t5	const10	const10	246	24	16	N	1	6	63
+def	test	t5	t5	param10	param10	246	67	40	Y	0	30	63
 def	test	t5	t5	const11	const11	3	4	4	Y	32768	0	63
 def	test	t5	t5	param11	param11	8	20	4	Y	32768	0	63
 def	test	t5	t5	const12	const12	254	0	0	Y	128	0	63
@@ -1850,8 +1850,8 @@ const08	1991-08-05 01:01:01
 param08	1991-08-05 01:01:01
 const09	1991-08-05 01:01:01
 param09	1991-08-05 01:01:01
-const10	662680861
-param10	662680861
+const10	662680861.000000
+param10	662680861.000000000000000000000000000000
 const11	1991
 param11	1991
 const12	NULL
@@ -3215,7 +3215,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 insert into t9
 ( c1, c13, c14, c15, c16, c17 )
@@ -3225,7 +3225,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 prepare stmt1 from "insert into t9
   ( c1, c13, c14, c15, c16, c17 )
@@ -3236,7 +3236,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 prepare stmt2 from "insert into t9
   ( c1, c13, c14, c15, c16, c17 )
@@ -3247,7 +3247,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 set @arg00= 1.0e+10 ;
 insert into t9
@@ -3256,7 +3256,7 @@ values
 ( 50, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10 ) ;
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 insert into t9
 ( c1, c13, c14, c15, c16, c17 )
@@ -3273,7 +3273,7 @@ values
 execute stmt1 ;
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 prepare stmt2 from "insert into t9
   ( c1, c13, c14, c15, c16, c17 )
@@ -3282,7 +3282,7 @@ values
 execute stmt2 using @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 set @arg00= 'abc' ;
 set @arg00= NULL ;
@@ -3338,14 +3338,14 @@ c1	c13	c14	c15	c16	c17
 31	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991
 32	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991
 33	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991
-40	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-41	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-42	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-43	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-50	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
+40	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+41	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+42	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+43	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+50	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
 51	2010-00-00	2010-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-52	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-53	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
+52	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+53	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
 60	NULL	NULL	1991-01-01 01:01:01	NULL	NULL
 61	NULL	NULL	1991-01-01 01:01:01	NULL	NULL
 62	NULL	NULL	1991-01-01 01:01:01	NULL	NULL

mysql-test/r/ps_3innodb.result

@@ -64,7 +64,7 @@ def	test	t9	t9	c12	c12	246	10	6	Y	0	4	63
 def	test	t9	t9	c13	c13	10	10	10	Y	128	0	63
 def	test	t9	t9	c14	c14	12	19	19	Y	128	0	63
 def	test	t9	t9	c15	c15	7	19	19	N	9377	0	63
-def	test	t9	t9	c16	c16	11	9	8	Y	128	0	63
+def	test	t9	t9	c16	c16	11	10	8	Y	128	0	63
 def	test	t9	t9	c17	c17	13	4	4	Y	32864	0	63
 def	test	t9	t9	c18	c18	1	4	1	Y	32768	0	63
 def	test	t9	t9	c19	c19	1	1	1	Y	32768	0	63
@@ -1776,8 +1776,8 @@ t5	CREATE TABLE `t5` (
   `param08` longtext,
   `const09` datetime DEFAULT NULL,
   `param09` longblob,
-  `const10` double NOT NULL DEFAULT '0',
-  `param10` double DEFAULT NULL,
+  `const10` decimal(22,6) NOT NULL DEFAULT '0.000000',
+  `param10` decimal(65,30) DEFAULT NULL,
   `const11` int(4) DEFAULT NULL,
   `param11` bigint(20) DEFAULT NULL,
   `const12` binary(0) DEFAULT NULL,
@@ -1806,8 +1806,8 @@ def	test	t5	t5	const08	const08	253	19	19	N	1	0	8
 def	test	t5	t5	param08	param08	252	4294967295	19	Y	16	0	8
 def	test	t5	t5	const09	const09	12	19	19	Y	128	0	63
 def	test	t5	t5	param09	param09	252	4294967295	19	Y	144	0	63
-def	test	t5	t5	const10	const10	5	49	9	N	32769	31	63
-def	test	t5	t5	param10	param10	5	23	9	Y	32768	31	63
+def	test	t5	t5	const10	const10	246	24	16	N	1	6	63
+def	test	t5	t5	param10	param10	246	67	40	Y	0	30	63
 def	test	t5	t5	const11	const11	3	4	4	Y	32768	0	63
 def	test	t5	t5	param11	param11	8	20	4	Y	32768	0	63
 def	test	t5	t5	const12	const12	254	0	0	Y	128	0	63
@@ -1833,8 +1833,8 @@ const08	1991-08-05 01:01:01
 param08	1991-08-05 01:01:01
 const09	1991-08-05 01:01:01
 param09	1991-08-05 01:01:01
-const10	662680861
-param10	662680861
+const10	662680861.000000
+param10	662680861.000000000000000000000000000000
 const11	1991
 param11	1991
 const12	NULL
@@ -3198,7 +3198,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 insert into t9
 ( c1, c13, c14, c15, c16, c17 )
@@ -3208,7 +3208,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 prepare stmt1 from "insert into t9
   ( c1, c13, c14, c15, c16, c17 )
@@ -3219,7 +3219,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 prepare stmt2 from "insert into t9
   ( c1, c13, c14, c15, c16, c17 )
@@ -3230,7 +3230,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 set @arg00= 1.0e+10 ;
 insert into t9
@@ -3239,7 +3239,7 @@ values
 ( 50, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10 ) ;
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 insert into t9
 ( c1, c13, c14, c15, c16, c17 )
@@ -3256,7 +3256,7 @@ values
 execute stmt1 ;
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 prepare stmt2 from "insert into t9
   ( c1, c13, c14, c15, c16, c17 )
@@ -3265,7 +3265,7 @@ values
 execute stmt2 using @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 set @arg00= 'abc' ;
 set @arg00= NULL ;
@@ -3321,14 +3321,14 @@ c1	c13	c14	c15	c16	c17
 31	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991
 32	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991
 33	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991
-40	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-41	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-42	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-43	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-50	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
+40	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+41	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+42	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+43	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+50	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
 51	2010-00-00	2010-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-52	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-53	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
+52	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+53	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
 60	NULL	NULL	1991-01-01 01:01:01	NULL	NULL
 61	NULL	NULL	1991-01-01 01:01:01	NULL	NULL
 62	NULL	NULL	1991-01-01 01:01:01	NULL	NULL

mysql-test/r/ps_4heap.result

@@ -65,7 +65,7 @@ def	test	t9	t9	c12	c12	246	10	6	Y	0	4	63
 def	test	t9	t9	c13	c13	10	10	10	Y	128	0	63
 def	test	t9	t9	c14	c14	12	19	19	Y	128	0	63
 def	test	t9	t9	c15	c15	7	19	19	N	9377	0	63
-def	test	t9	t9	c16	c16	11	9	8	Y	128	0	63
+def	test	t9	t9	c16	c16	11	10	8	Y	128	0	63
 def	test	t9	t9	c17	c17	13	4	4	Y	32864	0	63
 def	test	t9	t9	c18	c18	1	4	1	Y	32768	0	63
 def	test	t9	t9	c19	c19	1	1	1	Y	32768	0	63
@@ -1777,8 +1777,8 @@ t5	CREATE TABLE `t5` (
   `param08` longtext,
   `const09` datetime DEFAULT NULL,
   `param09` longblob,
-  `const10` double NOT NULL DEFAULT '0',
-  `param10` double DEFAULT NULL,
+  `const10` decimal(22,6) NOT NULL DEFAULT '0.000000',
+  `param10` decimal(65,30) DEFAULT NULL,
   `const11` int(4) DEFAULT NULL,
   `param11` bigint(20) DEFAULT NULL,
   `const12` binary(0) DEFAULT NULL,
@@ -1807,8 +1807,8 @@ def	test	t5	t5	const08	const08	253	19	19	N	1	0	8
 def	test	t5	t5	param08	param08	252	4294967295	19	Y	16	0	8
 def	test	t5	t5	const09	const09	12	19	19	Y	128	0	63
 def	test	t5	t5	param09	param09	252	4294967295	19	Y	144	0	63
-def	test	t5	t5	const10	const10	5	49	9	N	32769	31	63
-def	test	t5	t5	param10	param10	5	23	9	Y	32768	31	63
+def	test	t5	t5	const10	const10	246	24	16	N	1	6	63
+def	test	t5	t5	param10	param10	246	67	40	Y	0	30	63
 def	test	t5	t5	const11	const11	3	4	4	Y	32768	0	63
 def	test	t5	t5	param11	param11	8	20	4	Y	32768	0	63
 def	test	t5	t5	const12	const12	254	0	0	Y	128	0	63
@@ -1834,8 +1834,8 @@ const08	1991-08-05 01:01:01
 param08	1991-08-05 01:01:01
 const09	1991-08-05 01:01:01
 param09	1991-08-05 01:01:01
-const10	662680861
-param10	662680861
+const10	662680861.000000
+param10	662680861.000000000000000000000000000000
 const11	1991
 param11	1991
 const12	NULL
@@ -3199,7 +3199,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 insert into t9
 ( c1, c13, c14, c15, c16, c17 )
@@ -3209,7 +3209,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 prepare stmt1 from "insert into t9
   ( c1, c13, c14, c15, c16, c17 )
@@ -3220,7 +3220,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 prepare stmt2 from "insert into t9
   ( c1, c13, c14, c15, c16, c17 )
@@ -3231,7 +3231,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 set @arg00= 1.0e+10 ;
 insert into t9
@@ -3240,7 +3240,7 @@ values
 ( 50, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10 ) ;
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 insert into t9
 ( c1, c13, c14, c15, c16, c17 )
@@ -3257,7 +3257,7 @@ values
 execute stmt1 ;
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 prepare stmt2 from "insert into t9
   ( c1, c13, c14, c15, c16, c17 )
@@ -3266,7 +3266,7 @@ values
 execute stmt2 using @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 set @arg00= 'abc' ;
 set @arg00= NULL ;
@@ -3322,14 +3322,14 @@ c1	c13	c14	c15	c16	c17
 31	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991
 32	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991
 33	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991
-40	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-41	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-42	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-43	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-50	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
+40	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+41	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+42	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+43	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+50	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
 51	2010-00-00	2010-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-52	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-53	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
+52	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+53	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
 60	NULL	NULL	1991-01-01 01:01:01	NULL	NULL
 61	NULL	NULL	1991-01-01 01:01:01	NULL	NULL
 62	NULL	NULL	1991-01-01 01:01:01	NULL	NULL

mysql-test/r/query_cache.result

@@ -991,20 +991,17 @@ SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050327 invalid';
 COUNT(*)
 0
 Warnings:
-Warning	1292	Incorrect datetime value: '20050327 invalid' for column 'date' at row 1
-Warning	1292	Incorrect datetime value: '20050327 invalid' for column 'date' at row 0
+Warning	1292	Incorrect datetime value: '20050327 invalid'
 SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050328 invalid';
 COUNT(*)
 0
 Warnings:
-Warning	1292	Incorrect datetime value: '20050328 invalid' for column 'date' at row 1
-Warning	1292	Incorrect datetime value: '20050328 invalid' for column 'date' at row 0
+Warning	1292	Incorrect datetime value: '20050328 invalid'
 SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050327 invalid';
 COUNT(*)
 0
 Warnings:
-Warning	1292	Incorrect datetime value: '20050327 invalid' for column 'date' at row 1
-Warning	1292	Incorrect datetime value: '20050327 invalid' for column 'date' at row 0
+Warning	1292	Incorrect datetime value: '20050327 invalid'
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	0

mysql-test/r/range.result

@@ -1104,13 +1104,10 @@ INSERT INTO t1 VALUES
 EXPLAIN SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ref	PRIMARY	PRIMARY	20	const	2	Using index condition
-Warnings:
-Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00' for column 'started' at row 1
 SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';
 item	started	price
 Warnings:
-Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00' for column 'started' at row 1
-Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00' for column 'started' at row 0
+Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00'
 SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-02 00:00:00';
 item	started	price
 A1	2005-11-01 08:00:00	1000.000
@@ -1122,7 +1119,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';
 item	started	price
 Warnings:
-Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00' for column 'started' at row 0
+Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00'
 SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-02 00:00:00';
 item	started	price
 A1	2005-11-01 08:00:00	1000.000
@@ -1572,7 +1569,7 @@ str_to_date('2007-10-00', '%Y-%m-%d') >= '' AND
 str_to_date('2007-10-00', '%Y-%m-%d') <= '2007/10/20'
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: ''
+Warning	1292	Incorrect datetime value: ''
 SELECT str_to_date('2007-20-00', '%Y-%m-%d') >= '2007/10/20' AND 
 str_to_date('2007-20-00', '%Y-%m-%d') <= '';
 str_to_date('2007-20-00', '%Y-%m-%d') >= '2007/10/20' AND 
@@ -1585,7 +1582,7 @@ SELECT str_to_date('2007-10-00', '%Y-%m-%d') BETWEEN '' AND '2007/10/20';
 str_to_date('2007-10-00', '%Y-%m-%d') BETWEEN '' AND '2007/10/20'
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: ''
+Warning	1292	Incorrect datetime value: ''
 SELECT str_to_date('2007-20-00', '%Y-%m-%d') BETWEEN '2007/10/20' AND '';
 str_to_date('2007-20-00', '%Y-%m-%d') BETWEEN '2007/10/20' AND ''
 NULL

mysql-test/r/select.result

@@ -2115,8 +2115,8 @@ INSERT INTO t2 VALUES (1,3,10,'2002-06-01 08:00:00',35),(1,3,1010,'2002-06-01 12
 SELECT a.gvid, (SUM(CASE b.sampletid WHEN 140 THEN b.samplevalue ELSE 0 END)) as the_success,(SUM(CASE b.sampletid WHEN 141 THEN b.samplevalue ELSE 0 END)) as the_fail,(SUM(CASE b.sampletid WHEN 142 THEN b.samplevalue ELSE 0 END)) as the_size,(SUM(CASE b.sampletid WHEN 143 THEN b.samplevalue ELSE 0 END)) as the_time FROM t1 a, t2 b WHERE a.hmid = b.hmid AND a.volid = b.volid AND b.sampletime >= 'wrong-date-value' AND b.sampletime < 'wrong-date-value' AND b.sampletid IN (140, 141, 142, 143) GROUP BY a.gvid;
 gvid	the_success	the_fail	the_size	the_time
 Warnings:
-Warning	1292	Incorrect datetime value: 'wrong-date-value' for column 'sampletime' at row 0
-Warning	1292	Incorrect datetime value: 'wrong-date-value' for column 'sampletime' at row 0
+Warning	1292	Incorrect datetime value: 'wrong-date-value'
+Warning	1292	Incorrect datetime value: 'wrong-date-value'
 SELECT a.gvid, (SUM(CASE b.sampletid WHEN 140 THEN b.samplevalue ELSE 0 END)) as the_success,(SUM(CASE b.sampletid WHEN 141 THEN b.samplevalue ELSE 0 END)) as the_fail,(SUM(CASE b.sampletid WHEN 142 THEN b.samplevalue ELSE 0 END)) as the_size,(SUM(CASE b.sampletid WHEN 143 THEN b.samplevalue ELSE 0 END)) as the_time FROM t1 a, t2 b WHERE a.hmid = b.hmid AND a.volid = b.volid AND b.sampletime >= NULL AND b.sampletime < NULL AND b.sampletid IN (140, 141, 142, 143) GROUP BY a.gvid;
 gvid	the_success	the_fail	the_size	the_time
 DROP TABLE t1,t2;
@@ -3265,7 +3265,7 @@ f1	f2
 4	2005-10-01
 5	2005-12-30
 Warnings:
-Warning	1292	Incorrect date value: '2005-09-3a' for column 'f2' at row 1
+Warning	1292	Truncated incorrect date value: '2005-09-3a'
 select * from t1 where f2 <= '2005-09-31' order by f2;
 f1	f2
 1	2005-01-01
@@ -3276,7 +3276,7 @@ f1	f2
 1	2005-01-01
 2	2005-09-01
 Warnings:
-Warning	1292	Incorrect date value: '2005-09-3a' for column 'f2' at row 1
+Warning	1292	Truncated incorrect date value: '2005-09-3a'
 drop table t1;
 create table t1 (f1 int, f2 int);
 insert into t1 values (1, 30), (2, 20), (3, 10);
@@ -3753,15 +3753,11 @@ AND t1.ts BETWEEN "2006-01-01" AND "2006-12-31";
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	const	PRIMARY	PRIMARY	4	const	1	
 1	SIMPLE	t1	range	ts	ts	4	NULL	1	Using index condition; Using where; Rowid-ordered scan
-Warnings:
-Warning	1292	Incorrect datetime value: '2999-12-31 00:00:00' for column 'ts' at row 1
 SELECT * FROM t1 LEFT JOIN t2 ON (t1.a=t2.a) WHERE t1.a=30
 AND t1.ts BETWEEN t2.dt1 AND t2.dt2
 AND t1.ts BETWEEN "2006-01-01" AND "2006-12-31";
 a	ts	a	dt1	dt2
 30	2006-01-03 23:00:00	30	2006-01-01 00:00:00	2999-12-31 00:00:00
-Warnings:
-Warning	1292	Incorrect datetime value: '2999-12-31 00:00:00' for column 'ts' at row 1
 DROP TABLE t1,t2;
 create table t1 (a bigint unsigned);
 insert into t1 values
@@ -4092,28 +4088,28 @@ str_to_date('2007-10-09','%Y-%m-%d') between '2007/10/01 00:00:00 GMT'
                                                 and '2007/10/20 00:00:00 GMT'
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: '2007/10/01 00:00:00 GMT'
-Warning	1292	Truncated incorrect date value: '2007/10/20 00:00:00 GMT'
+Warning	1292	Truncated incorrect datetime value: '2007/10/01 00:00:00 GMT'
+Warning	1292	Truncated incorrect datetime value: '2007/10/20 00:00:00 GMT'
 select str_to_date('2007-10-09','%Y-%m-%d') > '2007/10/01 00:00:00 GMT-6';
 str_to_date('2007-10-09','%Y-%m-%d') > '2007/10/01 00:00:00 GMT-6'
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: '2007/10/01 00:00:00 GMT-6'
+Warning	1292	Truncated incorrect datetime value: '2007/10/01 00:00:00 GMT-6'
 select str_to_date('2007-10-09','%Y-%m-%d') <= '2007/10/20 00:00:00 GMT-6';
 str_to_date('2007-10-09','%Y-%m-%d') <= '2007/10/20 00:00:00 GMT-6'
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: '2007/10/20 00:00:00 GMT-6'
+Warning	1292	Truncated incorrect datetime value: '2007/10/20 00:00:00 GMT-6'
 select str_to_date('2007-10-09','%Y-%m-%d') <= '2007/10/2000:00:00 GMT-6';
 str_to_date('2007-10-09','%Y-%m-%d') <= '2007/10/2000:00:00 GMT-6'
 0
 Warnings:
-Warning	1292	Truncated incorrect date value: '2007/10/2000:00:00 GMT-6'
+Warning	1292	Incorrect datetime value: '2007/10/2000:00:00 GMT-6'
 select str_to_date('2007-10-01','%Y-%m-%d') = '2007-10-1 00:00:00 GMT-6';
 str_to_date('2007-10-01','%Y-%m-%d') = '2007-10-1 00:00:00 GMT-6'
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: '2007-10-1 00:00:00 GMT-6'
+Warning	1292	Truncated incorrect datetime value: '2007-10-1 00:00:00 GMT-6'
 select str_to_date('2007-10-01','%Y-%m-%d') = '2007-10-01 x00:00:00 GMT-6';
 str_to_date('2007-10-01','%Y-%m-%d') = '2007-10-01 x00:00:00 GMT-6'
 1
@@ -4133,7 +4129,7 @@ select str_to_date('2007-10-01','%Y-%m-%d %H:%i:%s') = '2007-10-01 x12:34:56 GMT
 str_to_date('2007-10-01','%Y-%m-%d %H:%i:%s') = '2007-10-01 x12:34:56 GMT-6'
 1
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '2007-10-01 x12:34:56 GMT-6'
+Warning	1292	Truncated incorrect date value: '2007-10-01 x12:34:56 GMT-6'
 select str_to_date('2007-10-01 12:34:00','%Y-%m-%d %H:%i:%s') = '2007-10-01 12:34x:56 GMT-6';
 str_to_date('2007-10-01 12:34:00','%Y-%m-%d %H:%i:%s') = '2007-10-01 12:34x:56 GMT-6'
 1
@@ -4189,7 +4185,7 @@ select str_to_date('2007-10-00','%Y-%m-%d') between '' and '2007/10/20';
 str_to_date('2007-10-00','%Y-%m-%d') between '' and '2007/10/20'
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: ''
+Warning	1292	Incorrect datetime value: ''
 select str_to_date('','%Y-%m-%d') between '2007/10/01' and '2007/10/20';
 str_to_date('','%Y-%m-%d') between '2007/10/01' and '2007/10/20'
 0
@@ -4203,22 +4199,22 @@ select str_to_date('2007-10-00 12:34','%Y-%m-%d %H:%i') = '';
 str_to_date('2007-10-00 12:34','%Y-%m-%d %H:%i') = ''
 0
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: ''
 select str_to_date('1','%Y-%m-%d') = '1';
 str_to_date('1','%Y-%m-%d') = '1'
 0
 Warnings:
-Warning	1292	Truncated incorrect date value: '1'
+Warning	1292	Incorrect datetime value: '1'
 select str_to_date('1','%Y-%m-%d') = '1';
 str_to_date('1','%Y-%m-%d') = '1'
 0
 Warnings:
-Warning	1292	Truncated incorrect date value: '1'
+Warning	1292	Incorrect datetime value: '1'
 select str_to_date('','%Y-%m-%d') = '';
 str_to_date('','%Y-%m-%d') = ''
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: ''
+Warning	1292	Incorrect datetime value: ''
 select str_to_date('2000-01-01','%Y-%m-%d') between '1000-01-01' and '2001-01-01';
 str_to_date('2000-01-01','%Y-%m-%d') between '1000-01-01' and '2001-01-01'
 1

mysql-test/r/select_jcl6.result

@@ -2122,8 +2122,8 @@ INSERT INTO t2 VALUES (1,3,10,'2002-06-01 08:00:00',35),(1,3,1010,'2002-06-01 12
 SELECT a.gvid, (SUM(CASE b.sampletid WHEN 140 THEN b.samplevalue ELSE 0 END)) as the_success,(SUM(CASE b.sampletid WHEN 141 THEN b.samplevalue ELSE 0 END)) as the_fail,(SUM(CASE b.sampletid WHEN 142 THEN b.samplevalue ELSE 0 END)) as the_size,(SUM(CASE b.sampletid WHEN 143 THEN b.samplevalue ELSE 0 END)) as the_time FROM t1 a, t2 b WHERE a.hmid = b.hmid AND a.volid = b.volid AND b.sampletime >= 'wrong-date-value' AND b.sampletime < 'wrong-date-value' AND b.sampletid IN (140, 141, 142, 143) GROUP BY a.gvid;
 gvid	the_success	the_fail	the_size	the_time
 Warnings:
-Warning	1292	Incorrect datetime value: 'wrong-date-value' for column 'sampletime' at row 0
-Warning	1292	Incorrect datetime value: 'wrong-date-value' for column 'sampletime' at row 0
+Warning	1292	Incorrect datetime value: 'wrong-date-value'
+Warning	1292	Incorrect datetime value: 'wrong-date-value'
 SELECT a.gvid, (SUM(CASE b.sampletid WHEN 140 THEN b.samplevalue ELSE 0 END)) as the_success,(SUM(CASE b.sampletid WHEN 141 THEN b.samplevalue ELSE 0 END)) as the_fail,(SUM(CASE b.sampletid WHEN 142 THEN b.samplevalue ELSE 0 END)) as the_size,(SUM(CASE b.sampletid WHEN 143 THEN b.samplevalue ELSE 0 END)) as the_time FROM t1 a, t2 b WHERE a.hmid = b.hmid AND a.volid = b.volid AND b.sampletime >= NULL AND b.sampletime < NULL AND b.sampletid IN (140, 141, 142, 143) GROUP BY a.gvid;
 gvid	the_success	the_fail	the_size	the_time
 DROP TABLE t1,t2;
@@ -3272,7 +3272,7 @@ f1	f2
 4	2005-10-01
 5	2005-12-30
 Warnings:
-Warning	1292	Incorrect date value: '2005-09-3a' for column 'f2' at row 1
+Warning	1292	Truncated incorrect date value: '2005-09-3a'
 select * from t1 where f2 <= '2005-09-31' order by f2;
 f1	f2
 1	2005-01-01
@@ -3283,7 +3283,7 @@ f1	f2
 1	2005-01-01
 2	2005-09-01
 Warnings:
-Warning	1292	Incorrect date value: '2005-09-3a' for column 'f2' at row 1
+Warning	1292	Truncated incorrect date value: '2005-09-3a'
 drop table t1;
 create table t1 (f1 int, f2 int);
 insert into t1 values (1, 30), (2, 20), (3, 10);
@@ -3760,15 +3760,11 @@ AND t1.ts BETWEEN "2006-01-01" AND "2006-12-31";
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	const	PRIMARY	PRIMARY	4	const	1	
 1	SIMPLE	t1	range	ts	ts	4	NULL	1	Using index condition; Using where; Rowid-ordered scan
-Warnings:
-Warning	1292	Incorrect datetime value: '2999-12-31 00:00:00' for column 'ts' at row 1
 SELECT * FROM t1 LEFT JOIN t2 ON (t1.a=t2.a) WHERE t1.a=30
 AND t1.ts BETWEEN t2.dt1 AND t2.dt2
 AND t1.ts BETWEEN "2006-01-01" AND "2006-12-31";
 a	ts	a	dt1	dt2
 30	2006-01-03 23:00:00	30	2006-01-01 00:00:00	2999-12-31 00:00:00
-Warnings:
-Warning	1292	Incorrect datetime value: '2999-12-31 00:00:00' for column 'ts' at row 1
 DROP TABLE t1,t2;
 create table t1 (a bigint unsigned);
 insert into t1 values
@@ -4099,28 +4095,28 @@ str_to_date('2007-10-09','%Y-%m-%d') between '2007/10/01 00:00:00 GMT'
                                                 and '2007/10/20 00:00:00 GMT'
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: '2007/10/01 00:00:00 GMT'
-Warning	1292	Truncated incorrect date value: '2007/10/20 00:00:00 GMT'
+Warning	1292	Truncated incorrect datetime value: '2007/10/01 00:00:00 GMT'
+Warning	1292	Truncated incorrect datetime value: '2007/10/20 00:00:00 GMT'
 select str_to_date('2007-10-09','%Y-%m-%d') > '2007/10/01 00:00:00 GMT-6';
 str_to_date('2007-10-09','%Y-%m-%d') > '2007/10/01 00:00:00 GMT-6'
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: '2007/10/01 00:00:00 GMT-6'
+Warning	1292	Truncated incorrect datetime value: '2007/10/01 00:00:00 GMT-6'
 select str_to_date('2007-10-09','%Y-%m-%d') <= '2007/10/20 00:00:00 GMT-6';
 str_to_date('2007-10-09','%Y-%m-%d') <= '2007/10/20 00:00:00 GMT-6'
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: '2007/10/20 00:00:00 GMT-6'
+Warning	1292	Truncated incorrect datetime value: '2007/10/20 00:00:00 GMT-6'
 select str_to_date('2007-10-09','%Y-%m-%d') <= '2007/10/2000:00:00 GMT-6';
 str_to_date('2007-10-09','%Y-%m-%d') <= '2007/10/2000:00:00 GMT-6'
 0
 Warnings:
-Warning	1292	Truncated incorrect date value: '2007/10/2000:00:00 GMT-6'
+Warning	1292	Incorrect datetime value: '2007/10/2000:00:00 GMT-6'
 select str_to_date('2007-10-01','%Y-%m-%d') = '2007-10-1 00:00:00 GMT-6';
 str_to_date('2007-10-01','%Y-%m-%d') = '2007-10-1 00:00:00 GMT-6'
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: '2007-10-1 00:00:00 GMT-6'
+Warning	1292	Truncated incorrect datetime value: '2007-10-1 00:00:00 GMT-6'
 select str_to_date('2007-10-01','%Y-%m-%d') = '2007-10-01 x00:00:00 GMT-6';
 str_to_date('2007-10-01','%Y-%m-%d') = '2007-10-01 x00:00:00 GMT-6'
 1
@@ -4140,7 +4136,7 @@ select str_to_date('2007-10-01','%Y-%m-%d %H:%i:%s') = '2007-10-01 x12:34:56 GMT
 str_to_date('2007-10-01','%Y-%m-%d %H:%i:%s') = '2007-10-01 x12:34:56 GMT-6'
 1
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '2007-10-01 x12:34:56 GMT-6'
+Warning	1292	Truncated incorrect date value: '2007-10-01 x12:34:56 GMT-6'
 select str_to_date('2007-10-01 12:34:00','%Y-%m-%d %H:%i:%s') = '2007-10-01 12:34x:56 GMT-6';
 str_to_date('2007-10-01 12:34:00','%Y-%m-%d %H:%i:%s') = '2007-10-01 12:34x:56 GMT-6'
 1
@@ -4196,7 +4192,7 @@ select str_to_date('2007-10-00','%Y-%m-%d') between '' and '2007/10/20';
 str_to_date('2007-10-00','%Y-%m-%d') between '' and '2007/10/20'
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: ''
+Warning	1292	Incorrect datetime value: ''
 select str_to_date('','%Y-%m-%d') between '2007/10/01' and '2007/10/20';
 str_to_date('','%Y-%m-%d') between '2007/10/01' and '2007/10/20'
 0
@@ -4210,22 +4206,22 @@ select str_to_date('2007-10-00 12:34','%Y-%m-%d %H:%i') = '';
 str_to_date('2007-10-00 12:34','%Y-%m-%d %H:%i') = ''
 0
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: ''
 select str_to_date('1','%Y-%m-%d') = '1';
 str_to_date('1','%Y-%m-%d') = '1'
 0
 Warnings:
-Warning	1292	Truncated incorrect date value: '1'
+Warning	1292	Incorrect datetime value: '1'
 select str_to_date('1','%Y-%m-%d') = '1';
 str_to_date('1','%Y-%m-%d') = '1'
 0
 Warnings:
-Warning	1292	Truncated incorrect date value: '1'
+Warning	1292	Incorrect datetime value: '1'
 select str_to_date('','%Y-%m-%d') = '';
 str_to_date('','%Y-%m-%d') = ''
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: ''
+Warning	1292	Incorrect datetime value: ''
 select str_to_date('2000-01-01','%Y-%m-%d') between '1000-01-01' and '2001-01-01';
 str_to_date('2000-01-01','%Y-%m-%d') between '1000-01-01' and '2001-01-01'
 1

mysql-test/r/select_pkeycache.result

@@ -2115,8 +2115,8 @@ INSERT INTO t2 VALUES (1,3,10,'2002-06-01 08:00:00',35),(1,3,1010,'2002-06-01 12
 SELECT a.gvid, (SUM(CASE b.sampletid WHEN 140 THEN b.samplevalue ELSE 0 END)) as the_success,(SUM(CASE b.sampletid WHEN 141 THEN b.samplevalue ELSE 0 END)) as the_fail,(SUM(CASE b.sampletid WHEN 142 THEN b.samplevalue ELSE 0 END)) as the_size,(SUM(CASE b.sampletid WHEN 143 THEN b.samplevalue ELSE 0 END)) as the_time FROM t1 a, t2 b WHERE a.hmid = b.hmid AND a.volid = b.volid AND b.sampletime >= 'wrong-date-value' AND b.sampletime < 'wrong-date-value' AND b.sampletid IN (140, 141, 142, 143) GROUP BY a.gvid;
 gvid	the_success	the_fail	the_size	the_time
 Warnings:
-Warning	1292	Incorrect datetime value: 'wrong-date-value' for column 'sampletime' at row 0
-Warning	1292	Incorrect datetime value: 'wrong-date-value' for column 'sampletime' at row 0
+Warning	1292	Incorrect datetime value: 'wrong-date-value'
+Warning	1292	Incorrect datetime value: 'wrong-date-value'
 SELECT a.gvid, (SUM(CASE b.sampletid WHEN 140 THEN b.samplevalue ELSE 0 END)) as the_success,(SUM(CASE b.sampletid WHEN 141 THEN b.samplevalue ELSE 0 END)) as the_fail,(SUM(CASE b.sampletid WHEN 142 THEN b.samplevalue ELSE 0 END)) as the_size,(SUM(CASE b.sampletid WHEN 143 THEN b.samplevalue ELSE 0 END)) as the_time FROM t1 a, t2 b WHERE a.hmid = b.hmid AND a.volid = b.volid AND b.sampletime >= NULL AND b.sampletime < NULL AND b.sampletid IN (140, 141, 142, 143) GROUP BY a.gvid;
 gvid	the_success	the_fail	the_size	the_time
 DROP TABLE t1,t2;
@@ -3265,7 +3265,7 @@ f1	f2
 4	2005-10-01
 5	2005-12-30
 Warnings:
-Warning	1292	Incorrect date value: '2005-09-3a' for column 'f2' at row 1
+Warning	1292	Truncated incorrect date value: '2005-09-3a'
 select * from t1 where f2 <= '2005-09-31' order by f2;
 f1	f2
 1	2005-01-01
@@ -3276,7 +3276,7 @@ f1	f2
 1	2005-01-01
 2	2005-09-01
 Warnings:
-Warning	1292	Incorrect date value: '2005-09-3a' for column 'f2' at row 1
+Warning	1292	Truncated incorrect date value: '2005-09-3a'
 drop table t1;
 create table t1 (f1 int, f2 int);
 insert into t1 values (1, 30), (2, 20), (3, 10);
@@ -3753,15 +3753,11 @@ AND t1.ts BETWEEN "2006-01-01" AND "2006-12-31";
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	const	PRIMARY	PRIMARY	4	const	1	
 1	SIMPLE	t1	range	ts	ts	4	NULL	1	Using index condition; Using where; Rowid-ordered scan
-Warnings:
-Warning	1292	Incorrect datetime value: '2999-12-31 00:00:00' for column 'ts' at row 1
 SELECT * FROM t1 LEFT JOIN t2 ON (t1.a=t2.a) WHERE t1.a=30
 AND t1.ts BETWEEN t2.dt1 AND t2.dt2
 AND t1.ts BETWEEN "2006-01-01" AND "2006-12-31";
 a	ts	a	dt1	dt2
 30	2006-01-03 23:00:00	30	2006-01-01 00:00:00	2999-12-31 00:00:00
-Warnings:
-Warning	1292	Incorrect datetime value: '2999-12-31 00:00:00' for column 'ts' at row 1
 DROP TABLE t1,t2;
 create table t1 (a bigint unsigned);
 insert into t1 values
@@ -4092,28 +4088,28 @@ str_to_date('2007-10-09','%Y-%m-%d') between '2007/10/01 00:00:00 GMT'
                                                 and '2007/10/20 00:00:00 GMT'
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: '2007/10/01 00:00:00 GMT'
-Warning	1292	Truncated incorrect date value: '2007/10/20 00:00:00 GMT'
+Warning	1292	Truncated incorrect datetime value: '2007/10/01 00:00:00 GMT'
+Warning	1292	Truncated incorrect datetime value: '2007/10/20 00:00:00 GMT'
 select str_to_date('2007-10-09','%Y-%m-%d') > '2007/10/01 00:00:00 GMT-6';
 str_to_date('2007-10-09','%Y-%m-%d') > '2007/10/01 00:00:00 GMT-6'
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: '2007/10/01 00:00:00 GMT-6'
+Warning	1292	Truncated incorrect datetime value: '2007/10/01 00:00:00 GMT-6'
 select str_to_date('2007-10-09','%Y-%m-%d') <= '2007/10/20 00:00:00 GMT-6';
 str_to_date('2007-10-09','%Y-%m-%d') <= '2007/10/20 00:00:00 GMT-6'
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: '2007/10/20 00:00:00 GMT-6'
+Warning	1292	Truncated incorrect datetime value: '2007/10/20 00:00:00 GMT-6'
 select str_to_date('2007-10-09','%Y-%m-%d') <= '2007/10/2000:00:00 GMT-6';
 str_to_date('2007-10-09','%Y-%m-%d') <= '2007/10/2000:00:00 GMT-6'
 0
 Warnings:
-Warning	1292	Truncated incorrect date value: '2007/10/2000:00:00 GMT-6'
+Warning	1292	Incorrect datetime value: '2007/10/2000:00:00 GMT-6'
 select str_to_date('2007-10-01','%Y-%m-%d') = '2007-10-1 00:00:00 GMT-6';
 str_to_date('2007-10-01','%Y-%m-%d') = '2007-10-1 00:00:00 GMT-6'
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: '2007-10-1 00:00:00 GMT-6'
+Warning	1292	Truncated incorrect datetime value: '2007-10-1 00:00:00 GMT-6'
 select str_to_date('2007-10-01','%Y-%m-%d') = '2007-10-01 x00:00:00 GMT-6';
 str_to_date('2007-10-01','%Y-%m-%d') = '2007-10-01 x00:00:00 GMT-6'
 1
@@ -4133,7 +4129,7 @@ select str_to_date('2007-10-01','%Y-%m-%d %H:%i:%s') = '2007-10-01 x12:34:56 GMT
 str_to_date('2007-10-01','%Y-%m-%d %H:%i:%s') = '2007-10-01 x12:34:56 GMT-6'
 1
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '2007-10-01 x12:34:56 GMT-6'
+Warning	1292	Truncated incorrect date value: '2007-10-01 x12:34:56 GMT-6'
 select str_to_date('2007-10-01 12:34:00','%Y-%m-%d %H:%i:%s') = '2007-10-01 12:34x:56 GMT-6';
 str_to_date('2007-10-01 12:34:00','%Y-%m-%d %H:%i:%s') = '2007-10-01 12:34x:56 GMT-6'
 1
@@ -4189,7 +4185,7 @@ select str_to_date('2007-10-00','%Y-%m-%d') between '' and '2007/10/20';
 str_to_date('2007-10-00','%Y-%m-%d') between '' and '2007/10/20'
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: ''
+Warning	1292	Incorrect datetime value: ''
 select str_to_date('','%Y-%m-%d') between '2007/10/01' and '2007/10/20';
 str_to_date('','%Y-%m-%d') between '2007/10/01' and '2007/10/20'
 0
@@ -4203,22 +4199,22 @@ select str_to_date('2007-10-00 12:34','%Y-%m-%d %H:%i') = '';
 str_to_date('2007-10-00 12:34','%Y-%m-%d %H:%i') = ''
 0
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: ''
 select str_to_date('1','%Y-%m-%d') = '1';
 str_to_date('1','%Y-%m-%d') = '1'
 0
 Warnings:
-Warning	1292	Truncated incorrect date value: '1'
+Warning	1292	Incorrect datetime value: '1'
 select str_to_date('1','%Y-%m-%d') = '1';
 str_to_date('1','%Y-%m-%d') = '1'
 0
 Warnings:
-Warning	1292	Truncated incorrect date value: '1'
+Warning	1292	Incorrect datetime value: '1'
 select str_to_date('','%Y-%m-%d') = '';
 str_to_date('','%Y-%m-%d') = ''
 1
 Warnings:
-Warning	1292	Truncated incorrect date value: ''
+Warning	1292	Incorrect datetime value: ''
 select str_to_date('2000-01-01','%Y-%m-%d') between '1000-01-01' and '2001-01-01';
 str_to_date('2000-01-01','%Y-%m-%d') between '1000-01-01' and '2001-01-01'
 1

mysql-test/r/timezone.result

@@ -7,7 +7,7 @@ select @a:=FROM_UNIXTIME(1);
 1970-01-01 01:00:01
 select unix_timestamp(@a);
 unix_timestamp(@a)
-1
+1.000000
 CREATE TABLE t1 (ts int);
 INSERT INTO t1 (ts) VALUES (Unix_timestamp('2002-10-27 01:00'));
 INSERT INTO t1 (ts) VALUES (Unix_timestamp('2002-10-27 02:00'));
@@ -44,7 +44,7 @@ unix_timestamp('1970-01-01 01:00:01'),
 unix_timestamp('2038-01-19 04:14:07'),
 unix_timestamp('2038-01-19 04:14:08');
 unix_timestamp('1970-01-01 01:00:00')	unix_timestamp('1970-01-01 01:00:01')	unix_timestamp('2038-01-19 04:14:07')	unix_timestamp('2038-01-19 04:14:08')
-0	1	2147483647	NULL
+0.000000	1.000000	2147483647.000000	NULL
 select unix_timestamp('1969-12-31 23:59:59'), unix_timestamp('1970-01-01 00:00:00'), unix_timestamp('1970-01-01 00:59:59');
 unix_timestamp('1969-12-31 23:59:59')	unix_timestamp('1970-01-01 00:00:00')	unix_timestamp('1970-01-01 00:59:59')
 NULL	NULL	NULL

mysql-test/r/timezone2.result

@@ -119,6 +119,7 @@ insert into t1 values ('0000-00-00 00:00:00'),('1969-12-31 23:59:59'),
 ('2038-01-19 03:14:07'),('2038-01-19 03:14:08');
 Warnings:
 Warning	1264	Out of range value for column 'ts' at row 2
+Warning	1264	Out of range value for column 'ts' at row 3
 Warning	1264	Out of range value for column 'ts' at row 6
 select * from t1;
 ts
@@ -135,6 +136,7 @@ insert into t1 values ('0000-00-00 00:00:00'),('1970-01-01 00:30:00'),
 ('2038-01-19 04:14:07'),('2038-01-19 04:14:08');
 Warnings:
 Warning	1264	Out of range value for column 'ts' at row 2
+Warning	1264	Out of range value for column 'ts' at row 3
 Warning	1264	Out of range value for column 'ts' at row 6
 select * from t1;
 ts
@@ -151,6 +153,7 @@ insert into t1 values ('0000-00-00 00:00:00'),('1970-01-01 01:00:00'),
 ('2038-01-19 04:44:07'),('2038-01-19 04:44:08');
 Warnings:
 Warning	1264	Out of range value for column 'ts' at row 2
+Warning	1264	Out of range value for column 'ts' at row 3
 Warning	1264	Out of range value for column 'ts' at row 6
 select * from t1;
 ts

mysql-test/r/timezone4.result

@@ -3,4 +3,4 @@ from_unixtime(0)
 1969-12-31 14:00:00
 select unix_timestamp('1969-12-31 14:00:01');
 unix_timestamp('1969-12-31 14:00:01')
-1
+1.000000

mysql-test/r/type_datetime.result

@@ -185,14 +185,14 @@ DROP TABLE t1;
 SELECT CAST(CAST('2006-08-10' AS DATE) AS DECIMAL(20,6));
 CAST(CAST('2006-08-10' AS DATE) AS DECIMAL(20,6))
 20060810.000000
-SELECT CAST(CAST('2006-08-10 10:11:12' AS DATETIME) AS DECIMAL(20,6));
-CAST(CAST('2006-08-10 10:11:12' AS DATETIME) AS DECIMAL(20,6))
+SELECT CAST(CAST('2006-08-10 10:11:12' AS DATETIME(6)) AS DECIMAL(20,6));
+CAST(CAST('2006-08-10 10:11:12' AS DATETIME(6)) AS DECIMAL(20,6))
 20060810101112.000000
-SELECT CAST(CAST('2006-08-10 10:11:12' AS DATETIME) + INTERVAL 14 MICROSECOND AS DECIMAL(20,6));
-CAST(CAST('2006-08-10 10:11:12' AS DATETIME) + INTERVAL 14 MICROSECOND AS DECIMAL(20,6))
+SELECT CAST(CAST('2006-08-10 10:11:12' AS DATETIME(6)) + INTERVAL 14 MICROSECOND AS DECIMAL(20,6));
+CAST(CAST('2006-08-10 10:11:12' AS DATETIME(6)) + INTERVAL 14 MICROSECOND AS DECIMAL(20,6))
 20060810101112.000014
-SELECT CAST(CAST('10:11:12.098700' AS TIME) AS DECIMAL(20,6));
-CAST(CAST('10:11:12.098700' AS TIME) AS DECIMAL(20,6))
+SELECT CAST(CAST('10:11:12.098700' AS TIME(6)) AS DECIMAL(20,6));
+CAST(CAST('10:11:12.098700' AS TIME(6)) AS DECIMAL(20,6))
 101112.098700
 set @org_mode=@@sql_mode;
 create table t1 (da date default '1962-03-03 23:33:34', dt datetime default '1962-03-03');
@@ -361,7 +361,7 @@ greatest(cast('01-01-01' as date), '01-01-02') + 0
 20010102
 select least(cast('01-01-01' as datetime), '01-01-02') + 0;
 least(cast('01-01-01' as datetime), '01-01-02') + 0
-20010101000000
+20010101000000.000000
 select cast(least(cast('01-01-01' as datetime), '01-01-02') as signed);
 cast(least(cast('01-01-01' as datetime), '01-01-02') as signed)
 20010101000000
@@ -399,7 +399,7 @@ if(@bug28261 = f1, '', @bug28261:= f1)
 2001-01-01
 2002-02-02
 Warnings:
-Warning	1292	Incorrect date value: '' for column 'f1' at row 1
+Warning	1292	Incorrect datetime value: ''
 select if(@bug28261 = f1, '', @bug28261:= f1) from t1;
 if(@bug28261 = f1, '', @bug28261:= f1)
 2001-01-01
@@ -423,11 +423,11 @@ f1
 2001-01-01 00:00:00
 2002-02-02 00:00:00
 Warnings:
-Warning	1292	Incorrect datetime value: '2002010' for column 'f1' at row 0
+Warning	1292	Incorrect datetime value: '2002010'
 select * from t1 where f1 between 20020101 and 2007010100000;
 f1
 Warnings:
-Warning	1292	Incorrect datetime value: '2007010100000' for column 'f1' at row 0
+Warning	1292	Incorrect datetime value: '2007010100000'
 drop table t1;
 #
 # Bug#27216: functions with parameters of different date types may
@@ -495,10 +495,10 @@ insert into t1 set f1 = '45:44:44';
 insert into t1 set f1 = '15:44:44';
 select * from t1 where (convert(f1,datetime)) != 1;
 f1
+45:44:44
 15:44:44
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '45:44:44'
-Warning	1292	Truncated incorrect datetime value: '1'
+Warning	1292	Incorrect datetime value: '1'
 drop table t1;
 create table t1 (a tinyint);
 insert into t1 values (), (), ();
@@ -618,21 +618,21 @@ ERROR 42000: Invalid default value for 'da'
 create table t1 (t time default '916:00:00 a');
 ERROR 42000: Invalid default value for 't'
 set @@sql_mode= @org_mode;
-SELECT CAST(CAST('2006-08-10 10:11:12.0123450' AS DATETIME) AS DECIMAL(30,7));
-CAST(CAST('2006-08-10 10:11:12.0123450' AS DATETIME) AS DECIMAL(30,7))
+SELECT CAST(CAST('2006-08-10 10:11:12.0123450' AS DATETIME(6)) AS DECIMAL(30,7));
+CAST(CAST('2006-08-10 10:11:12.0123450' AS DATETIME(6)) AS DECIMAL(30,7))
 20060810101112.0123450
 Warnings:
 Warning	1292	Truncated incorrect datetime value: '2006-08-10 10:11:12.0123450'
-SELECT CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.0123450' AS DATETIME) AS DECIMAL(30,7));
-CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.0123450' AS DATETIME) AS DECIMAL(30,7))
+SELECT CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.0123450' AS DATETIME(6)) AS DECIMAL(30,7));
+CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.0123450' AS DATETIME(6)) AS DECIMAL(30,7))
 20060810101112.0123450
 Warnings:
 Warning	1292	Truncated incorrect datetime value: '00000002006-000008-0000010 000010:0000011:00000012.0123450'
-SELECT CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.012345'  AS DATETIME) AS DECIMAL(30,7));
-CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.012345'  AS DATETIME) AS DECIMAL(30,7))
+SELECT CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.012345'  AS DATETIME(6)) AS DECIMAL(30,7));
+CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.012345'  AS DATETIME(6)) AS DECIMAL(30,7))
 20060810101112.0123450
-SELECT CAST(CAST('2008-07-29T10:42:51.1234567' AS DateTime) AS DECIMAL(30,7));
-CAST(CAST('2008-07-29T10:42:51.1234567' AS DateTime) AS DECIMAL(30,7))
+SELECT CAST(CAST('2008-07-29T10:42:51.1234567' AS DateTime(6)) AS DECIMAL(30,7));
+CAST(CAST('2008-07-29T10:42:51.1234567' AS DateTime(6)) AS DECIMAL(30,7))
 20080729104251.1234560
 Warnings:
 Warning	1292	Truncated incorrect datetime value: '2008-07-29T10:42:51.1234567'

mysql-test/r/type_time.result

@@ -29,8 +29,8 @@ insert into t1 values("10.22.22"),(1234567),(123456789),(123456789.10),("10 22:2
 Warnings:
 Warning	1265	Data truncated for column 't' at row 1
 Warning	1265	Data truncated for column 't' at row 2
-Warning	1264	Out of range value for column 't' at row 3
-Warning	1264	Out of range value for column 't' at row 4
+Warning	1265	Data truncated for column 't' at row 3
+Warning	1265	Data truncated for column 't' at row 4
 Warning	1265	Data truncated for column 't' at row 6
 select * from t1;
 t
@@ -55,8 +55,8 @@ t
 36:30:31
 00:00:10
 00:00:00
-838:59:59
-838:59:59
+00:00:00
+00:00:00
 262:22:00
 00:00:12
 drop table t1;

mysql-test/r/type_time_hires.result

@@ -10,52 +10,52 @@ Warnings:
 Note	1265	Data truncated for column 'a' at row 1
 insert t1 values (20101211010203.45678);
 Warnings:
-Warning	1264	Out of range value for column 'a' at row 1
+Warning	1265	Data truncated for column 'a' at row 1
 insert t1 values (20101211030405.789e0);
 Warnings:
-Warning	1264	Out of range value for column 'a' at row 1
+Warning	1265	Data truncated for column 'a' at row 1
 insert t1 values (99991231235959e1);
 Warnings:
-Warning	1264	Out of range value for column 'a' at row 1
+Warning	1265	Data truncated for column 'a' at row 1
 select * from t1;
 a
+00:00:00.000
 00:20:03.123
+01:02:03.456
+03:04:05.789
 15:47:11.123
-838:59:59.999
-838:59:59.999
-838:59:59.999
 select truncate(a, 6) from t1;
 truncate(a, 6)
+0.000000
 2003.123000
+10203.456000
+30405.789062
 154711.123000
-8385959.999000
-8385959.999000
-8385959.999000
 select a DIV 1 from t1;
 a DIV 1
+0
 2003
+10203
+30405
 154711
-8385959
-8385959
-8385959
 select group_concat(distinct a) from t1;
 group_concat(distinct a)
-00:20:03.123,15:47:11.123,838:59:59.999
+00:00:00.000,00:20:03.123,01:02:03.456,03:04:05.789,15:47:11.123
 alter table t1 engine=innodb;
 select * from t1 order by a;
 a
+00:00:00.000
 00:20:03.123
+01:02:03.456
+03:04:05.789
 15:47:11.123
-838:59:59.999
-838:59:59.999
-838:59:59.999
 select * from t1 order by a+0;
 a
+00:00:00.000
 00:20:03.123
+01:02:03.456
+03:04:05.789
 15:47:11.123
-838:59:59.999
-838:59:59.999
-838:59:59.999
 drop table t1;
 create table t1 (a time(4)) engine=innodb;
 insert t1 values ('2010-12-11 01:02:03.456789');
@@ -101,17 +101,21 @@ a
 01:02:13.3332
 select a, a + interval 2 year from t1;
 a	a + interval 2 year
-01:02:13.3332	0002-00-00 01:02:13.3332
+01:02:13.3332	NULL
+Warnings:
+Warning	1441	Datetime function: time field overflow
 insert t1 select a + interval 2 year from t1;
 Warnings:
-Warning	1265	Data truncated for column 'a' at row 1
+Warning	1441	Datetime function: time field overflow
 select * from t1;
 a
 01:02:13.3332
-00:00:00.0000
+NULL
 delete from t1 where a < 20110101;
 select * from t1;
 a
+01:02:13.3332
+NULL
 create table t2 select * from t1;
 create table t3 like t1;
 show create table t2;
@@ -124,7 +128,125 @@ Table	Create Table
 t3	CREATE TABLE `t3` (
   `a` time(4) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
+drop table t2, t3;
+insert t1 values ('2010-12-13 14:15:16.222222');
+Warnings:
+Note	1265	Data truncated for column 'a' at row 1
+select a, a+0, a-1, a*1, a/2 from t1;
+a	a+0	a-1	a*1	a/2
+01:02:13.3332	10213.3332	10212.3332	10213.3332	5106.66660000
+NULL	NULL	NULL	NULL	NULL
+14:15:16.2222	141516.2222	141515.2222	141516.2222	70758.11110000
+select max(a), min(a), sum(a), avg(a) from t1;
+max(a)	min(a)	sum(a)	avg(a)
+14:15:16.2222	01:02:13.3332	151729.5554	75864.77770000
+create table t2 select a, a+0, a-1, a*1, a/2 from t1;
+create table t3 select max(a), min(a), sum(a), avg(a) from t1;
+show create table t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `a` time(4) DEFAULT NULL,
+  `a+0` decimal(16,4) DEFAULT NULL,
+  `a-1` decimal(16,4) DEFAULT NULL,
+  `a*1` decimal(16,4) DEFAULT NULL,
+  `a/2` decimal(19,8) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+show create table t3;
+Table	Create Table
+t3	CREATE TABLE `t3` (
+  `max(a)` time(4) DEFAULT NULL,
+  `min(a)` time(4) DEFAULT NULL,
+  `sum(a)` decimal(37,4) DEFAULT NULL,
+  `avg(a)` decimal(19,8) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2, t3;
+create table t1 (f0_time time(0), f1_time time(1), f2_time time(2), f3_time time(3), f4_time time(4), f5_time time(5), f6_time time(6));
+insert t1 values ( '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432');
+Warnings:
+Level	Note
+Code	1265
+Message	Data truncated for column 'f0_time' at row 1
+Level	Note
+Code	1265
+Message	Data truncated for column 'f1_time' at row 1
+Level	Note
+Code	1265
+Message	Data truncated for column 'f2_time' at row 1
+Level	Note
+Code	1265
+Message	Data truncated for column 'f3_time' at row 1
+Level	Note
+Code	1265
+Message	Data truncated for column 'f4_time' at row 1
+Level	Note
+Code	1265
+Message	Data truncated for column 'f5_time' at row 1
+Level	Note
+Code	1265
+Message	Data truncated for column 'f6_time' at row 1
+select * from t1;
+f0_time	11:14:17
+f1_time	11:14:17.7
+f2_time	11:14:17.76
+f3_time	11:14:17.765
+f4_time	11:14:17.7654
+f5_time	11:14:17.76543
+f6_time	11:14:17.765432
+select cast(f0_time as time(4)) time4_f0_time, cast(f1_time as datetime(3)) datetime3_f1_time, cast(f2_time as date) date_f2_time, cast(f4_time as double) double_f3_time, cast(f4_time as decimal(40,5)) decimal5_f4_time, cast(f5_time as signed) bigint_f5_time, cast(f6_time as char(255)) varchar_f6_time from t1;
+time4_f0_time	11:14:17.0000
+datetime3_f1_time	0000-00-00 11:14:17.700
+date_f2_time	0000-00-00
+double_f3_time	111417.7654
+decimal5_f4_time	111417.76540
+bigint_f5_time	111417
+varchar_f6_time	11:14:17.765432
+create table t2 (time4_f0_time time(4), datetime3_f1_time datetime(3), date_f2_time date, double_f3_time double, decimal5_f4_time decimal(40,5), bigint_f5_time bigint, varchar_f6_time varchar(255));
+insert t2 select * from t1;
+Warnings:
+Level	Note
+Code	1265
+Message	Data truncated for column 'date_f2_time' at row 1
+select * from t2;
+time4_f0_time	11:14:17.0000
+datetime3_f1_time	0000-00-00 11:14:17.700
+date_f2_time	0000-00-00
+double_f3_time	111417.765
+decimal5_f4_time	111417.76540
+bigint_f5_time	111417
+varchar_f6_time	11:14:17.765432
+alter table t1 change f0_time time4_f0_time time(4), change f1_time datetime3_f1_time datetime(3), change f2_time date_f2_time date, change f3_time double_f3_time double, change f4_time decimal5_f4_time decimal(40,5), change f5_time bigint_f5_time bigint, change f6_time varchar_f6_time varchar(255);
+Warnings:
+Level	Note
+Code	1265
+Message	Data truncated for column 'date_f2_time' at row 1
+select * from t1;
+time4_f0_time	11:14:17.0000
+datetime3_f1_time	0000-00-00 11:14:17.700
+date_f2_time	0000-00-00
+double_f3_time	111417.765
+decimal5_f4_time	111417.76540
+bigint_f5_time	111417
+varchar_f6_time	11:14:17.765432
+alter table t1 modify time4_f0_time time(0), modify datetime3_f1_time time(1), modify date_f2_time time(2), modify double_f3_time time(3), modify decimal5_f4_time time(4), modify bigint_f5_time time(5), modify varchar_f6_time time(6);
+select * from t1;
+time4_f0_time	11:14:17
+datetime3_f1_time	11:14:17.7
+date_f2_time	00:00:00.00
+double_f3_time	11:14:17.765
+decimal5_f4_time	11:14:17.7654
+bigint_f5_time	11:14:17.00000
+varchar_f6_time	11:14:17.765432
+delete from t1;
+insert t1 select * from t2;
+select * from t1;
+time4_f0_time	11:14:17
+datetime3_f1_time	11:14:17.7
+date_f2_time	00:00:00.00
+double_f3_time	11:14:17.764
+decimal5_f4_time	11:14:17.7654
+bigint_f5_time	11:14:17.00000
+varchar_f6_time	11:14:17.765432
+drop table t1, t2;
 create table t1 (a time(6), b time(6));
 create procedure foo(x time, y time(4)) insert into t1 values (x, y);
 call foo('2010-02-03 4:5:6.789123', '2010-02-03 4:5:6.789123');
@@ -179,18 +301,40 @@ a	b
 04:05:06.000000	04:05:06.789100
 drop view v1;
 drop table t1, t2;
-create table t1 (a time(4) not null);
-insert into t1 values ('-00:00:00.6'),('-00:00:00.7'),('-00:00:00.8'),('-00:00:00.9'),('-00:00:01.0'),('-00:00:01.1'),('-00:00:01.000000'),('-00:00:01.100001'),('-00:00:01.000002'),('-00:00:01.090000');
-select * from t1;
+create table t1 (a time(4) not null, key(a));
+insert into t1 values ('1:2:3.001'),('1:2:3'), ('-00:00:00.6'),('-00:00:00.7'),('-00:00:00.8'),('-00:00:00.9'),('-00:00:01.0'),('-00:00:01.1'),('-00:00:01.000000'),('-00:00:01.100001'),('-00:00:01.000002'),('-00:00:01.090000');
+select * from t1 order by a;
 a
+-00:00:01.1000
+-00:00:01.1000
+-00:00:01.0900
+-00:00:01.0000
+-00:00:01.0000
+-00:00:01.0000
+-00:00:00.9000
+-00:00:00.8000
+-00:00:00.7000
+-00:00:00.6000
+01:02:03.0000
+01:02:03.0010
+select * from t1 order by a desc;
+a
+01:02:03.0010
+01:02:03.0000
 -00:00:00.6000
 -00:00:00.7000
 -00:00:00.8000
 -00:00:00.9000
 -00:00:01.0000
--00:00:01.1000
 -00:00:01.0000
--00:00:01.1000
 -00:00:01.0000
 -00:00:01.0900
+-00:00:01.1000
+-00:00:01.1000
+select min(a - interval 1 hour), max(a - interval 1 hour) from t1 where a < 0;
+min(a - interval 1 hour)	max(a - interval 1 hour)
+-01:00:01.1000	-01:00:00.6000
 drop table t1;
+select cast(1e-6 as time(6));
+cast(1e-6 as time(6))
+00:00:00.000001

mysql-test/r/type_timestamp_hires.result

@@ -115,7 +115,114 @@ Table	Create Table
 t3	CREATE TABLE `t3` (
   `a` timestamp(4) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
+drop table t2, t3;
+insert t1 values ('2010-12-13 14:15:16.222222');
+select a, a+0, a-1, a*1, a/2 from t1;
+a	a+0	a-1	a*1	a/2
+2012-12-11 01:02:13.3332	20121211010213.3332	20121211010212.3332	20121211010213.3332	10060605505106.66660000
+2010-12-13 14:15:16.2222	20101213141516.2222	20101213141515.2222	20101213141516.2222	10050606570758.11110000
+select max(a), min(a), sum(a), avg(a) from t1;
+max(a)	min(a)	sum(a)	avg(a)
+2012-12-11 01:02:13.3332	2010-12-13 14:15:16.2222	40222424151729.5554	20111212075864.77770000
+create table t2 select a, a+0, a-1, a*1, a/2 from t1;
+create table t3 select max(a), min(a), sum(a), avg(a) from t1;
+show create table t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `a` timestamp(4) NOT NULL DEFAULT '0000-00-00 00:00:00.0000',
+  `a+0` decimal(25,4) NOT NULL DEFAULT '0.0000',
+  `a-1` decimal(25,4) NOT NULL DEFAULT '0.0000',
+  `a*1` decimal(25,4) NOT NULL DEFAULT '0.0000',
+  `a/2` decimal(28,8) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+show create table t3;
+Table	Create Table
+t3	CREATE TABLE `t3` (
+  `max(a)` timestamp(4) NULL DEFAULT NULL,
+  `min(a)` timestamp(4) NULL DEFAULT NULL,
+  `sum(a)` decimal(46,4) DEFAULT NULL,
+  `avg(a)` decimal(28,8) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2, t3;
+create table t1 (f0_timestamp timestamp(0), f1_timestamp timestamp(1), f2_timestamp timestamp(2), f3_timestamp timestamp(3), f4_timestamp timestamp(4), f5_timestamp timestamp(5), f6_timestamp timestamp(6));
+insert t1 values ( '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432');
+select * from t1;
+f0_timestamp	2010-11-12 11:14:17
+f1_timestamp	2010-11-12 11:14:17.7
+f2_timestamp	2010-11-12 11:14:17.76
+f3_timestamp	2010-11-12 11:14:17.765
+f4_timestamp	2010-11-12 11:14:17.7654
+f5_timestamp	2010-11-12 11:14:17.76543
+f6_timestamp	2010-11-12 11:14:17.765432
+select cast(f0_timestamp as time(4)) time4_f0_timestamp, cast(f1_timestamp as datetime(3)) datetime3_f1_timestamp, cast(f2_timestamp as date) date_f2_timestamp, cast(f4_timestamp as double) double_f3_timestamp, cast(f4_timestamp as decimal(40,5)) decimal5_f4_timestamp, cast(f5_timestamp as signed) bigint_f5_timestamp, cast(f6_timestamp as char(255)) varchar_f6_timestamp from t1;
+time4_f0_timestamp	11:14:17.0000
+datetime3_f1_timestamp	2010-11-12 11:14:17.700
+date_f2_timestamp	2010-11-12
+double_f3_timestamp	20101112111417.8
+decimal5_f4_timestamp	20101112111417.76540
+bigint_f5_timestamp	20101112111417
+varchar_f6_timestamp	2010-11-12 11:14:17.765432
+create table t2 (time4_f0_timestamp time(4), datetime3_f1_timestamp datetime(3), date_f2_timestamp date, double_f3_timestamp double, decimal5_f4_timestamp decimal(40,5), bigint_f5_timestamp bigint, varchar_f6_timestamp varchar(255));
+insert t2 select * from t1;
+Warnings:
+Level	Note
+Code	1265
+Message	Data truncated for column 'time4_f0_timestamp' at row 1
+Level	Note
+Code	1265
+Message	Data truncated for column 'date_f2_timestamp' at row 1
+select * from t2;
+time4_f0_timestamp	11:14:17.0000
+datetime3_f1_timestamp	2010-11-12 11:14:17.700
+date_f2_timestamp	2010-11-12
+double_f3_timestamp	20101112111417.8
+decimal5_f4_timestamp	20101112111417.76540
+bigint_f5_timestamp	20101112111417
+varchar_f6_timestamp	2010-11-12 11:14:17.765432
+alter table t1 change f0_timestamp time4_f0_timestamp time(4), change f1_timestamp datetime3_f1_timestamp datetime(3), change f2_timestamp date_f2_timestamp date, change f3_timestamp double_f3_timestamp double, change f4_timestamp decimal5_f4_timestamp decimal(40,5), change f5_timestamp bigint_f5_timestamp bigint, change f6_timestamp varchar_f6_timestamp varchar(255);
+Warnings:
+Level	Note
+Code	1265
+Message	Data truncated for column 'time4_f0_timestamp' at row 1
+Level	Note
+Code	1265
+Message	Data truncated for column 'date_f2_timestamp' at row 1
+select * from t1;
+time4_f0_timestamp	11:14:17.0000
+datetime3_f1_timestamp	2010-11-12 11:14:17.700
+date_f2_timestamp	2010-11-12
+double_f3_timestamp	20101112111417.8
+decimal5_f4_timestamp	20101112111417.76540
+bigint_f5_timestamp	20101112111417
+varchar_f6_timestamp	2010-11-12 11:14:17.765432
+alter table t1 modify time4_f0_timestamp timestamp(0), modify datetime3_f1_timestamp timestamp(1), modify date_f2_timestamp timestamp(2), modify double_f3_timestamp timestamp(3), modify decimal5_f4_timestamp timestamp(4), modify bigint_f5_timestamp timestamp(5), modify varchar_f6_timestamp timestamp(6);
+Warnings:
+Level	Warning
+Code	1265
+Message	Data truncated for column 'time4_f0_timestamp' at row 1
+select * from t1;
+time4_f0_timestamp	0000-00-00 00:00:00
+datetime3_f1_timestamp	2010-11-12 11:14:17.7
+date_f2_timestamp	2010-11-12 00:00:00.00
+double_f3_timestamp	2010-11-12 11:14:17.800
+decimal5_f4_timestamp	2010-11-12 11:14:17.7654
+bigint_f5_timestamp	2010-11-12 11:14:17.00000
+varchar_f6_timestamp	2010-11-12 11:14:17.765432
+delete from t1;
+insert t1 select * from t2;
+Warnings:
+Level	Warning
+Code	1265
+Message	Data truncated for column 'time4_f0_timestamp' at row 1
+select * from t1;
+time4_f0_timestamp	0000-00-00 00:00:00
+datetime3_f1_timestamp	2010-11-12 11:14:17.7
+date_f2_timestamp	2010-11-12 00:00:00.00
+double_f3_timestamp	2010-11-12 11:14:17.765
+decimal5_f4_timestamp	2010-11-12 11:14:17.7654
+bigint_f5_timestamp	2010-11-12 11:14:17.00000
+varchar_f6_timestamp	2010-11-12 11:14:17.765432
+drop table t1, t2;
 create table t1 (a timestamp(6), b timestamp(6));
 create procedure foo(x timestamp, y timestamp(4)) insert into t1 values (x, y);
 call foo('2010-02-03 4:5:6.789123', '2010-02-03 4:5:6.789123');

mysql-test/suite/innodb/r/innodb_bug54044.result

 CREATE TEMPORARY TABLE table_54044 ENGINE = INNODB
 AS SELECT IF(NULL  IS NOT NULL, NULL, NULL);
-ERROR HY000: Can't create table 'test.table_54044' (errno: -1)

mysql-test/suite/innodb/r/innodb_mysql.result

@@ -2535,7 +2535,7 @@ INSERT INTO t1 VALUES (0);
 SET SQL_MODE='STRICT_ALL_TABLES';
 CREATE TABLE t2 
 SELECT LEAST((SELECT '' FROM t1),NOW()) FROM `t1`;
-ERROR 22007: Truncated incorrect datetime value: ''
+ERROR 22007: Incorrect datetime value: ''
 DROP TABLE t1;
 SET SQL_MODE=DEFAULT;
 #

mysql-test/suite/innodb/t/innodb_bug54044.test

-# This is the test for bug #54044. Special handle MYSQL_TYPE_NULL type
-# during create table, so it will not trigger assertion failure.
-
 --source include/have_innodb.inc
 
-# This 'create table' operation should fail because of
-# using NULL datatype
---error ER_CANT_CREATE_TABLE
 CREATE TEMPORARY TABLE table_54044 ENGINE = INNODB
  AS SELECT IF(NULL  IS NOT NULL, NULL, NULL); 

mysql-test/suite/innodb_plugin/r/innodb_bug54044.result

 CREATE TEMPORARY TABLE table_54044 ENGINE = INNODB
 AS SELECT IF(NULL  IS NOT NULL, NULL, NULL);
-ERROR HY000: Can't create table 'test.table_54044' (errno: -1)

mysql-test/suite/innodb_plugin/t/innodb_bug54044.test

-# This is the test for bug #54044. Special handle MYSQL_TYPE_NULL type
-# during create table, so it will not trigger assertion failure.
-
 --source include/have_innodb_plugin.inc
 
-# This 'create table' operation should fail because of
-# using NULL datatype
---error ER_CANT_CREATE_TABLE
 CREATE TEMPORARY TABLE table_54044 ENGINE = INNODB
  AS SELECT IF(NULL  IS NOT NULL, NULL, NULL); 

mysql-test/suite/maria/r/ps_maria.result

@@ -64,7 +64,7 @@ def	test	t9	t9	c12	c12	246	10	6	Y	0	4	63
 def	test	t9	t9	c13	c13	10	10	10	Y	128	0	63
 def	test	t9	t9	c14	c14	12	19	19	Y	128	0	63
 def	test	t9	t9	c15	c15	7	19	19	N	9377	0	63
-def	test	t9	t9	c16	c16	11	9	8	Y	128	0	63
+def	test	t9	t9	c16	c16	11	10	8	Y	128	0	63
 def	test	t9	t9	c17	c17	13	4	4	Y	32864	0	63
 def	test	t9	t9	c18	c18	1	4	1	Y	32768	0	63
 def	test	t9	t9	c19	c19	1	1	1	Y	32768	0	63
@@ -1793,8 +1793,8 @@ t5	CREATE TABLE `t5` (
   `param08` longtext,
   `const09` datetime DEFAULT NULL,
   `param09` longblob,
-  `const10` double NOT NULL DEFAULT '0',
-  `param10` double DEFAULT NULL,
+  `const10` decimal(22,6) NOT NULL DEFAULT '0.000000',
+  `param10` decimal(65,30) DEFAULT NULL,
   `const11` int(4) DEFAULT NULL,
   `param11` bigint(20) DEFAULT NULL,
   `const12` binary(0) DEFAULT NULL,
@@ -1823,8 +1823,8 @@ def	test	t5	t5	const08	const08	253	19	19	N	1	0	8
 def	test	t5	t5	param08	param08	252	4294967295	19	Y	16	0	8
 def	test	t5	t5	const09	const09	12	19	19	Y	128	0	63
 def	test	t5	t5	param09	param09	252	4294967295	19	Y	144	0	63
-def	test	t5	t5	const10	const10	5	49	9	N	32769	31	63
-def	test	t5	t5	param10	param10	5	23	9	Y	32768	31	63
+def	test	t5	t5	const10	const10	246	24	16	N	1	6	63
+def	test	t5	t5	param10	param10	246	67	40	Y	0	30	63
 def	test	t5	t5	const11	const11	3	4	4	Y	32768	0	63
 def	test	t5	t5	param11	param11	8	20	4	Y	32768	0	63
 def	test	t5	t5	const12	const12	254	0	0	Y	128	0	63
@@ -1850,8 +1850,8 @@ const08	1991-08-05 01:01:01
 param08	1991-08-05 01:01:01
 const09	1991-08-05 01:01:01
 param09	1991-08-05 01:01:01
-const10	662680861
-param10	662680861
+const10	662680861.000000
+param10	662680861.000000000000000000000000000000
 const11	1991
 param11	1991
 const12	NULL
@@ -3215,7 +3215,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 insert into t9
 ( c1, c13, c14, c15, c16, c17 )
@@ -3225,7 +3225,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 prepare stmt1 from "insert into t9
   ( c1, c13, c14, c15, c16, c17 )
@@ -3236,7 +3236,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 prepare stmt2 from "insert into t9
   ( c1, c13, c14, c15, c16, c17 )
@@ -3247,7 +3247,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 set @arg00= 1.0e+10 ;
 insert into t9
@@ -3256,7 +3256,7 @@ values
 ( 50, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10 ) ;
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 insert into t9
 ( c1, c13, c14, c15, c16, c17 )
@@ -3273,7 +3273,7 @@ values
 execute stmt1 ;
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 prepare stmt2 from "insert into t9
   ( c1, c13, c14, c15, c16, c17 )
@@ -3282,7 +3282,7 @@ values
 execute stmt2 using @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 set @arg00= 'abc' ;
 set @arg00= NULL ;
@@ -3338,14 +3338,14 @@ c1	c13	c14	c15	c16	c17
 31	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991
 32	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991
 33	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991
-40	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-41	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-42	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-43	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-50	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
+40	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+41	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+42	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+43	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+50	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
 51	2010-00-00	2010-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-52	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-53	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
+52	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+53	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
 60	NULL	NULL	1991-01-01 01:01:01	NULL	NULL
 61	NULL	NULL	1991-01-01 01:01:01	NULL	NULL
 62	NULL	NULL	1991-01-01 01:01:01	NULL	NULL

mysql-test/suite/optimizer_unfixed_bugs/r/bug43618.result

@@ -43,15 +43,9 @@ SELECT * FROM t1 WHERE c1 BETWEEN '0000-00-00' AND '2010-00-01 00:00:00' ORDER B
 c1	c2	c3	c4
 2009-01-29 11:11:27	2009-01-29 00:00:00	2009-01-29	2009-01-29 00:00:00
 2008-01-01 00:00:00	NULL	2008-01-02	2008-01-03 00:00:00
-Warnings:
-Warning	1292	Incorrect datetime value: '2010-00-01 00:00:00' for column 'c1' at row 1
-Warning	1292	Incorrect datetime value: '2010-00-01 00:00:00' for column 'c1' at row 1
 SELECT * FROM t1 WHERE c2 BETWEEN '1971-01-01 00:00:01' AND '2010-10-00 00:00:00' ORDER BY c2 DESC LIMIT 2;
 c1	c2	c3	c4
 2009-01-29 11:11:27	2009-01-29 00:00:00	2009-01-29	2009-01-29 00:00:00
 2007-05-25 00:00:00	2007-05-25 00:00:00	2007-05-26	2007-05-26 00:00:00
-Warnings:
-Warning	1292	Incorrect datetime value: '2010-10-00 00:00:00' for column 'c2' at row 1
-Warning	1292	Incorrect datetime value: '2010-10-00 00:00:00' for column 'c2' at row 1
 DROP TABLE t1;
 set time_zone= @save_time_zone;

mysql-test/suite/pbxt/r/func_sapdb.result

@@ -196,7 +196,7 @@ f8	date	YES		NULL
 f9	time(6)	YES		NULL	
 select * from t1;
 f1	f2	f3	f4	f5	f6	f7	f8	f9
-1997-01-01	1998-01-02 01:01:00.000003	49:01:01.000001	46:58:57.999999	-24:00:00.000001	10:11:12	2001-12-01 01:01:01.000000	1997-12-31	23:59:59.000001
+1997-01-01	1998-01-02 01:01:00.000002	49:01:00.000002	46:58:57.999999	-24:00:00.000001	10:11:12	2001-12-01 01:01:01.000000	1997-12-31	23:59:59.000001
 create table test(t1 datetime, t2 time, t3 time, t4 datetime);
 insert into test values 
 ('2001-01-01 01:01:01', '01:01:01', null, '2001-02-01 01:01:01'),
@@ -241,6 +241,8 @@ a
 select microsecond(19971231235959.01) as a;
 a
 10000
+Warnings:
+Warning	1292	Truncated incorrect time value: '19971231235959.01'
 select date_add("1997-12-31",INTERVAL "10.09" SECOND_MICROSECOND) as a;
 a
 1997-12-31 00:00:10.090000

mysql-test/suite/pbxt/r/func_timestamp.result

@@ -7,7 +7,7 @@ SELECT CONCAT(Jahr,'-',Monat,'-',Tag,' ',Zeit) AS Date,
 UNIX_TIMESTAMP(CONCAT(Jahr,'-',Monat,'-',Tag,' ',Zeit)) AS Unix
 FROM t1;
 Date	Unix
-1998-9-16 09:26:00	905927160
-1998-9-16 09:26:00	905927160
+1998-9-16 09:26:00	905927160.000000
+1998-9-16 09:26:00	905927160.000000
 drop table t1;
 set time_zone= @@global.time_zone;

mysql-test/suite/pbxt/r/range.result

@@ -923,13 +923,10 @@ INSERT INTO t1 VALUES
 EXPLAIN SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ref	PRIMARY	PRIMARY	20	const	2	Using index condition
-Warnings:
-Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00' for column 'started' at row 1
 SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';
 item	started	price
 Warnings:
-Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00' for column 'started' at row 1
-Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00' for column 'started' at row 0
+Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00'
 SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-02 00:00:00';
 item	started	price
 A1	2005-11-01 08:00:00	1000.000
@@ -941,7 +938,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';
 item	started	price
 Warnings:
-Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00' for column 'started' at row 0
+Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00'
 SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-02 00:00:00';
 item	started	price
 A1	2005-11-01 08:00:00	1000.000

mysql-test/suite/pbxt/r/select.result

@@ -2121,8 +2121,8 @@ INSERT INTO t2 VALUES (1,3,10,'2002-06-01 08:00:00',35),(1,3,1010,'2002-06-01 12
 SELECT a.gvid, (SUM(CASE b.sampletid WHEN 140 THEN b.samplevalue ELSE 0 END)) as the_success,(SUM(CASE b.sampletid WHEN 141 THEN b.samplevalue ELSE 0 END)) as the_fail,(SUM(CASE b.sampletid WHEN 142 THEN b.samplevalue ELSE 0 END)) as the_size,(SUM(CASE b.sampletid WHEN 143 THEN b.samplevalue ELSE 0 END)) as the_time FROM t1 a, t2 b WHERE a.hmid = b.hmid AND a.volid = b.volid AND b.sampletime >= 'wrong-date-value' AND b.sampletime < 'wrong-date-value' AND b.sampletid IN (140, 141, 142, 143) GROUP BY a.gvid;
 gvid	the_success	the_fail	the_size	the_time
 Warnings:
-Warning	1292	Incorrect datetime value: 'wrong-date-value' for column 'sampletime' at row 0
-Warning	1292	Incorrect datetime value: 'wrong-date-value' for column 'sampletime' at row 0
+Warning	1292	Incorrect datetime value: 'wrong-date-value'
+Warning	1292	Incorrect datetime value: 'wrong-date-value'
 SELECT a.gvid, (SUM(CASE b.sampletid WHEN 140 THEN b.samplevalue ELSE 0 END)) as the_success,(SUM(CASE b.sampletid WHEN 141 THEN b.samplevalue ELSE 0 END)) as the_fail,(SUM(CASE b.sampletid WHEN 142 THEN b.samplevalue ELSE 0 END)) as the_size,(SUM(CASE b.sampletid WHEN 143 THEN b.samplevalue ELSE 0 END)) as the_time FROM t1 a, t2 b WHERE a.hmid = b.hmid AND a.volid = b.volid AND b.sampletime >= NULL AND b.sampletime < NULL AND b.sampletid IN (140, 141, 142, 143) GROUP BY a.gvid;
 gvid	the_success	the_fail	the_size	the_time
 DROP TABLE t1,t2;
@@ -3265,7 +3265,7 @@ f1	f2
 4	2005-10-01
 5	2005-12-30
 Warnings:
-Warning	1292	Incorrect date value: '2005-09-3a' for column 'f2' at row 0
+Warning	1292	Truncated incorrect date value: '2005-09-3a'
 select * from t1 where f2 <= '2005-09-31';
 f1	f2
 1	2005-01-01
@@ -3276,7 +3276,7 @@ f1	f2
 1	2005-01-01
 2	2005-09-01
 Warnings:
-Warning	1292	Incorrect date value: '2005-09-3a' for column 'f2' at row 0
+Warning	1292	Truncated incorrect date value: '2005-09-3a'
 drop table t1;
 create table t1 (f1 int, f2 int);
 insert into t1 values (1, 30), (2, 20), (3, 10);

mysql-test/suite/pbxt/r/type_datetime.result

@@ -191,4 +191,4 @@ CAST(CAST('2006-08-10 10:11:12' AS DATETIME) + INTERVAL 14 MICROSECOND AS DECIMA
 20060810101112.000014
 SELECT CAST(CAST('10:11:12.098700' AS TIME) AS DECIMAL(20,6));
 CAST(CAST('10:11:12.098700' AS TIME) AS DECIMAL(20,6))
-101112.098700
+101112.000000

mysql-test/suite/pbxt/r/type_time.result

@@ -29,8 +29,8 @@ insert into t1 values("10.22.22"),(1234567),(123456789),(123456789.10),("10 22:2
 Warnings:
 Warning	1265	Data truncated for column 't' at row 1
 Warning	1265	Data truncated for column 't' at row 2
-Warning	1264	Out of range value for column 't' at row 3
-Warning	1264	Out of range value for column 't' at row 4
+Warning	1265	Data truncated for column 't' at row 3
+Warning	1265	Data truncated for column 't' at row 4
 Warning	1265	Data truncated for column 't' at row 6
 select * from t1;
 t
@@ -55,8 +55,8 @@ t
 36:30:31
 00:00:10
 00:00:00
-838:59:59
-838:59:59
+00:00:00
+00:00:00
 262:22:00
 00:00:12
 drop table t1;

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

@@ -136,7 +136,7 @@ create table t3 select 1 union select UUID();
 create table t4 select * from t1 where 3 in (select 1 union select 2 union select UUID() union select 3);
 create table t5 select * from t1 where 3 in (select 1 union select 2 union select curdate() union select 3);
 Warnings:
-Warning	1292	Truncated incorrect date value: '3'
+Warning	1292	Incorrect datetime value: '3'
 insert into t5 select UUID() from t1 where 3 in (select 1 union select 2 union select 3 union select * from t4);
 create procedure foo()
 begin

mysql-test/suite/vcol/r/vcol_misc.result

@@ -225,10 +225,10 @@ c	int(11)	YES		NULL	VIRTUAL
 d	varchar(5)	YES		NULL	PERSISTENT
 show full columns from t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-a	int(11)	NULL	NO		NULL		select,insert,update,references	
-b	varchar(32)	latin1_swedish_ci	YES		NULL		select,insert,update,references	
-c	int(11)	NULL	YES		NULL	VIRTUAL	select,insert,update,references	
-d	varchar(5)	latin1_swedish_ci	YES		NULL	PERSISTENT	select,insert,update,references	
+a	int(11)	NULL	NO		NULL		#	
+b	varchar(32)	latin1_swedish_ci	YES		NULL		#	
+c	int(11)	NULL	YES		NULL	VIRTUAL	#	
+d	varchar(5)	latin1_swedish_ci	YES		NULL	PERSISTENT	#	
 INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,NULL);
 UPDATE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND  `d`='a';
 Warnings:

mysql-test/suite/vcol/t/vcol_misc.test

@@ -195,6 +195,7 @@ CREATE TABLE `t1` (
 ) ENGINE=MyISAM;
 show create table t1;
 show columns from t1;
+--replace_column 8 #
 show full columns from t1;
 INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,NULL);
 UPDATE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND  `d`='a';

mysql-test/t/distinct.test

@@ -622,6 +622,25 @@ create table t1 (a varchar(100));
 insert t1 values ('2010-10-10'), ('20101010');
 select * from t1 where a = DATE('2010-10-10');
 select distinct a from t1 where a = DATE('2010-10-10');
+explain select distinct a from t1 where a = DATE('2010-10-10');
+drop table t1;
+#
+# test_if_equality_guarantees_uniqueness() and different type combinations
+#
+--echo # date = string
+create table t1 (a date);
+insert t1 values ('2010-10-10'), ('20101010');
+explain select distinct a from t1 where a = '2010-10-10';
+drop table t1;
+--echo # double = string
+create table t1 (a double);
+insert t1 values (2), (2);
+explain select distinct a from t1 where a = '2';
+--echo # double = int
+explain select distinct a from t1 where a = 2;
+--echo # string = double
+alter table t1 modify a varchar(100);
+explain select distinct a from t1 where a = 2e0;
 drop table t1;
 
 #

mysql-test/t/dyncol.test

@@ -87,7 +87,7 @@ select column_get(column_create(1, -1212 AS int), 1 as unsigned int);
 select column_get(column_create(1, 99999999999999999999999999999 AS decimal), 1 as unsigned int);
 select column_get(column_create(1, 999.9999999999999999 AS decimal), 1 as unsigned int);
 select column_get(column_create(1, -1 AS decimal), 1 as unsigned int);
---replace_result 1e+029 1e+29
+--replace_result e+029 e+29
 select column_get(column_create(1, 99999999999999999999999999999 AS double), 1 as unsigned int);
 select column_get(column_create(1, 999.9 AS double), 1 as unsigned int);
 select column_get(column_create(1, -1 AS double), 1 as unsigned int);
@@ -110,6 +110,7 @@ select column_get(column_create(1, "-1212" AS char), 1 as int);
 select column_get(column_create(1, "2011-04-05" AS date), 1 as int);
 select column_get(column_create(1, "8:46:06.23434" AS time), 1 as int);
 select column_get(column_create(1, "8:46:06.23434" AS time(6)), 1 as int);
+select column_get(column_create(1, "-808:46:06.23434" AS time(6)), 1 as int);
 select column_get(column_create(1, "2011-04-05 8:46:06.23434" AS datetime(6)), 1 as int);
 select column_get(column_create(1, NULL AS int), 1 as int);
 --echo #column gett truncation & warnings
@@ -118,7 +119,7 @@ select column_get(column_create(1, 99999999999999999999999999999 AS decimal), 1
 select column_get(column_create(1, -99999999999999999999999999999 AS decimal), 1 as int);
 select column_get(column_create(1, 999.9999999999999999 AS decimal), 1 as int);
 select column_get(column_create(1, 999.9 AS double), 1 as int);
---replace_result 1e+029 1e+29
+--replace_result e+029 e+29
 select column_get(column_create(1, -99999999999999999999999999999 AS double), 1 as int);
 select column_get(column_create(1, "-1212III" AS char), 1 as int);
 select column_get(column_create(1, "1212III" AS char), 1 as int);
@@ -145,6 +146,7 @@ select column_get(column_create(1, "2011-04-05" AS date), 1 as char charset utf8
 select column_get(column_create(1, "8:46:06.23434" AS time), 1 as char charset utf8);
 select column_get(column_create(1, "8:46:06.23434" AS time(0)), 1 as char charset utf8);
 select column_get(column_create(1, "8:46:06.23434" AS time(6)), 1 as char charset utf8);
+select column_get(column_create(1, "-808:46:06.23434" AS time(6)), 1 as char charset utf8);
 select column_get(column_create(1, "2011-04-05 8:46:06.23434" AS datetime), 1 as char charset utf8);
 select column_get(column_create(1, "2011-04-05 8:46:06.23434" AS datetime(0)), 1 as char charset utf8);
 select column_get(column_create(1, "2011-04-05 8:46:06.23434" AS datetime(6)), 1 as char charset utf8);
@@ -169,6 +171,7 @@ select column_get(column_create(1, -99999999999999999999999999999 AS decimal), 1
 select column_get(column_create(1, "2011-04-05" AS date), 1 as double);
 select column_get(column_create(1, "8:46:06.23434" AS time), 1 as double);
 select column_get(column_create(1, "8:46:06.23434" AS time(6)), 1 as double);
+select column_get(column_create(1, "-808:46:06.23434" AS time(6)), 1 as double);
 select column_get(column_create(1, "2011-04-05 8:46:06.23434" AS datetime), 1 as double);
 select column_get(column_create(1, "2011-04-05 8:46:06.23434" AS datetime(6)), 1 as double);
 # The replace result is needed for windows.
@@ -197,6 +200,7 @@ select column_get(column_create(1, -99999999999999999999999999999 AS decimal), 1
 select column_get(column_create(1, "2011-04-05" AS date), 1 as decimal(32,6));
 select column_get(column_create(1, "8:46:06.23434" AS time), 1 as decimal(32,6));
 select column_get(column_create(1, "8:46:06.23434" AS time(6)), 1 as decimal(32,6));
+select column_get(column_create(1, "-808:46:06.23434" AS time(6)), 1 as decimal(32,6));
 select column_get(column_create(1, "2011-04-05 8:46:06.123456" AS datetime), 1 as decimal(32,6));
 select column_get(column_create(1, "2011-04-05 8:46:06.123456" AS datetime(6)), 1 as decimal(32,6));
 select column_get(column_create(1, "2011-04-05 8:46:06.12345678" AS datetime(6)), 1 as decimal(32,8));
@@ -245,6 +249,7 @@ select column_get(column_create(1, 0), 1 as datetime);
 select column_get(column_create(1, "2001021"), 1 as datetime);
 
 select column_get(column_create(1, "8:46:06.23434" AS time), 1 as datetime);
+select column_get(column_create(1, "-808:46:06.23434" AS time), 1 as datetime);
 
 set @@sql_mode="allow_invalid_dates";
 select column_get(column_create(1, "2011-02-30 18:46:06.23434" AS CHAR), 1 as datetime);
@@ -254,11 +259,12 @@ set @@sql_mode="";
 
 -- echo # column get datetime truncation & warnings
 select column_get(column_create(1, "1223.5aa" AS char), 1 as datetime);
+--replace_result e+019 e+19
 select column_get(column_create(1, 18446744073709551615 AS unsigned int), 1 as datetime);
 select column_get(column_create(1, 9223372036854775807 AS int), 1 as datetime);
 select column_get(column_create(1, -9223372036854775808 AS int), 1 as datetime); 
 select column_get(column_create(1, 99999999999999999999999999999 AS decimal(32,10)), 1 as datetime);
---replace_regex /9.9999999999999991e\+028   /9.99999999999999914332e+28/
+--replace_result e+029 e+29
 select column_get(column_create(1, 99999999999999999999999999999 AS double), 1 as datetime);
 select column_get(column_create(1, "2011-02-32 8:46:06.23434" AS CHAR), 1 as datetime);
 select column_get(column_create(1, "2011-13-01 8:46:06.23434" AS CHAR), 1 as datetime);
@@ -300,11 +306,12 @@ set @@sql_mode="";
 
 -- echo # column get date truncation & warnings
 select column_get(column_create(1, "1223.5aa" AS char), 1 as date);
+--replace_result e+019 e+19
 select column_get(column_create(1, 18446744073709551615 AS unsigned int), 1 as date);
 select column_get(column_create(1, 9223372036854775807 AS int), 1 as date);
 select column_get(column_create(1, -9223372036854775808 AS int), 1 as date); 
 select column_get(column_create(1, 99999999999999999999999999999 AS decimal(32,10)), 1 as date);
---replace_regex /9.9999999999999991e\+028   /9.99999999999999914332e+28/
+--replace_result e+029 e+29
 select column_get(column_create(1, 99999999999999999999999999999 AS double), 1 as date);
 select column_get(column_create(1, "2011-02-32 8:46:06.23434" AS CHAR), 1 as date);
 select column_get(column_create(1, "2011-13-01 8:46:06.23434" AS CHAR), 1 as date);
@@ -318,7 +325,9 @@ select column_get(column_create(1, "0" AS CHAR), 1 as date);
 select column_get(column_create(1, 20010203101112.121314 as double), 1 as time);
 select column_get(column_create(1, 20010203101112.121314 as decimal), 1 as time);
 select column_get(column_create(1, 20010203101112 as unsigned int), 1 as time);
+select column_get(column_create(1, 8080102 as unsigned int), 1 as time);
 select column_get(column_create(1, 20010203101112 as int), 1 as time);
+select column_get(column_create(1, -8080102 as int), 1 as time);
 select column_get(column_create(1, "20010203101112" as char), 1 as time);
 select column_get(column_create(1, "2001-02-03 10:11:12" as char), 1 as time);
 select column_get(column_create(1, "2001-02-03 10:11:12.121314" as char), 1 as time);
@@ -348,11 +357,12 @@ set @@sql_mode="";
 -- echo # column get date truncation & warnings
 select column_get(column_create(1, "1223.5aa" AS char), 1 as time);
 select column_get(column_create(1, "1223.5aa" AS char), 1 as time(3));
+--replace_result e+019 e+19
 select column_get(column_create(1, 18446744073709551615 AS unsigned int), 1 as time);
 select column_get(column_create(1, 9223372036854775807 AS int), 1 as time);
 select column_get(column_create(1, -9223372036854775808 AS int), 1 as time); 
 select column_get(column_create(1, 99999999999999999999999999999 AS decimal(32,10)), 1 as time);
---replace_result 1e+029 1e+29
+--replace_result e+029 e+29
 select column_get(column_create(1, 99999999999999999999999999999 AS double), 1 as time);
 select column_get(column_create(1, "2011-02-32 8:46:06.23434" AS CHAR), 1 as time);
 select column_get(column_create(1, "2011-13-01 8:46:06.23434" AS CHAR), 1 as time);

mysql-test/t/func_group.test

@@ -1063,7 +1063,8 @@ insert into t1 values
   (02,2002,20020101,"2002-01-01 23:59:59"),
   (60,2060,20600101,"2060-01-01 11:11:11"),
   (70,1970,19700101,"1970-11-11 22:22:22"),
-  (NULL,NULL,NULL,NULL);
+  (NULL,NULL,NULL,NULL),
+  (71,1971,19710101,"1971-11-11 22:22:22");
 select min(f1),max(f1) from t1;
 select min(f2),max(f2) from t1;
 select min(f3),max(f3) from t1;

mysql-test/t/func_if.test

@@ -161,8 +161,9 @@ DROP TABLE t1;
 #
 
 CREATE TABLE t1 (c LONGTEXT);
-INSERT INTO t1 VALUES(1), (2), (3), (4), ('12345678901234567890');
+INSERT INTO t1 VALUES(1), (2), (3), (4), ('1234567890123456789');
 
+SELECT IF(1, CAST(c AS UNSIGNED), 0) FROM t1;
 SELECT * FROM (SELECT MAX(IF(1, CAST(c AS UNSIGNED), 0)) FROM t1) AS te;
 SELECT * FROM (SELECT MAX(IFNULL(CAST(c AS UNSIGNED), 0)) FROM t1) AS te;
 

mysql-test/t/func_sapdb.test

@@ -91,8 +91,8 @@ select microsecond("1997-12-31 23:59:59.000001");
 
 create table t1 
 select makedate(1997,1) as f1,
-   addtime(cast("1997-12-31 23:59:59.000001" as datetime), "1 1:1:1.000002") as f2,
-   addtime(cast("23:59:59.999999" as time) , "1 1:1:1.000002") as f3,
+   addtime(cast("1997-12-31 23:59:59.000001" as datetime(6)), "1 1:1:1.000002") as f2,
+   addtime(cast("23:59:59.999999" as time(6)) , "1 1:1:1.000002") as f3,
    timediff("1997-12-31 23:59:59.000001","1997-12-30 01:01:01.000002") as f4,
    timediff("1997-12-30 23:59:59.000001","1997-12-31 23:59:59.000002") as f5,
    maketime(10,11,12) as f6,

mysql-test/t/func_time.test

@@ -17,6 +17,10 @@ select sec_to_time(9001),sec_to_time(9001)+0,time_to_sec("15:12:22"),
   sec_to_time(time_to_sec("0:30:47")/6.21);
 select sec_to_time(9001.1), time_to_sec('15:12:22.123456'), time_to_sec(15.5566778899);
 select sec_to_time(time_to_sec('-838:59:59'));
+select sec_to_time('9001.1'), sec_to_time('1234567890123.123');
+--replace_result e+042 e+42
+select sec_to_time(90011e-1), sec_to_time(1234567890123e30);
+select sec_to_time(1234567890123), sec_to_time('99999999999999999999999999999');
 select now()-curdate()*1000000-curtime();
 select strcmp(current_timestamp(),concat(current_date()," ",current_time()));
 select strcmp(localtime(),concat(current_date()," ",current_time()));
@@ -68,10 +72,10 @@ select date_format('1999-12-31','%x-%v'),date_format('2000-01-01','%x-%v');
 
 select dayname("1962-03-03"),dayname("1962-03-03")+0;
 select monthname("1972-03-04"),monthname("1972-03-04")+0;
-select time_format(19980131000000,'%H|%I|%k|%l|%i|%p|%r|%S|%T');
-select time_format(19980131010203,'%H|%I|%k|%l|%i|%p|%r|%S|%T');
-select time_format(19980131131415,'%H|%I|%k|%l|%i|%p|%r|%S|%T');
-select time_format(19980131010015,'%H|%I|%k|%l|%i|%p|%r|%S|%T');
+select time_format(000000,'%H|%I|%k|%l|%i|%p|%r|%S|%T'),date_format(19980131000000,'%H|%I|%k|%l|%i|%p|%r|%S|%T');
+select time_format(010203,'%H|%I|%k|%l|%i|%p|%r|%S|%T'),date_format(19980131010203,'%H|%I|%k|%l|%i|%p|%r|%S|%T');
+select time_format(131415,'%H|%I|%k|%l|%i|%p|%r|%S|%T'),date_format(19980131131415,'%H|%I|%k|%l|%i|%p|%r|%S|%T');
+select time_format(010015,'%H|%I|%k|%l|%i|%p|%r|%S|%T'),date_format(19980131010015,'%H|%I|%k|%l|%i|%p|%r|%S|%T');
 select date_format(concat('19980131',131415),'%H|%I|%k|%l|%i|%p|%r|%S|%T| %M|%W|%D|%Y|%y|%a|%b|%j|%m|%d|%h|%s|%w');
 select date_format(19980021000000,'%H|%I|%k|%l|%i|%p|%r|%S|%T| %M|%W|%D|%Y|%y|%a|%b|%j|%m|%d|%h|%s|%w');
 select date_add("1997-12-31 23:59:59",INTERVAL 1 SECOND);
@@ -948,6 +952,9 @@ select time(' 1 02:03:04') - interval 2 day;
 select time('-1 02:03:04') + interval 2 day;
 select time('-1 02:03:04') - interval 2 day;
 
+select time('10 02:03:04') + interval 30 day;
+select time('10 02:03:04') + interval 1 year;
+
 # specially constructed queries to reach obscure places in the code
 # not touched by the more "normal" queries (and to increase the coverage)
 select cast('131415.123e0' as time);
@@ -1057,3 +1064,5 @@ select greatest(cast("0-0-0" as date), cast("10:20:05" as time));
 select greatest(cast("0-0-0" as date), cast("10:20:05" as time)) = '0000-00-00';
 select cast(greatest(cast("0-0-0" as date), cast("10:20:05" as time)) as datetime(6));
 
+select microsecond('12:00:00.123456'), microsecond('2009-12-31 23:59:59.000010');
+

mysql-test/t/func_time_hires.test

@@ -36,7 +36,7 @@ drop table t1;
 select sec_to_time(3020399.99999), sec_to_time(3020399.999999), sec_to_time(3020399.9999999);
 select sec_to_time(-3020399.99999), sec_to_time(-3020399.999999), sec_to_time(-3020399.9999999);
 select 20010101000203.000000004 + interval 1 day;
-select 20010101000203.00004 + interval 1 day;
+select 20010101000203.4 + interval 1 day;
 #
 # precision of expressions
 #
@@ -68,6 +68,8 @@ create table t1 select CAST(@a AS DATETIME) as dauto,
 show create table t1;
 --query_vertical select * from t1
 drop table t1;
+explain extended select cast(cast(@a as datetime(4)) as time(0));
+select cast(cast(@a as time(2)) as time(6));
 
 --error ER_TOO_BIG_PRECISION
 select CAST(@a AS DATETIME(7));

mysql-test/t/parser_precedence.test

@@ -3,6 +3,8 @@
 drop table if exists t1_30237_bool;
 --enable_warnings
 
+set sql_mode=NO_UNSIGNED_SUBTRACTION;
+
 create table t1_30237_bool(A boolean, B boolean, C boolean);
 
 insert into t1_30237_bool values

mysql-test/t/type_datetime.test

@@ -137,9 +137,9 @@ DROP TABLE t1;
 # Bug 19491 (CAST DATE AS DECIMAL returns incorrect result
 #
 SELECT CAST(CAST('2006-08-10' AS DATE) AS DECIMAL(20,6));
-SELECT CAST(CAST('2006-08-10 10:11:12' AS DATETIME) AS DECIMAL(20,6));
-SELECT CAST(CAST('2006-08-10 10:11:12' AS DATETIME) + INTERVAL 14 MICROSECOND AS DECIMAL(20,6));
-SELECT CAST(CAST('10:11:12.098700' AS TIME) AS DECIMAL(20,6));
+SELECT CAST(CAST('2006-08-10 10:11:12' AS DATETIME(6)) AS DECIMAL(20,6));
+SELECT CAST(CAST('2006-08-10 10:11:12' AS DATETIME(6)) + INTERVAL 14 MICROSECOND AS DECIMAL(20,6));
+SELECT CAST(CAST('10:11:12.098700' AS TIME(6)) AS DECIMAL(20,6));
 
 
 #
@@ -432,18 +432,18 @@ set @@sql_mode= @org_mode;
 # Bug #42146 - DATETIME fractional seconds parse error
 #
 # show we trucate microseconds from the right -- special case: leftmost is 0
-SELECT CAST(CAST('2006-08-10 10:11:12.0123450' AS DATETIME) AS DECIMAL(30,7));
+SELECT CAST(CAST('2006-08-10 10:11:12.0123450' AS DATETIME(6)) AS DECIMAL(30,7));
 
 # show that we ignore leading zeroes for all other fields
-SELECT CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.0123450' AS DATETIME) AS DECIMAL(30,7));
+SELECT CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.0123450' AS DATETIME(6)) AS DECIMAL(30,7));
 # once more with feeling (but no warnings)
-SELECT CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.012345'  AS DATETIME) AS DECIMAL(30,7));
+SELECT CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.012345'  AS DATETIME(6)) AS DECIMAL(30,7));
 
 #
 # Bug #38435 - LONG Microseconds cause MySQL to fail a CAST to DATETIME or DATE
 #
 # show we truncate microseconds from the right
-SELECT CAST(CAST('2008-07-29T10:42:51.1234567' AS DateTime) AS DECIMAL(30,7));
+SELECT CAST(CAST('2008-07-29T10:42:51.1234567' AS DateTime(6)) AS DECIMAL(30,7));
 
 --echo # 
 --echo # Bug#59173: Failure to handle DATE(TIME) values where Year, Month or

mysql-test/t/type_datetime_hires.test

@@ -61,77 +61,11 @@ select table_name,partition_name,partition_method,partition_expression,partition
 
 drop table t1, t2;
 
-#
-# insert ... select with conversion
-#
-create table t1 (
- q_date date,
- q_time time,
- q_time5 time(5),
- q_datetime datetime,
- q_datetime1 datetime(1),
- q_datetime3 datetime(3),
- q_datetime5 datetime(5),
- q_timestamp timestamp,
- q_timestamp2 timestamp(2),
- q_timestamp4 timestamp(4),
- q_timestamp6 timestamp(6),
- q_varchar50 varchar(50),
- q_varchar60 varchar(60),
- q_varchar70 varchar(70),
- q_varchar80 varchar(80));
-
-create table t2 (
- date_datetime datetime,
- time_datetime datetime,
- time5_varchar100 varchar(100),
- datetime_time time,
- datetime1_date  date,
- datetime3_timestamp timestamp,
- datetime5_varchar100 varchar(100),
- timestamp_datetime datetime,
- timestamp2_date date,
- timestamp4_time time,
- timestamp6_varchar100 varchar(100),
- varchar50_date date,
- varchar60_datetime datetime,
- varchar70_time time,
- varchar80_timestamp timestamp);
-
-insert t1 values ('2010-11-12 11:14:17.765432',
-                  '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432',
-                  '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432',
-                  '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432',
-                  '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432',
-                  '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432',
-                  '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432',
-                  '2010-11-12 11:14:17.765432', '2010-11-12 11:14:17.765432');
---query_vertical select * from t1;
-insert t2 select * from t1;
---query_vertical select * from t2;
-alter table t1
- change q_date date_datetime datetime,
- change q_time time_datetime datetime,
- change q_time5 time5_varchar100 varchar(100),
- change q_datetime datetime_time time,
- change q_datetime1 datetime1_date  date,
- change q_datetime3 datetime3_timestamp timestamp,
- change q_datetime5 datetime5_varchar100 varchar(100),
- change q_timestamp timestamp_datetime datetime,
- change q_timestamp2 timestamp2_date date,
- change q_timestamp4 timestamp4_time time,
- change q_timestamp6 timestamp6_varchar100 varchar(100),
- change q_varchar50 varchar50_date date,
- change q_varchar60 varchar60_datetime datetime,
- change q_varchar70 varchar70_time time,
- change q_varchar80 varchar80_timestamp timestamp;
---query_vertical select * from t1;
-
-drop table t1, t2;
-
 create table t1 (a datetime, b datetime(6));
 insert t1 values ('2010-01-02 03:04:05.678912', '2010-01-02 03:04:05.678912');
 update t1 set b=a;
 select * from t1;
+alter table t1 modify b datetime, modify a datetime(6);
+select * from t1;
 drop table t1;
 

mysql-test/t/type_time_hires.test

@@ -2,7 +2,11 @@
 let type=time;
 --source include/type_hrtime.inc
 
-create table t1 (a time(4) not null);
-insert into t1 values ('-00:00:00.6'),('-00:00:00.7'),('-00:00:00.8'),('-00:00:00.9'),('-00:00:01.0'),('-00:00:01.1'),('-00:00:01.000000'),('-00:00:01.100001'),('-00:00:01.000002'),('-00:00:01.090000');
-select * from t1;
+create table t1 (a time(4) not null, key(a));
+insert into t1 values ('1:2:3.001'),('1:2:3'), ('-00:00:00.6'),('-00:00:00.7'),('-00:00:00.8'),('-00:00:00.9'),('-00:00:01.0'),('-00:00:01.1'),('-00:00:01.000000'),('-00:00:01.100001'),('-00:00:01.000002'),('-00:00:01.090000');
+select * from t1 order by a;
+select * from t1 order by a desc;
+select min(a - interval 1 hour), max(a - interval 1 hour) from t1 where a < 0;
 drop table t1;
+
+select cast(1e-6 as time(6));

sql-common/my_time.c

@@ -18,6 +18,7 @@
 #include <m_ctype.h>
 /* Windows version of localtime_r() is declared in my_ptrhead.h */
 #include <my_pthread.h>
+#include <mysqld_error.h>
 
 ulonglong log_10_int[20]=
 {
@@ -732,7 +733,7 @@ void my_init_time(void)
   time_t seconds;
   struct tm *l_time,tm_tmp;
   MYSQL_TIME my_time;
-  my_bool not_used;
+  uint not_used;
 
   seconds= (time_t) time((time_t*) 0);
   localtime_r(&seconds,&tm_tmp);
@@ -818,7 +819,11 @@ long calc_daynr(uint year,uint month,uint day)
       t               - time value to be converted
       my_timezone     - pointer to long where offset of system time zone
                         from UTC will be stored for caching
-      in_dst_time_gap - set to true if time falls into spring time-gap
+      error_code      - 0, if the conversion was successful;
+                        ER_WARN_DATA_OUT_OF_RANGE, if t contains datetime value
+                           which is out of TIMESTAMP range;
+                        ER_WARN_INVALID_TIMESTAMP, if t represents value which
+                           doesn't exists (falls into the spring time-gap).
 
   NOTES
     The idea is to cache the time zone offset from UTC (including daylight 
@@ -832,8 +837,7 @@ long calc_daynr(uint year,uint month,uint day)
     Time in UTC seconds since Unix Epoch representation.
 */
 my_time_t
-my_system_gmt_sec(const MYSQL_TIME *t_src, long *my_timezone,
-                  my_bool *in_dst_time_gap)
+my_system_gmt_sec(const MYSQL_TIME *t_src, long *my_timezone, uint *error_code)
 {
   uint loop;
   time_t tmp= 0;
@@ -843,8 +847,6 @@ my_system_gmt_sec(const MYSQL_TIME *t_src, long *my_timezone,
   struct tm *l_time,tm_tmp;
   long diff, current_timezone;
 
-  *in_dst_time_gap= 0;                          /* Reset */
-
   /*
     Use temp variable to avoid trashing input data, which could happen in
     case of shift required for boundary dates processing.
@@ -853,9 +855,10 @@ my_system_gmt_sec(const MYSQL_TIME *t_src, long *my_timezone,
 
   if (!validate_timestamp_range(t))
   {
-    *in_dst_time_gap= 1;
+    *error_code= ER_WARN_DATA_OUT_OF_RANGE;
     return 0;
   }
+  *error_code= 0;
 
   /*
     Calculate the gmt time based on current time and timezone
@@ -1001,7 +1004,7 @@ my_system_gmt_sec(const MYSQL_TIME *t_src, long *my_timezone,
     else if (diff == -3600)
       tmp-=t->minute*60 + t->second;		/* Move to previous hour */
 
-    *in_dst_time_gap= 1;
+    *error_code= ER_WARN_INVALID_TIMESTAMP;
   }
   *my_timezone= current_timezone;
 
@@ -1022,7 +1025,7 @@ my_system_gmt_sec(const MYSQL_TIME *t_src, long *my_timezone,
   if (!IS_TIME_T_VALID_FOR_TIMESTAMP(tmp))
   {
     tmp= 0;
-    *in_dst_time_gap= 1;
+    *error_code= ER_WARN_DATA_OUT_OF_RANGE;
   }
 
   return (my_time_t) tmp;
@@ -1150,7 +1153,7 @@ int my_TIME_to_str(const MYSQL_TIME *l_time, char *to, uint digits)
     Datetime value in YYYYMMDDHHMMSS format.
 */
 
-longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
+longlong number_to_datetime(longlong nr, ulong sec_part, MYSQL_TIME *time_res,
                             uint flags, int *was_cut)
 {
   long part1,part2;
@@ -1158,7 +1161,7 @@ longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
   *was_cut= 0;
   time_res->time_type=MYSQL_TIMESTAMP_DATE;
 
-  if (nr == LL(0) || nr >= LL(10000101000000))
+  if (nr == 0 || nr >= 10000101000000LL || sec_part)
   {
     time_res->time_type=MYSQL_TIMESTAMP_DATETIME;
     goto ok;
@@ -1208,13 +1211,14 @@ longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
   time_res->hour=  (int) (part2/10000L);  part2%=10000L;
   time_res->minute=(int) part2 / 100;
   time_res->second=(int) part2 % 100;
-  time_res->second_part=  0;
+  time_res->second_part= sec_part;
   time_res->neg= 0;
 
   if (time_res->year <= 9999 && time_res->month <= 12 &&
       time_res->day <= 31 && time_res->hour <= 23 &&
       time_res->minute <= 59 && time_res->second <= 59 &&
-      !check_date(time_res, (nr != 0), flags, was_cut))
+      sec_part <= TIME_MAX_SECOND_PART &&
+      !check_date(time_res, nr || sec_part, flags, was_cut))
     return nr;
 
   /* Don't want to have was_cut get set if NO_ZERO_DATE was violated. */
@@ -1234,7 +1238,7 @@ longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
 }
 
 /*
-  Convert a double to a MYSQL_TIME struct.
+  Convert a pair of integers to a MYSQL_TIME struct.
 
   @param[in]  nr             a number to convert
   @param[out] ltime          Date to check.
@@ -1242,81 +1246,53 @@ longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
                              modified to fit in the valid range. Otherwise 0.
 
   @details
-    Takes a number in the [-]HHHMMSS.uuuuuu format.
- 
-    number_to_datetime() cannot take a double, because double precision is not
-    enough for YYYYMMDDHHMMSS.uuuuuu
+    Takes a number in the [-]HHHMMSS.uuuuuu,
+    YYMMDDHHMMSS.uuuuuu, or in the YYYYMMDDHHMMSS.uuuuuu formats.
  
   @return
     0        time value is valid, but was possibly truncated
-    1        time value is invalid
+    -1       time value is invalid
 */
-int number_to_time(double nr, MYSQL_TIME *ltime, int *was_cut)
+int number_to_time(my_bool neg, longlong nr, ulong sec_part,
+                   MYSQL_TIME *ltime, int *was_cut)
 {
-  ulong tmp;
+  if (nr > 9999999 && neg == 0)
+  {
+    if (number_to_datetime(nr, sec_part, ltime,
+                           TIME_FUZZY_DATE |  TIME_INVALID_DATES, was_cut) < 0)
+      return -1;
+
+    ltime->year= ltime->month= ltime->day= 0;
+    ltime->time_type= MYSQL_TIMESTAMP_TIME;
+    *was_cut= MYSQL_TIME_WARN_TRUNCATED;
+    return 0;
+  }
+
   *was_cut= 0;
   ltime->year= ltime->month= ltime->day= 0;
   ltime->time_type= MYSQL_TIMESTAMP_TIME;
 
-  if ((ltime->neg= nr < 0))
-    nr= -nr;
+  ltime->neg= neg;
 
   if (nr > TIME_MAX_VALUE)
   {
     nr= TIME_MAX_VALUE;
+    sec_part= TIME_MAX_SECOND_PART;
     *was_cut= MYSQL_TIME_WARN_OUT_OF_RANGE;
   }
-  tmp=(ulong)floor(nr);
-  ltime->hour  = tmp/100/100;
-  ltime->minute= tmp/100%100;
-  ltime->second= tmp%100;
-  ltime->second_part= (ulong)((nr-tmp)*TIME_SECOND_PART_FACTOR);
+  ltime->hour  = (uint)(nr/100/100);
+  ltime->minute= nr/100%100;
+  ltime->second= nr%100;
+  ltime->second_part= sec_part;
 
-  if (ltime->minute < 60 && ltime->second < 60)
+  if (ltime->minute < 60 && ltime->second < 60 && sec_part <= TIME_MAX_SECOND_PART)
     return 0;
 
   *was_cut= MYSQL_TIME_WARN_TRUNCATED;
-  return 1;
+  return -1;
 }
 
 
-/*
-  Convert a double to a date/datetime
-
-  Note that for sub seconds, the precision of double is not good enough!
-
-  RESULT:
-    0  ok
-    1  error ;  ltime is zeroed
-*/
-
-my_bool double_to_datetime(double value, MYSQL_TIME *ltime,
-                           uint fuzzydate)
-{
-  double datepart_value;
-  int was_cut;
-
-  if (value < 0 || value >  99991231235959.0)
-  {
-    bzero((char*) ltime, sizeof(*ltime));
-    return 1;
-  }
-
-  datepart_value= floor(value);
-  if (number_to_datetime((longlong) datepart_value, ltime, fuzzydate,
-                         &was_cut) == LL(-1))
-    return 1;
-  if (ltime->time_type == MYSQL_TIMESTAMP_DATETIME ||
-      ltime->time_type == MYSQL_TIMESTAMP_TIME)
-  {
-    /* Add sub seconds to results */
-    ltime->second_part= (ulong) (floor((value - datepart_value) *
-                                       TIME_SECOND_PART_FACTOR));
-  }
-  return 0;
-}  
-
-
 /* Convert time value to integer in YYYYMMDDHHMMSS format */
 
 ulonglong TIME_to_ulonglong_datetime(const MYSQL_TIME *my_time)

sql/event_data_objects.cc

@@ -464,7 +464,7 @@ Event_queue_element::load_from_row(THD *thd, TABLE *table)
     DBUG_RETURN(TRUE);
 
   starts_null= table->field[ET_FIELD_STARTS]->is_null();
-  my_bool not_used= FALSE;
+  uint not_used;
   if (!starts_null)
   {
     table->field[ET_FIELD_STARTS]->get_date(&time, TIME_NO_ZERO_DATE);
@@ -646,7 +646,7 @@ add_interval(MYSQL_TIME *ltime, const Time_zone *time_zone,
   if (date_add_interval(ltime, scale, interval))
     return 0;
 
-  my_bool not_used;
+  uint not_used;
   return time_zone->TIME_to_gmt_sec(ltime, &not_used);
 }
 

sql/event_db_repository.cc

@@ -281,7 +281,7 @@ mysql_event_fill_row(THD *thd,
       my_tz_OFFSET0->gmt_sec_to_TIME(&time, et->starts);
 
       fields[ET_FIELD_STARTS]->set_notnull();
-      fields[ET_FIELD_STARTS]->store_time(&time, MYSQL_TIMESTAMP_DATETIME);
+      fields[ET_FIELD_STARTS]->store_time(&time);
     }
 
     if (!et->ends_null)
@@ -290,7 +290,7 @@ mysql_event_fill_row(THD *thd,
       my_tz_OFFSET0->gmt_sec_to_TIME(&time, et->ends);
 
       fields[ET_FIELD_ENDS]->set_notnull();
-      fields[ET_FIELD_ENDS]->store_time(&time, MYSQL_TIMESTAMP_DATETIME);
+      fields[ET_FIELD_ENDS]->store_time(&time);
     }
   }
   else if (et->execute_at)
@@ -309,8 +309,7 @@ mysql_event_fill_row(THD *thd,
     my_tz_OFFSET0->gmt_sec_to_TIME(&time, et->execute_at);
 
     fields[ET_FIELD_EXECUTE_AT]->set_notnull();
-    fields[ET_FIELD_EXECUTE_AT]->
-                        store_time(&time, MYSQL_TIMESTAMP_DATETIME);
+    fields[ET_FIELD_EXECUTE_AT]->store_time(&time);
   }
   else
   {
@@ -1088,8 +1087,7 @@ update_timing_fields_for_event(THD *thd,
     my_tz_OFFSET0->gmt_sec_to_TIME(&time, last_executed);
 
     fields[ET_FIELD_LAST_EXECUTED]->set_notnull();
-    fields[ET_FIELD_LAST_EXECUTED]->store_time(&time,
-                                               MYSQL_TIMESTAMP_DATETIME);
+    fields[ET_FIELD_LAST_EXECUTED]->store_time(&time);
   }
   if (update_status)
   {

sql/log.cc

@@ -640,11 +640,11 @@ bool Log_to_csv_event_handler::
 
   /* fill in query_time field */
   calc_time_from_sec(&t, query_time, query_time_micro);
-  if (table->field[2]->store_time(&t, MYSQL_TIMESTAMP_TIME))
+  if (table->field[2]->store_time(&t))
     goto err;
   /* lock_time */
   calc_time_from_sec(&t, lock_time, lock_time_micro);
-  if (table->field[3]->store_time(&t, MYSQL_TIMESTAMP_TIME))
+  if (table->field[3]->store_time(&t))
     goto err;
   /* rows_sent */
   if (table->field[4]->store((longlong) thd->sent_row_count, TRUE))

sql/unireg.h

@@ -72,7 +72,7 @@
 #define MAX_BIT_FIELD_LENGTH    64      /* Max length in bits for bit fields */
 
 #define MAX_DATE_WIDTH		10	/* YYYY-MM-DD */
-#define MIN_TIME_WIDTH           9      /* HHH:MM:SS */
+#define MIN_TIME_WIDTH          10      /* -HHH:MM:SS */
 #define MAX_TIME_WIDTH          16      /* -DDDDDD HH:MM:SS */
 #define MAX_TIME_FULL_WIDTH     23      /* -DDDDDD HH:MM:SS.###### */
 #define MAX_DATETIME_FULL_WIDTH 29	/* YYYY-MM-DD HH:MM:SS.###### AM */