diff options
| author | unknown <timour@askmonty.org> | 2011-05-23 11:54:26 +0300 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2011-05-23 11:54:26 +0300 |
| commit | 8a314700f92400ecefbfb7d6a1af4cfc117a23fd (patch) | |
| tree | 74fab9b60cd52521dbb1d6b65015e4fb9fae2169 /sql/item.h | |
| parent | 4749f34bf0c4456ad4bfe8c0f15d0b266052ba6f (diff) | |
| parent | 742dfc92a2de5ae9bc8b4d115d2bbd6dbb401bcc (diff) | |
| download | mariadb-git-8a314700f92400ecefbfb7d6a1af4cfc117a23fd.tar.gz | |
MWL#89 automatic merge with 5.3
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 9bb00c5db84..55c061690e4 100644 --- a/sql/item.h +++ b/sql/item.h @@ -536,7 +536,7 @@ public: SUBSELECT_ITEM, ROW_ITEM, CACHE_ITEM, TYPE_HOLDER, PARAM_ITEM, TRIGGER_FIELD_ITEM, DECIMAL_ITEM, XPATH_NODESET, XPATH_NODESET_CMP, - VIEW_FIXER_ITEM, EXPR_CACHE_ITEM, UNKNOWN_ITEM}; + VIEW_FIXER_ITEM, EXPR_CACHE_ITEM}; enum cond_result { COND_UNDEF,COND_OK,COND_TRUE,COND_FALSE }; |