diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2018-12-16 02:21:41 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2018-12-16 02:21:41 +0400 |
| commit | c4ab352b670618bb478138cfbf3ed195317b3ccb (patch) | |
| tree | 3dc86ad7d504865798871ae869ab5bac40e804b2 /sql/item_strfunc.cc | |
| parent | 0a2edddbf4f4737863edf51970cbbaa91e72e11f (diff) | |
| download | mariadb-git-c4ab352b670618bb478138cfbf3ed195317b3ccb.tar.gz | |
MDEV-14576 Include full name of object in message about incorrect value for column.
The error message modified.
Then the TABLE_SHARE::error_table_name() implementation taken from 10.3,
to be used as a name of the table in this message.
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 57a1e7ec55b..76f3a98cd2d 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -5097,7 +5097,7 @@ bool Item_dyncol_get::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date) bool neg = llval < 0; if (int_to_datetime_with_warn(neg, (ulonglong)(neg ? -llval : llval), - ltime, fuzzy_date, 0 /* TODO */)) + ltime, fuzzy_date, 0, 0 /* TODO */)) goto null; return 0; } @@ -5106,12 +5106,12 @@ bool Item_dyncol_get::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date) /* fall through */ case DYN_COL_DOUBLE: if (double_to_datetime_with_warn(val.x.double_value, ltime, fuzzy_date, - 0 /* TODO */)) + 0, 0 /* TODO */)) goto null; return 0; case DYN_COL_DECIMAL: if (decimal_to_datetime_with_warn((my_decimal*)&val.x.decimal.value, ltime, - fuzzy_date, 0 /* TODO */)) + fuzzy_date, 0, 0 /* TODO */)) goto null; return 0; case DYN_COL_STRING: |