diff options
| author | unknown <kaa@polly.local> | 2006-10-12 11:21:12 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-10-12 11:21:12 +0400 |
| commit | 62e102b42eb286c5fc4f5ed2e11357a08c930069 (patch) | |
| tree | 7ee0ac7f1ee65b97bf819d82086120b02d5436e6 /mysql-test/r/func_time.result | |
| parent | 78f47fbf3a600157c63a2dccee865b07d3a94b1c (diff) | |
| download | mariadb-git-62e102b42eb286c5fc4f5ed2e11357a08c930069.tar.gz | |
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
Diffstat (limited to 'mysql-test/r/func_time.result')
| -rw-r--r-- | mysql-test/r/func_time.result | 2 |
1 files changed, 1 insertions, 1 deletions
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 |