database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge martin@mhansson.mysql.internal:/home/martin/mysql/src/bug31160/my51-bug31160

Browse Source 
into  dl145s.mysql.com:/data0/mhansson/bug31160/my51-bug31160
This commit is contained in:
mhansson@dl145s.mysql.com
2007-10-09 15:27:38 +02:00
parent 9f8842c265 6d6c475fe8
commit 98220d761e
4 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/func_sapdb.result
View File

@ -196,7 +196,7 @@ f2 datetime YES NULL
f3 time YES NULL f3 time YES NULL
f4 time YES NULL f4 time YES NULL
f5 time YES NULL f5 time YES NULL
f6 time NO 00:00:00 f6 time YES NULL
f7 datetime YES NULL f7 datetime YES NULL
f8 date YES NULL f8 date YES NULL
f9 time YES NULL f9 time YES NULL

9
mysql-test/r/func_time.result
View File

@ -1027,6 +1027,15 @@ fmtddate field2
Sep-4 12:00AM abcd Sep-4 12:00AM abcd
DROP TABLE testBug8868; DROP TABLE testBug8868;
SET NAMES DEFAULT; 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) (select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H)
union union
(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H); (select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H);

10
mysql-test/t/func_time.test
View File

@ -547,6 +547,16 @@ DROP TABLE testBug8868;
SET NAMES DEFAULT; SET NAMES DEFAULT;
#
# Bug #31160: MAKETIME() crashes server when returning NULL in ORDER BY using
# filesort
#
CREATE TABLE t1 (
a TIMESTAMP
);
INSERT INTO t1 VALUES (now()), (now());
SELECT 1 FROM t1 ORDER BY MAKETIME(1, 1, a);
DROP TABLE t1;
# #
# Bug #19844 time_format in Union truncates values # Bug #19844 time_format in Union truncates values
# #

5
sql/item_timefunc.h
View File

@ -938,7 +938,10 @@ class Item_func_maketime :public Item_str_timefunc
{ {
public: public:
Item_func_maketime(Item *a, Item *b, Item *c) Item_func_maketime(Item *a, Item *b, Item *c)
:Item_str_timefunc(a, b ,c) {} :Item_str_timefunc(a, b, c)
{
maybe_null= TRUE;
}
String *val_str(String *str); String *val_str(String *str);
const char *func_name() const { return "maketime"; } const char *func_name() const { return "maketime"; }
}; };