diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-11-09 15:41:26 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-11-09 15:41:26 +0400 |
| commit | 62333983e4cc72ee68f2b6990b58a59aa81af0fe (patch) | |
| tree | 42184f58f95ccb6a95d95a4f24070f5ab6fc8e08 /sql/item_row.cc | |
| parent | 7c85a8d936b1a8bb82ff069f82f5ecf3ff2ab654 (diff) | |
| parent | 0fdb0bdf2769dc4e69d46b342200d3fd333fa3a5 (diff) | |
| download | mariadb-git-62333983e4cc72ee68f2b6990b58a59aa81af0fe.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
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 6486bb66615..3660c983f87 100644 --- a/sql/item_row.cc +++ b/sql/item_row.cc @@ -110,13 +110,14 @@ void Item_row::split_sum_func(THD *thd, Ref_ptr_array ref_pointer_array, } -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_and_const_cache_init(); not_null_tables_cache= 0; for (uint i= 0; i < arg_count; i++) { - args[i]->fix_after_pullout(new_parent, &args[i]); + args[i]->fix_after_pullout(new_parent, &args[i], merge); used_tables_and_const_cache_join(args[i]); not_null_tables_cache|= args[i]->not_null_tables(); } |