Merge branch '10.0' into 10.1

1 files changed, 3 insertions, 0 deletions

diff --git a/sql/item_func.cc b/sql/item_func.cc
index 0700d71a396..05a34a9a24a 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -133,6 +133,7 @@ void Item_func::sync_with_sum_func_and_with_field(List<Item> &list)
   {
     with_sum_func|= item->with_sum_func;
     with_field|= item->with_field;
+    with_param|= item->with_param;
   }
 }
 
@@ -226,6 +227,7 @@ Item_func::fix_fields(THD *thd, Item **ref)
 	maybe_null=1;
 
       with_sum_func= with_sum_func || item->with_sum_func;
+      with_param= with_param || item->with_param;
       with_field= with_field || item->with_field;
       used_tables_and_const_cache_join(item);
       with_subselect|=        item->has_subquery();
@@ -3506,6 +3508,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_param= func->with_param || item->with_param;
       func->with_subselect|= item->with_subselect;
       func->used_tables_and_const_cache_join(item);
       f_args.arg_type[i]=item->result_type();