diff options
| author | unknown <mhansson/martin@linux-st28.site> | 2007-10-09 15:00:06 +0200 |
|---|---|---|
| committer | unknown <mhansson/martin@linux-st28.site> | 2007-10-09 15:00:06 +0200 |
| commit | 05903b333f1a783d2f4b1cdc94a1476c23b882b9 (patch) | |
| tree | 1c7bd467dff8a8298074b2fbb68f09769cfe428f /mysql-test/r | |
| parent | bd8e7fee1f260b6f5b9b39c67bb6e701eace3cae (diff) | |
| parent | ae4141ed75124cc4bbae5fa22662ef0e7f00b122 (diff) | |
| download | mariadb-git-05903b333f1a783d2f4b1cdc94a1476c23b882b9.tar.gz | |
Merge linux-st28.site:/home/martin/mysql/src/bug31160/my50-bug31160
into linux-st28.site:/home/martin/mysql/src/bug31160/my51-bug31160
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
sql/item_timefunc.h:
Auto merged
mysql-test/t/func_time.test:
SCCS merged
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/func_sapdb.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/func_time.result | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/mysql-test/r/func_sapdb.result b/mysql-test/r/func_sapdb.result index b7dbfc670a8..e68a4cef1ae 100644 --- a/mysql-test/r/func_sapdb.result +++ b/mysql-test/r/func_sapdb.result @@ -196,7 +196,7 @@ f2 datetime YES NULL f3 time YES NULL f4 time YES NULL f5 time YES NULL -f6 time NO 00:00:00 +f6 time YES NULL f7 datetime YES NULL f8 date YES NULL f9 time YES NULL diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 3105bc3b578..a355d7929b5 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -1027,6 +1027,15 @@ fmtddate field2 Sep-4 12:00AM abcd DROP TABLE testBug8868; SET NAMES DEFAULT; +CREATE TABLE t1 ( +a TIMESTAMP +); +INSERT INTO t1 VALUES (now()), (now()); +SELECT 1 FROM t1 ORDER BY MAKETIME(1, 1, a); +1 +1 +1 +DROP TABLE t1; (select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H) union (select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H); |