diff options
author | Monty <monty@mariadb.org> | 2016-06-23 21:57:53 +0300 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2016-06-23 21:57:53 +0300 |
commit | a0d9f20c0c77702d7a8a3dbc5c295e9b1eefcafa (patch) | |
tree | 15fd0e625c4d4630e974f0bdc367db5bb6bc740a /sql/sql_time.cc | |
parent | ec38c7e60bf8dbe54b1551e75254337bec1993a4 (diff) | |
download | mariadb-git-bb-10.2-decimal.tar.gz |
Fixed compiler warnings and test failures found by buildbotbb-10.2-decimal
Fixed ccfilter to detect errors where the column is included in the error message
Diffstat (limited to 'sql/sql_time.cc')
-rw-r--r-- | sql/sql_time.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_time.cc b/sql/sql_time.cc index eddf14bfbf3..5ef036965b8 100644 --- a/sql/sql_time.cc +++ b/sql/sql_time.cc @@ -427,7 +427,7 @@ bool decimal_to_datetime_with_warn(const my_decimal *value, MYSQL_TIME *ltime, bool int_to_datetime_with_warn(bool neg, ulonglong value, MYSQL_TIME *ltime, ulonglong fuzzydate, const char *field_name) { - const ErrConvInteger str(neg ? -value : value, !neg); + const ErrConvInteger str(neg ? - (longlong) value : (longlong) value, !neg); return number_to_time_with_warn(neg, value, 0, ltime, fuzzydate, &str, field_name); } |