diff options
| author | Igor Babaev <igor@askmonty.org> | 2018-11-10 14:52:57 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2018-11-10 14:52:57 -0800 |
| commit | 5f46670bd09babbee75a24ac82eb4ade0706da66 (patch) | |
| tree | 85e2759b75650b8165c3e01638e9458eb4d1274c /sql/my_decimal.h | |
| parent | 8d5a11122c32f4d9eb87536886c6e893377bdd07 (diff) | |
| parent | 3ea7de9a78a1410a9b79362774247e9e44b201b3 (diff) | |
| download | mariadb-git-5f46670bd09babbee75a24ac82eb4ade0706da66.tar.gz | |
Merge branch '10.4' into 10.4-mdev16188
Diffstat (limited to 'sql/my_decimal.h')
| -rw-r--r-- | sql/my_decimal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/my_decimal.h b/sql/my_decimal.h index d035641cfa6..b22c686cc90 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,8 +217,6 @@ public: { return check_result(mask, decimal_round(this, to, (int) scale, mode)); } - bool to_datetime_with_warn(MYSQL_TIME *to, ulonglong fuzzydate, - const char *field_name); int to_binary(uchar *bin, int prec, int scale, uint mask= E_DEC_FATAL_ERROR) const; #endif |