Merge neptunus.(none):/home/msvensson/mysql/bug17039/my50-bug17039

into  neptunus.(none):/home/msvensson/mysql/bug17039/my51-bug17039


sql/sql_union.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

1 files changed, 13 insertions, 2 deletions

diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 3e6a3944093..b4a84089e62 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -689,7 +689,17 @@ bool st_select_lex_unit::change_result(select_subselect *result,
 
 List<Item> *st_select_lex_unit::get_unit_column_types()
 {
-  bool is_union= test(first_select()->next_select());
+  SELECT_LEX *sl= first_select();
+  bool is_union= test(sl->next_select());
+  bool is_procedure= test(sl->join->procedure);
+
+  if (is_procedure)
+  {
+    /* Types for "SELECT * FROM t1 procedure analyse()"
+       are generated during execute */
+    return &sl->join->procedure_fields_list;
+  }
+
 
   if (is_union)
   {
@@ -697,7 +707,8 @@ List<Item> *st_select_lex_unit::get_unit_column_types()
     /* Types are generated during prepare */
     return &types;
   }
-  return &first_select()->item_list;
+
+  return &sl->item_list;
 }
 
 bool st_select_lex::cleanup()