Merge sinisa@work.mysql.com:/home/bk/mysql-4.1

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_derived.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged

1 files changed, 7 insertions, 1 deletions

diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index f48b879838f..aeaae92f0c3 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;
     thd->net.report_error=0; // donno why does it work, but it does ...
   }