diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-09-28 14:01:17 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-09-28 14:01:17 +0400 |
| commit | ad8e02ac452dc94d64b65cb9855b6dba97b651d4 (patch) | |
| tree | 7c355aab42a911476eaa10520d1adbabb7091243 /sql/my_decimal.h | |
| parent | 492998c0d80aa7d5c4804ac7792a38333e3b83dd (diff) | |
| download | mariadb-git-ad8e02ac452dc94d64b65cb9855b6dba97b651d4.tar.gz | |
MDEV-17317 Add THD* parameter into Item::get_date() and stricter data type control to "fuzzydate"
Diffstat (limited to 'sql/my_decimal.h')
| -rw-r--r-- | sql/my_decimal.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/my_decimal.h b/sql/my_decimal.h index d035641cfa6..f0bb69c60c8 100644 --- a/sql/my_decimal.h +++ b/sql/my_decimal.h @@ -29,6 +29,8 @@ #ifndef my_decimal_h #define my_decimal_h +#include "sql_basic_types.h" + #if defined(MYSQL_SERVER) || defined(EMBEDDED_LIBRARY) #include "sql_string.h" /* String */ #endif @@ -215,7 +217,7 @@ public: { return check_result(mask, decimal_round(this, to, (int) scale, mode)); } - bool to_datetime_with_warn(MYSQL_TIME *to, ulonglong fuzzydate, + bool to_datetime_with_warn(THD *thd, MYSQL_TIME *to, date_mode_t fuzzydate, const char *field_name); int to_binary(uchar *bin, int prec, int scale, uint mask= E_DEC_FATAL_ERROR) const; |