diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-05-19 19:01:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-05-19 19:01:46 +0200 |
| commit | 8ddcd0cda8e6e90a58e9ea64f0f3773ea0037f0b (patch) | |
| tree | 4765748aeb7aafb09e259e1a355e28c11819e9c0 /mysql-test/r/func_time_hires.result | |
| parent | 5346cb8d2745acd660b301092458e231c9f53319 (diff) | |
| download | mariadb-git-8ddcd0cda8e6e90a58e9ea64f0f3773ea0037f0b.tar.gz | |
post-review changes 1
include/my_time.h:
remove duplicate defines.
cast to ulonglong to avoid overflow
sql/field.cc:
perform sign extension when reading packed TIME values
sql/item_cmpfunc.cc:
when converting a string to a date for the purpose of comparing it with another date,
we should ignore strict sql mode.
sql/item_timefunc.cc:
better error message
sql/item_timefunc.h:
limit decimals appropriately
sql/share/errmsg.txt:
don't refer to an object as a "column" in error messages that are used not only for columns.
Diffstat (limited to 'mysql-test/r/func_time_hires.result')
| -rw-r--r-- | mysql-test/r/func_time_hires.result | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/r/func_time_hires.result b/mysql-test/r/func_time_hires.result index 4a3dc9b5d5c..a3f915bba27 100644 --- a/mysql-test/r/func_time_hires.result +++ b/mysql-test/r/func_time_hires.result @@ -23,9 +23,9 @@ select time_to_sec(sec_to_time(11111)), time_to_sec(sec_to_time(11111.22222)); time_to_sec(sec_to_time(11111)) 11111 time_to_sec(sec_to_time(11111.22222)) 11111.22222 select current_timestamp(7); -ERROR HY000: Incorrect arguments to now +ERROR 42000: Too big precision 7 specified for 'now'. Maximum is 6. select curtime(7); -ERROR HY000: Incorrect arguments to curtime +ERROR 42000: Too big precision 7 specified for 'curtime'. Maximum is 6. drop table if exists t1; create table t1 select sec_to_time(12345), sec_to_time(12345.6789), sec_to_time(1234567e-2), now(), curtime(0), @@ -130,7 +130,7 @@ t5 12:13:14.12345 t6 12:13:14.123456 drop table t1; select CAST(@a AS DATETIME(7)); -ERROR 42000: Too big precision 7 specified for column '(@a)'. Maximum is 6. +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'); CONVERT_TZ('2011-01-02 12:00:00', '+00:00', '+03:00') 2011-01-02 15:00:00 @@ -154,24 +154,24 @@ insert into t1 values ('2002-07-15 21:00:00'); select time(f1) from t1; time(f1) 21:00:00.000000 -select time(f1) from t1 union all select time(f1) from t1; +select time(f1) from t1 union all select time(f1 + interval 1 second) from t1; time(f1) 21:00:00.000000 -21:00:00.000000 +21:00:01.000000 alter table t1 modify f1 timestamp; select time(f1) from t1; time(f1) 21:00:00 -select time(f1) from t1 union all select time(f1) from t1; +select time(f1) from t1 union all select time(f1 + interval 1 second) from t1; time(f1) 21:00:00 -21:00:00 +21:00:01 alter table t1 modify f1 varchar(100); select time(f1) from t1; time(f1) 21:00:00 -select time(f1) from t1 union all select time(f1) from t1; +select time(f1) from t1 union all select time(f1 + interval 1 second) from t1; time(f1) 21:00:00.000000 -21:00:00.000000 +21:00:01.000000 drop table t1; |