diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-09-13 12:06:17 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-09-13 12:06:17 +0400 |
| commit | 51dcf4dcff44e64b9a18951898ed29f2c576ae61 (patch) | |
| tree | 95ff77f90a05056c22e291a1d7ea33965f553dc8 /mysql-test/r/func_sapdb.result | |
| parent | 33f807fd91826013499c996f9515838cf2c6d0c5 (diff) | |
| parent | 499ddea5766d988adc858448c8eec549c7bedcc1 (diff) | |
| download | mariadb-git-51dcf4dcff44e64b9a18951898ed29f2c576ae61.tar.gz | |
Merge from 5.3.
pending merges:
Alexander Barkov 2013-09-12 MDEV-4724 Some temporal functions do not pre...
Diffstat (limited to 'mysql-test/r/func_sapdb.result')
| -rw-r--r-- | mysql-test/r/func_sapdb.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/func_sapdb.result b/mysql-test/r/func_sapdb.result index 72c7a5a128f..66a8b99f7fd 100644 --- a/mysql-test/r/func_sapdb.result +++ b/mysql-test/r/func_sapdb.result @@ -156,7 +156,7 @@ timestamp("2001-12-01", "25:01:01") 2001-12-02 01:01:01 select timestamp("2001-12-01 01:01:01.000100"); timestamp("2001-12-01 01:01:01.000100") -2001-12-01 01:01:01.000100 +2001-12-01 01:01:01.0001 select timestamp("2001-12-01"); timestamp("2001-12-01") 2001-12-01 00:00:00 @@ -200,12 +200,12 @@ f3 time(6) YES NULL f4 time(6) YES NULL f5 time(6) YES NULL f6 time YES NULL -f7 datetime(6) YES NULL +f7 datetime YES NULL f8 date YES NULL f9 time(6) YES NULL select * from t1; f1 f2 f3 f4 f5 f6 f7 f8 f9 -1997-01-01 1998-01-02 01:01:00.000003 49:01:01.000001 46:58:57.999999 -24:00:00.000001 10:11:12 2001-12-01 01:01:01.000000 1997-12-31 23:59:59.000001 +1997-01-01 1998-01-02 01:01:00.000003 49:01:01.000001 46:58:57.999999 -24:00:00.000001 10:11:12 2001-12-01 01:01:01 1997-12-31 23:59:59.000001 create table test(t1 datetime, t2 time, t3 time, t4 datetime); insert into test values ('2001-01-01 01:01:01', '01:01:01', null, '2001-02-01 01:01:01'), |