bk commit - 5.1 tree (mikael:1.2220) BUG#16000

[Mikael Ronström]

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2006/06/20 13:24:30-04:00 mikael@dator5.(none)
#   BUG#16000: .par file not removed plus errors to error log for 
normal errors
#
# sql/unireg.cc
#   2006/06/20 13:24:25-04:00 mikael@dator5.(none) +1 -0
#   Ensure .par file is removed after error
#
# sql/table.cc
#   2006/06/20 13:24:25-04:00 mikael@dator5.(none) +11 -0
#   Remove error printouts when error occurs during open frm as part of
#   CREATE/ALTER TABLE
#
diff -Nru a/sql/table.cc b/sql/table.cc
--- a/sql/table.cc	2006-06-20 13:53:52 -04:00
+++ b/sql/table.cc	2006-06-20 13:53:52 -04:00
@@ -1484,7 +1484,18 @@
        tmp= fix_partition_func(thd, outparam, is_create_table);
      *root_ptr= old_root;
      if (tmp)
+    {
+      if (is_create_table)
+      {
+        /*
+          During CREATE/ALTER TABLE it is ok to receive errors here.
+          It is not ok if it happens during the opening of an frm
+          file as part of a normal query.
+        */
+        error_reported= TRUE;
+      }
        goto err;
+    }
    }
  #endif

diff -Nru a/sql/unireg.cc b/sql/unireg.cc
--- a/sql/unireg.cc	2006-06-20 13:53:52 -04:00
+++ b/sql/unireg.cc	2006-06-20 13:53:52 -04:00
@@ -339,6 +339,7 @@
    DBUG_RETURN(0);

  err_handler:
+  VOID(file->create_handler_files(path, NULL, CHF_DELETE_FLAG, 
create_info));
    my_delete(frm_name, MYF(0));
    DBUG_RETURN(1);
  } /* rea_create_table */

Mikael Ronstrom, Senior Software Architect
MySQL AB, www.mysql.com

Jumpstart your cluster:
http://www.mysql.com/consulting/packaged/cluster.html
My blog:
http://mikaelronstrom.blogspot.com