Name resolution context added (BUG#6443)

1 files changed, 9 insertions, 0 deletions

diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 6e307dda5be..c32c557a45e 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -124,6 +124,13 @@ st_select_lex_unit::init_prepare_fake_select_lex(THD *thd)
   fake_select_lex->table_list.link_in_list((byte *)&result_table_list,
 					   (byte **)
 					   &result_table_list.next_local);
+  for (ORDER *order= (ORDER *)global_parameters->order_list.first;
+       order;
+       order=order->next)
+  {
+    (*order->item)->walk(&Item::change_context_processor,
+                         (byte *) &fake_select_lex->context);
+  }
 }
 
 
@@ -187,6 +194,8 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
   else
     tmp_result= sel_result;
 
+  sl->context.resolve_in_select_list= TRUE;
+
   for (;sl; sl= sl->next_select())
   {
     bool can_skip_order_by;