diff options
Diffstat (limited to 'sql/item_row.h')
| -rw-r--r-- | sql/item_row.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_row.h b/sql/item_row.h index 83e9743fede..a6fdd2b212c 100644 --- a/sql/item_row.h +++ b/sql/item_row.h @@ -81,7 +81,7 @@ public: return 0; }; bool fix_fields(THD *thd, Item **ref); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); void cleanup(); void split_sum_func(THD *thd, Ref_ptr_array ref_pointer_array, List<Item> &fields, uint flags); |