diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-05-18 10:59:04 +0400 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-05-18 10:59:04 +0400 |
| commit | a48bff1d90ca132afeed0eef4a24221070ee965a (patch) | |
| tree | 2181c7af64b220c88221880c51a49088d7569976 /sql/item_timefunc.cc | |
| parent | b1ad5f2e04651be71dc6d835f8ab671a9183ed62 (diff) | |
| parent | a7cd008e12875d21d37ae92ccbef50d87d4fbd35 (diff) | |
| download | mariadb-git-a48bff1d90ca132afeed0eef4a24221070ee965a.tar.gz | |
5.1 -> 5.5 merge
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 0952a5448e4..b31a388bea4 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -1591,6 +1591,11 @@ bool Item_func_from_days::get_date(MYSQL_TIME *ltime, uint fuzzy_date) return 1; bzero(ltime, sizeof(MYSQL_TIME)); get_date_from_daynr((long) value, <ime->year, <ime->month, <ime->day); + + if ((null_value= (fuzzy_date & TIME_NO_ZERO_DATE) && + (ltime->year == 0 || ltime->month == 0 || ltime->day == 0))) + return TRUE; + ltime->time_type= MYSQL_TIMESTAMP_DATE; return 0; } @@ -2779,7 +2784,7 @@ String *Item_func_makedate::val_str(String *str) long days; if (args[0]->null_value || args[1]->null_value || - year < 0 || daynr <= 0) + year < 0 || year > 9999 || daynr <= 0) goto err; if (year < 100) @@ -2822,7 +2827,7 @@ longlong Item_func_makedate::val_int() long days; if (args[0]->null_value || args[1]->null_value || - year < 0 || daynr <= 0) + year < 0 || year > 9999 || daynr <= 0) goto err; if (year < 100) |