Merge work:/home/bk/mysql-4.0

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

1 files changed, 11 insertions, 0 deletions

diff --git a/myisam/mi_write.c b/myisam/mi_write.c
index 5b3e8d541c7..e1b147d02e9 100644
--- a/myisam/mi_write.c
+++ b/myisam/mi_write.c
@@ -156,6 +156,17 @@ err:
   save_errno=my_errno;
   if (my_errno == HA_ERR_FOUND_DUPP_KEY || my_errno == HA_ERR_RECORD_FILE_FULL)
   {
+    if (info->bulk_insert)
+    {
+      int j;
+      for (j=0 ; j < share->base.keys ; j++)
+      {
+        if (is_tree_inited(& info->bulk_insert[j]))
+        {
+          reset_tree(& info->bulk_insert[j]);
+        }
+      }
+    }
     info->errkey= (int) i;
     while ( i-- > 0)
     {