diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-08-18 19:58:51 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-08-18 19:58:51 -0700 |
| commit | 4eddb2c221d086d7181ef7ff78bb0e6ce6f3359a (patch) | |
| tree | d1b3c7ebc6b5149a4111176c53ce112a7585ae21 /sql/item_cmpfunc.h | |
| parent | b59738a598569ace75be5e63b7ed6ca69afe6ebc (diff) | |
| parent | 25c152018dceae35bf0d45de46a33a214048128c (diff) | |
| download | mariadb-git-4eddb2c221d086d7181ef7ff78bb0e6ce6f3359a.tar.gz | |
Merge 5.3->5.5.
In particular:
Merged the patch for bug mdev-4418 from 5.3 into 5.5.
Fixed a bug in the patch that should be backported to 5.3.
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 0be9730c63e..251d06499bf 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -1754,8 +1754,9 @@ public: /** Get number of field items / references to field items in this object */ uint n_field_items() { return equal_items.elements-test(with_const); } void merge(Item_equal *item); - bool merge_with_check(Item_equal *equal_item); - void merge_into_list(List<Item_equal> *list); + bool merge_with_check(Item_equal *equal_item, bool save_merged); + void merge_into_list(List<Item_equal> *list, bool save_merged, + bool only_intersected); void update_const(); enum Functype functype() const { return MULT_EQUAL_FUNC; } longlong val_int(); |