diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-15 19:11:28 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-15 19:11:28 +0200 |
| commit | 4ef25dbfd87824ade87998193af378e54274c038 (patch) | |
| tree | a43697dc08f4b81feee14fbfe02cbf821141d807 /sql/item_func.cc | |
| parent | 3d798be1d481835b60a811148a10ea14c37d5674 (diff) | |
| parent | e2e740030d4f027e25f9a322990af0fdb3e0ffc3 (diff) | |
| download | mariadb-git-4ef25dbfd87824ade87998193af378e54274c038.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/item_func.cc')
| -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 ac7ed75e7f9..93ddddfde61 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2724,7 +2724,7 @@ bool Item_func_min_max::get_date_native(MYSQL_TIME *ltime, ulonglong fuzzy_date) ltime->hour+= (ltime->month * 32 + ltime->day) * 24; ltime->year= ltime->month= ltime->day= 0; if (adjust_time_range_with_warn(ltime, - std::min<uint>(decimals, TIME_SECOND_PART_DIGITS))) + MY_MIN(decimals, TIME_SECOND_PART_DIGITS))) return (null_value= true); } |