diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-17 19:11:42 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-17 19:11:42 +0300 |
| commit | d88c136b9fb409cbf6421635a6175329e7182cd7 (patch) | |
| tree | 7f713ddfece5aeefd47025e1beca2fc0a541248b /sql/item_func.h | |
| parent | 13e217b8c1da39b1246fe82203a4c8897d4c9e8d (diff) | |
| parent | 2fa4ed031ce6cc6370671058ccc3d119b8cb3d91 (diff) | |
| download | mariadb-git-d88c136b9fb409cbf6421635a6175329e7182cd7.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 40012cfcbaa..4d73bf8ce47 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -76,7 +76,10 @@ public: SUSERVAR_FUNC, GUSERVAR_FUNC, COLLATE_FUNC, EXTRACT_FUNC, CHAR_TYPECAST_FUNC, FUNC_SP, UDF_FUNC, NEG_FUNC, GSYSVAR_FUNC, IN_OPTIMIZER_FUNC, DYNCOL_FUNC, - JSON_EXTRACT_FUNC }; + JSON_EXTRACT_FUNC, + CASE_SEARCHED_FUNC, // Used by ColumnStore/Spider + CASE_SIMPLE_FUNC // Used by ColumnStore/spider + }; static scalar_comparison_op functype_to_scalar_comparison_op(Functype type) { switch (type) { |