diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-03-23 17:40:53 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-03-23 17:40:53 +0100 |
| commit | febe1e850342ea52ce0900ba5767852b0aa42dc7 (patch) | |
| tree | af188bde7aff4951c9f845a5c22912222b6ca888 /sql/item_func.h | |
| parent | d3681c18f96ebf9b66c7541459b2eb34a4827734 (diff) | |
| parent | a2e47f8c41e60fb0eeaa01cdd41fc07b9c963768 (diff) | |
| download | mariadb-git-febe1e850342ea52ce0900ba5767852b0aa42dc7.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 1209fc5cdd8..f47b1895c87 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -67,7 +67,7 @@ public: NOW_FUNC, TRIG_COND_FUNC, SUSERVAR_FUNC, GUSERVAR_FUNC, COLLATE_FUNC, EXTRACT_FUNC, CHAR_TYPECAST_FUNC, FUNC_SP, UDF_FUNC, - NEG_FUNC, GSYSVAR_FUNC, DYNCOL_FUNC }; + NEG_FUNC, GSYSVAR_FUNC, IN_OPTIMIZER_FUNC, DYNCOL_FUNC }; enum Type type() const { return FUNC_ITEM; } virtual enum Functype functype() const { return UNKNOWN_FUNC; } Item_func(THD *thd): Item_func_or_sum(thd), allowed_arg_cols(1) |