diff options
| author | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-03-26 13:43:20 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-03-26 13:43:20 +0500 |
| commit | 9dfe413a153db41bac47317e8d51b544f58783dc (patch) | |
| tree | 687d108ea7d4a5f32e2a1e6239a42a6f0219d93e /sql-common/my_time.c | |
| parent | 9b2e0127f02209a6e93fb3dcf2755b7abaf1d097 (diff) | |
| parent | cc2c4e265a721a7b4ff53907b57256b6c51f8df3 (diff) | |
| download | mariadb-git-9dfe413a153db41bac47317e8d51b544f58783dc.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/home/ram/work/b25301/b25301.5.0
sql-common/my_time.c:
Auto merged
Diffstat (limited to 'sql-common/my_time.c')
| -rw-r--r-- | sql-common/my_time.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 83b647be1bd..4032c273e35 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -85,8 +85,7 @@ my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date, (!(flags & TIME_INVALID_DATES) && ltime->month && ltime->day > days_in_month[ltime->month-1] && (ltime->month != 2 || calc_days_in_year(ltime->year) != 366 || - ltime->day != 29)) || - (ltime->year == 0 && (ltime->month != 0 || ltime->day != 0))) + ltime->day != 29))) { *was_cut= 2; return TRUE; @@ -410,9 +409,7 @@ 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->year == 0 && l_time->month == 0 && l_time->day == 0 && - (l_time->hour != 0 || l_time->minute != 0 || l_time->second != 0))) + l_time->minute > 59 || l_time->second > 59) { /* Only give warning for a zero date if there is some garbage after */ if (!not_zero_date) /* If zero date */ |