Fixed bugs pointed by "Crash with 'big' derivated table in MySQL-4.1" bugreport

 - fixed switching from heap to MyISAM table
 - fixed error handler


sql/sql_derived.cc:
  A fix for the bug when MyISAM tmp table has to be created in order to resolve derived table.
  fixed error handler
sql/sql_parse.cc:
  fixed error handler
sql/sql_union.cc:
  fixed switching from heap to MyISAM table

1 files changed, 7 insertions, 1 deletions

diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 53f89747ce7..0e6de306c0d 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -78,7 +78,13 @@ bool select_union::send_data(List<Item> &values)
   fill_record(table->field,values);
   if ((write_record(table,&info)))
   {
-    if (create_myisam_from_heap(table, tmp_table_param, info.last_errno, 0))
+    if (thd->net.last_errno == ER_RECORD_FILE_FULL)
+    {
+      thd->clear_error(); // do not report user about table overflow
+      if (create_myisam_from_heap(table, tmp_table_param, info.last_errno, 0))
+	return 1;
+    }
+    else
       return 1;
   }
   return 0;