diff options
Diffstat (limited to 'sql/item_row.cc')
| -rw-r--r-- | sql/item_row.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_row.cc b/sql/item_row.cc index b38cffd1ad5..c07ea612850 100644 --- a/sql/item_row.cc +++ b/sql/item_row.cc @@ -184,14 +184,15 @@ void Item_row::update_used_tables() } -void Item_row::fix_after_pullout(st_select_lex *new_parent, Item **ref) +void Item_row::fix_after_pullout(st_select_lex *new_parent, Item **ref, + bool merge) { used_tables_cache= 0; const_item_cache= 1; not_null_tables_cache= 0; for (uint i= 0; i < arg_count; i++) { - items[i]->fix_after_pullout(new_parent, &items[i]); + items[i]->fix_after_pullout(new_parent, &items[i], merge); used_tables_cache|= items[i]->used_tables(); const_item_cache&= items[i]->const_item(); not_null_tables_cache|= items[i]->not_null_tables(); |