diff options
| author | Alexander Barkov <bar@mariadb.org> | 2014-07-23 14:59:23 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2014-07-23 14:59:23 +0400 |
| commit | 07cb53c58b87f1b6bc54df6f49125d9686ddcf9b (patch) | |
| tree | 5be57ede7d760f424f7ecbc9f7be2c0830b045ed /sql | |
| parent | be00265557410cdf273a5992b46cf62ce06ebbd3 (diff) | |
| parent | 80708da138913deb3a096da0e761ff247766bf96 (diff) | |
| download | mariadb-git-07cb53c58b87f1b6bc54df6f49125d9686ddcf9b.tar.gz | |
Merge 5.3->5.5
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index bf45b41b2d9..c00dde874fc 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2960,7 +2960,7 @@ bool Item_func_min_max::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date) { ltime->time_type= MYSQL_TIMESTAMP_TIME; ltime->hour+= (ltime->month * 32 + ltime->day) * 24; - ltime->month= ltime->day= 0; + ltime->year= ltime->month= ltime->day= 0; if (adjust_time_range_with_warn(ltime, min(decimals, TIME_SECOND_PART_DIGITS))) return (null_value= true); |