diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-28 05:58:16 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-28 05:58:16 +0300 |
| commit | 2894d50e3e2e3ae161cd1429bc2f7d78af212d27 (patch) | |
| tree | a9534d5c69046eee9e4474bcae0a3a76711eb323 /sql/item.h | |
| parent | bf33056ef975c1aaed5d953e086db78c37221c78 (diff) | |
| parent | 9ace4da57156d4fccbba1ef34b43418e2cb65d4d (diff) | |
| download | mariadb-git-2894d50e3e2e3ae161cd1429bc2f7d78af212d27.tar.gz | |
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 2c26f8c4ef8..5c10690faa5 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 }; |