diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 11:33:53 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 11:33:53 +0200 |
| commit | b5763ecd01ca9155ecce7b2f06e8a8bfce050ff9 (patch) | |
| tree | b0ce48cd6f43a11d7465312dfe14552a8e4f8e3b /sql/item_strfunc.cc | |
| parent | 375256bae71e3f20d4498990610842b2976b6187 (diff) | |
| parent | 45531949ae115f2ba7b9450cc2386653483211ba (diff) | |
| download | mariadb-git-b5763ecd01ca9155ecce7b2f06e8a8bfce050ff9.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 6f2af72dabf..8cc539f3d12 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -5135,7 +5135,7 @@ bool Item_dyncol_get::get_date(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydat { longlong llval = (longlong)val.x.ulong_value; if (int_to_datetime_with_warn(thd, Longlong_hybrid(llval, !signed_value), - ltime, fuzzydate, 0 /* TODO */)) + ltime, fuzzydate, 0, 0 /* TODO */)) goto null; return 0; } @@ -5144,12 +5144,12 @@ bool Item_dyncol_get::get_date(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydat /* fall through */ case DYN_COL_DOUBLE: if (double_to_datetime_with_warn(thd, val.x.double_value, ltime, fuzzydate, - 0 /* TODO */)) + 0, 0 /* TODO */)) goto null; return 0; case DYN_COL_DECIMAL: if (decimal_to_datetime_with_warn(thd, (my_decimal*)&val.x.decimal.value, - ltime, fuzzydate, 0 /* TODO */)) + ltime, fuzzydate, 0, 0 /* TODO */)) goto null; return 0; case DYN_COL_STRING: |