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/type_timestamp_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/type_timestamp_hires.result')
| -rw-r--r-- | mysql-test/r/type_timestamp_hires.result | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/r/type_timestamp_hires.result b/mysql-test/r/type_timestamp_hires.result index ade5354304b..75b6b60e4d5 100644 --- a/mysql-test/r/type_timestamp_hires.result +++ b/mysql-test/r/type_timestamp_hires.result @@ -1,6 +1,6 @@ drop table if exists t1, t2, t3; create table t1 (a timestamp(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. create table t1 (a timestamp(3), key(a)); insert t1 values ('2010-12-11 00:20:03.1234'); insert t1 values ('2010-12-11 15:47:11.1234'); @@ -147,6 +147,10 @@ t2 CREATE TABLE `t2` ( `a` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000', `b` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 +select * from t2; +a b +2010-02-03 04:05:06.000000 2010-02-03 04:05:06.789100 +2011-01-02 03:04:06.234500 2011-01-02 03:04:06.234561 drop view v1; drop table t1, t2; set timestamp=unix_timestamp('2011-01-01 01:01:01') + 0.123456, time_zone='+03:00'; |