diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-03-23 11:44:29 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-03-23 11:44:29 +0100 |
| commit | a2e47f8c41e60fb0eeaa01cdd41fc07b9c963768 (patch) | |
| tree | 1846a0fdfdff14207698f563376afbdae5d33c8c /sql/item_func.h | |
| parent | 04921000594dcbdf23340850b9284fd30ccdb0fd (diff) | |
| parent | ddc5c65333a4add28907ccb82054ecba0ff6b873 (diff) | |
| download | mariadb-git-a2e47f8c41e60fb0eeaa01cdd41fc07b9c963768.tar.gz | |
Merge branch '5.5' into 10.0
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 7dea193c99b..f4fe966f371 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -73,7 +73,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 optimize_type { OPTIMIZE_NONE,OPTIMIZE_KEY,OPTIMIZE_OP, OPTIMIZE_NULL, OPTIMIZE_EQUAL }; enum Type type() const { return FUNC_ITEM; } |