diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-02-15 18:08:08 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-15 18:08:08 +0100 |
| commit | 25609313ffbd9205e921d0793cf423f711d10ced (patch) | |
| tree | f04a1c26fabcc5463aca51a860f03131e02d94f7 /sql/item_cmpfunc.h | |
| parent | 47a54a2e087a7c1fc861bcbc114c14987f492cfe (diff) | |
| parent | 764eeeee74f999fe2107fc362236563be0025093 (diff) | |
| download | mariadb-git-25609313ffbd9205e921d0793cf423f711d10ced.tar.gz | |
5.3.4 merge
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 7b2193b1acd..384c91d5d2e 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -1705,7 +1705,7 @@ public: /** Add a non-constant item to the multiple equality */ void add(Item *f) { equal_items.push_back(f); } bool contains(Field *field); - Item* get_first(Item *field); + Item* get_first(struct st_join_table *context, Item *field); /** 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); |