diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-04-27 11:46:23 +0400 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-04-27 11:46:23 +0400 |
| commit | 75f02c36ce158b58d6e7da8b98ccd2e0b1426758 (patch) | |
| tree | 2a80f211f0c197a787a8029a6b7112f19828970e /sql/item_timefunc.cc | |
| parent | b4c9402fabe17e4a3cf425a148faa24c470fb2dd (diff) | |
| parent | 735bab72c51e0ff4ccf5fb688826e87931ee8fe2 (diff) | |
| download | mariadb-git-75f02c36ce158b58d6e7da8b98ccd2e0b1426758.tar.gz | |
5.1 -> 5.5 merge
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index c2363409269..68e75a262dc 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -669,7 +669,7 @@ bool make_date_time(DATE_TIME_FORMAT *format, MYSQL_TIME *l_time, system_charset_info); break; case 'W': - if (type == MYSQL_TIMESTAMP_TIME) + if (type == MYSQL_TIMESTAMP_TIME || !(l_time->month || l_time->year)) return 1; weekday= calc_weekday(calc_daynr(l_time->year,l_time->month, l_time->day),0); @@ -678,7 +678,7 @@ bool make_date_time(DATE_TIME_FORMAT *format, MYSQL_TIME *l_time, system_charset_info); break; case 'a': - if (type == MYSQL_TIMESTAMP_TIME) + if (type == MYSQL_TIMESTAMP_TIME || !(l_time->month || l_time->year)) return 1; weekday=calc_weekday(calc_daynr(l_time->year,l_time->month, l_time->day),0); @@ -837,7 +837,7 @@ bool make_date_time(DATE_TIME_FORMAT *format, MYSQL_TIME *l_time, } break; case 'w': - if (type == MYSQL_TIMESTAMP_TIME) + if (type == MYSQL_TIMESTAMP_TIME || !(l_time->month || l_time->year)) return 1; weekday=calc_weekday(calc_daynr(l_time->year,l_time->month, l_time->day),1); |