VladPolskiy/MariaDB-open-code
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 07:45:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/usr/home/ram/work/bug21789/my50-bug21789

Browse Source 
into  mysql.com:/usr/home/ram/work/bug21789/my51-bug21789


mysql-test/r/date_formats.result:
  Auto merged
sql-common/my_time.c:
  Auto merged
This commit is contained in:
unknown
2006-11-22 12:13:09 +04:00
parent c6e2a2a49b b275e4f019
commit 96de5fabb2
2 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql-common/my_time.c
View File

@ -411,7 +411,9 @@ str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time,
if (number_of_fields < 3 ||
l_time->year > 9999 || l_time->month > 12 ||
l_time->day > 31 || l_time->hour > 23 ||
l_time->minute > 59 || l_time->second > 59)
l_time->minute > 59 || l_time->second > 59 ||
(l_time->year == 0 && l_time->month == 0 && l_time->day == 0 &&
(l_time->hour != 0 || l_time->minute != 0 || l_time->second != 0)))
{
/* Only give warning for a zero date if there is some garbage after */
if (!not_zero_date) /* If zero date */