1 files changed, 7 insertions, 6 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 7f8d7ade67b..4225dd43b12 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -107,10 +107,10 @@ public:
   }
   void split_sum_func(Item **ref_pointer_array, List<Item> &fields);
   const char *func_name() const { return "concat_ws"; }
-  void set_outer_resolving()
+  bool walk(Item_processor processor, byte *arg)
   {
-    separator->set_outer_resolving();
-    Item_func::set_outer_resolving();
+    return separator->walk(processor, arg) ||
+      Item_str_func::walk(processor, arg);
   }
 };
 
@@ -401,10 +401,11 @@ public:
   void fix_length_and_dec();
   void update_used_tables();
   const char *func_name() const { return "make_set"; }
-  void set_outer_resolving()
+
+  bool walk(Item_processor processor, byte *arg)
   {
-    item->set_outer_resolving();
-    Item_str_func::set_outer_resolving();
+    return item->walk(processor, arg) ||
+      Item_str_func::walk(processor, arg);
   }
 };