mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-23 00:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

5.5 merge

Browse source
This commit is contained in:
Sergei Golubchik 2014-05-09 12:35:11 +02:00
commit d3e2e1243b
1865 changed files with 92783 additions and 80381 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/item_timefunc.cc
View file

@ -2523,10 +2523,10 @@ bool Item_date_typecast::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date)
if (get_arg0_date(ltime, fuzzy_date & ~TIME_TIME_ONLY))
return 1;
ltime->hour= ltime->minute= ltime->second= ltime->second_part= 0;
ltime->time_type= MYSQL_TIMESTAMP_DATE;
return (null_value= check_date_with_warn(ltime, fuzzy_date,
MYSQL_TIMESTAMP_DATE));
if (make_date_with_warn(ltime, fuzzy_date, MYSQL_TIMESTAMP_DATE))
return (null_value= 1);
return 0;
}