From 62e102b42eb286c5fc4f5ed2e11357a08c930069 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 12 Oct 2006 11:21:12 +0400 Subject: 5.0-specific fixes when merging the fix for bug #11655 and bug #20927 from 4.1 mysql-test/r/func_time.result: Fixed func_time test when merging the fix for bug #11655 and bug #20927 to 5.0 sql/item_timefunc.cc: Fixed compilation when merging the fix for bug #11655 and bug #20927 to 5.0 --- mysql-test/r/func_time.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test/r/func_time.result') diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 0a766fcdc63..91bd3722299 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -898,7 +898,7 @@ CREATE TABLE t1(f1 TIME); INSERT INTO t1 VALUES('916:00:00 a'); Warnings: Warning 1265 Data truncated for column 'f1' at row 1 -Warning 1264 Data truncated; out of range for column 'f1' at row 1 +Warning 1264 Out of range value adjusted for column 'f1' at row 1 SELECT * FROM t1; f1 838:59:59 -- cgit v1.2.1