database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

lp:738067 Crash in get_datetime_value() in 5.1-micro

Browse Source
This commit is contained in:
Sergei Golubchik
2011-03-19 14:54:46 +01:00
parent e79a72a410
commit a67bf98f02
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1536,3 +1536,6 @@ drop table t1;
select day(coalesce(null)); select day(coalesce(null));
day(coalesce(null)) day(coalesce(null))
NULL NULL
select timestamp(greatest('2002-08-20', '0000-00-00 00:00:00'));
timestamp(greatest('2002-08-20', '0000-00-00 00:00:00'))
2002-08-20 00:00:00

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

@@ -973,3 +973,7 @@ drop table t1;
# #
select day(coalesce(null)); select day(coalesce(null));
#
# lp:738067 Crash in get_datetime_value() in 5.1-micro
#
select timestamp(greatest('2002-08-20', '0000-00-00 00:00:00'));

2
sql/item_func.cc
View File

@@ -2274,6 +2274,8 @@ bool Item_func_min_max::get_date(MYSQL_TIME *ltime, uint fuzzy_date)
{ {
longlong UNINIT_VAR(min_max); longlong UNINIT_VAR(min_max);
DBUG_ASSERT(fixed == 1); DBUG_ASSERT(fixed == 1);
if (!compare_as_dates)
return Item_func::get_date(ltime, fuzzy_date);
for (uint i=0; i < arg_count ; i++) for (uint i=0; i < arg_count ; i++)
{ {