diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 14:17:19 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 14:17:19 +0200 |
| commit | 226ca250ed841fa57c8b15e3a5174cec5bd961e6 (patch) | |
| tree | 5227221d70a69208effd1a652783100605b8442f /sql/item_func.h | |
| parent | b30bbb7d9a1c3855c901b74735660e49ab64a2a8 (diff) | |
| parent | 42fd53724420627da65c3862f0fef0acffca3241 (diff) | |
| download | mariadb-git-226ca250ed841fa57c8b15e3a5174cec5bd961e6.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 7565a8d5a08..487993b581f 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -2556,7 +2556,6 @@ extern enum_field_types agg_field_type(Item **items, uint nitems, bool treat_bit_as_number); double my_double_round(double value, longlong dec, bool dec_unsigned, bool truncate); -bool eval_const_cond(COND *cond); extern bool volatile mqh_used; |