diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-07-13 11:05:33 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-07-13 11:05:33 -0700 |
| commit | 102fb4e0b8f5c9fc12b4555d5ca4cd5795b919e5 (patch) | |
| tree | 56d555391419101e6110822e7f3111f423aca068 /sql/item_cmpfunc.h | |
| parent | bf2844980300376262de43ae198d7aedfe9fae8e (diff) | |
| download | mariadb-git-102fb4e0b8f5c9fc12b4555d5ca4cd5795b919e5.tar.gz | |
Corrected the code of the recent patch that had changed the base
class for Item_func_xor. Added the implementation of the
subst_argument_checker virtual method that the objects of this
class used to use before the patch.
Reverted the previous result changes in sunselect_sj and
subselect_sj_jcl6.
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 29107e944f5..4a0cf62dfa3 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -405,6 +405,10 @@ public: longlong val_int(); void top_level_item() {} Item *neg_transformer(THD *thd); + bool subst_argument_checker(uchar **arg) + { + return (*arg != NULL); + } }; class Item_func_not :public Item_bool_func |