summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2017-11-28 06:25:14 +0400
committerAlexander Barkov <bar@mariadb.org>2017-11-28 06:25:14 +0400
commit590400f743d029f13ddd19e07ccac0153c2a7c1f (patch)
tree0ad880e15fd676432513a8c782d35ba0cc77d9ef /sql/item_func.cc
parent6aedbf40e08395533d4f5fc29220b6f358988979 (diff)
downloadmariadb-git-590400f743d029f13ddd19e07ccac0153c2a7c1f.tar.gz
MDEV-14517 Cleanup for Item::with_subselect and Item::has_subquery()
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index e9cf5a695d0..be5e5064d60 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -362,7 +362,7 @@ Item_func::fix_fields(THD *thd, Item **ref)
with_window_func= with_window_func || item->with_window_func;
with_field= with_field || item->with_field;
used_tables_and_const_cache_join(item);
- with_subselect|= item->has_subquery();
+ m_with_subquery|= item->with_subquery();
}
}
if (check_arguments())
@@ -3248,7 +3248,7 @@ udf_handler::fix_fields(THD *thd, Item_func_or_sum *func,
func->maybe_null=1;
func->with_sum_func= func->with_sum_func || item->with_sum_func;
func->with_field= func->with_field || item->with_field;
- func->with_subselect|= item->with_subselect;
+ func->With_subquery_cache::join(item);
func->used_tables_and_const_cache_join(item);
f_args.arg_type[i]=item->result_type();
}