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 | d0fae7542fce4dc11099056e602f47c4e5707811 (patch) | |
| tree | a54fa81ccb21526e54c820e1a69c4362f248b302 /mysql-test/t/func_time.test | |
| parent | 90b1a385daaa6bbcdc7dea518c7c527a165f1425 (diff) | |
| download | mariadb-git-d0fae7542fce4dc11099056e602f47c4e5707811.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/t/func_time.test')
| -rw-r--r-- | mysql-test/t/func_time.test | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index 15c26b56634..6570cf031a1 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -724,6 +724,7 @@ set time_zone= @@global.time_zone; # select str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE; +select str_to_date("1997-00-04 22:23:00","%Y-%m-%D") + interval 10 minute; # # Bug #21103: DATE column not compared as DATE @@ -986,3 +987,7 @@ insert into t1 values ('0000-00-00 00:00:00'); select cast(f1 AS time) from t1; drop table t1; +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)); + |