diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-05-19 19:16:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-05-19 19:16:17 +0200 |
| commit | f06cac336ba7a27493fc753d2bf37e87137a1cdc (patch) | |
| tree | a54fa81ccb21526e54c820e1a69c4362f248b302 /mysql-test/r/func_time.result | |
| parent | 03b33425e5a3de3fad070aa21e7fc7baf8104c81 (diff) | |
| download | mariadb-git-f06cac336ba7a27493fc753d2bf37e87137a1cdc.tar.gz | |
post review changes 2
sql/event_parse_data.cc:
don't use "not_used" variable
sql/item_timefunc.cc:
Item_temporal_func::fix_length_and_dec()
and other changes
sql/item_timefunc.h:
introducing Item_timefunc::fix_length_and_dec()
sql/share/errmsg.txt:
don't say "column X" in the error message that used not only for columns
Diffstat (limited to 'mysql-test/r/func_time.result')
| -rw-r--r-- | mysql-test/r/func_time.result | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 6a8805dfb3a..3194e618bb8 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -1036,7 +1036,7 @@ SELECT SEC_TO_TIME(CAST(-1 AS UNSIGNED)); SEC_TO_TIME(CAST(-1 AS UNSIGNED)) 838:59:59 Warnings: -Warning 1292 Truncated incorrect time value: '18446744073709551616' +Warning 1292 Truncated incorrect time value: '1.84467440737096e+19' SET NAMES latin1; SET character_set_results = NULL; SHOW VARIABLES LIKE 'character_set_results'; @@ -1223,6 +1223,11 @@ str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE NULL Warnings: Error 1411 Incorrect datetime value: '10:00 PM' for function str_to_date +select str_to_date("1997-00-04 22:23:00","%Y-%m-%D") + interval 10 minute; +str_to_date("1997-00-04 22:23:00","%Y-%m-%D") + interval 10 minute +NULL +Warnings: +Error 1411 Incorrect datetime value: '1997-00-04 22:23:00' for function str_to_date create table t1 (field DATE); insert into t1 values ('2006-11-06'); select * from t1 where field < '2006-11-06 04:08:36.0'; @@ -1545,3 +1550,12 @@ select cast(f1 AS time) from t1; cast(f1 AS time) 00:00:00 drop table t1; +select greatest(cast("0-0-0" as date), cast("10:20:05" as time)); +greatest(cast("0-0-0" as date), cast("10:20:05" as time)) +0000-00-00 +select greatest(cast("0-0-0" as date), cast("10:20:05" as time)) = '0000-00-00'; +greatest(cast("0-0-0" as date), cast("10:20:05" as time)) = '0000-00-00' +1 +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 |