merged

sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

1 files changed, 7 insertions, 2 deletions

diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 585b5de11ab..0eea10e068a 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -103,7 +103,7 @@ int mysql_union(THD *thd, LEX *lex,select_result *result)
     goto exit;
   }
   union_result->save_time_stamp=!describe;
-
+  union_result->tmp_table_param=&tmp_table_param;
   for (sl= &lex->select_lex; sl; sl= sl->next_select())
   {
     lex->select=sl;
@@ -222,7 +222,12 @@ bool select_union::send_data(List<Item> &values)
     return 0;
   }
   fill_record(table->field,values);
-  return write_record(table,&info) ? 1 : 0;
+  if ((write_record(table,&info)))
+  {
+    if (create_myisam_from_heap(table, tmp_table_param, info.errorno, 0))
+      return 1;
+  }
+  return 0;
 }
 
 bool select_union::send_eof()