diff options
| author | unknown <sanja@askmonty.org> | 2012-12-23 23:37:11 +0200 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2012-12-23 23:37:11 +0200 |
| commit | 61412c0c31138ca2e08636c10823bc55e6a7a84c (patch) | |
| tree | af7b89ebb5f2334b21ab1f658d764829bfcbf7e1 /sql/item_func.h | |
| parent | 88b59efef6ae869bac9d14cefe2982a1061d3c93 (diff) | |
| parent | 082ff5931770ed70df0ec1e85f81fa880a4d9e62 (diff) | |
| download | mariadb-git-61412c0c31138ca2e08636c10823bc55e6a7a84c.tar.gz | |
pre-merge
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 80fa0b5d634..b9b6c865bfd 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -58,7 +58,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 }; + NEG_FUNC, GSYSVAR_FUNC, DYNCOL_FUNC }; enum optimize_type { OPTIMIZE_NONE,OPTIMIZE_KEY,OPTIMIZE_OP, OPTIMIZE_NULL, OPTIMIZE_EQUAL }; enum Type type() const { return FUNC_ITEM; } |