1 files changed, 11 insertions, 13 deletions

diff --git a/myisam/mi_write.c b/myisam/mi_write.c
index dc596672a84..7d053ddfd22 100644
--- a/myisam/mi_write.c
+++ b/myisam/mi_write.c
@@ -124,8 +124,8 @@ int mi_write(MI_INFO *info, byte *record)
         {
           if (local_lock_tree)
             rw_unlock(&share->key_root_lock[i]);
-            DBUG_PRINT("error",("Got error: %d on write",my_errno));
-            goto err;
+          DBUG_PRINT("error",("Got error: %d on write",my_errno));
+          goto err;
         }
       }
       if (local_lock_tree)
@@ -159,18 +159,14 @@ int mi_write(MI_INFO *info, byte *record)
 
 err:
   save_errno=my_errno;
-  if (my_errno == HA_ERR_FOUND_DUPP_KEY || my_errno == HA_ERR_RECORD_FILE_FULL)
+  if (my_errno == HA_ERR_FOUND_DUPP_KEY || my_errno == HA_ERR_RECORD_FILE_FULL ||
+      my_errno == HA_ERR_NULL_IN_SPATIAL)
   {
     if (info->bulk_insert)
     {
       uint j;
       for (j=0 ; j < share->base.keys ; j++)
-      {
-        if (is_tree_inited(&info->bulk_insert[j]))
-        {
-          reset_tree(&info->bulk_insert[j]);
-        }
-      }
+        mi_flush_bulk_insert(info, j);
     }
     info->errkey= (int) i;
     while ( i-- > 0)
@@ -329,7 +325,7 @@ static int w_search(register MI_INFO *info, register MI_KEYDEF *keyinfo,
   uchar *temp_buff,*keypos;
   uchar keybuff[MI_MAX_KEY_BUFF];
   my_bool was_last_key;
-  my_off_t next_page;
+  my_off_t next_page, dupp_key_pos;
   DBUG_ENTER("w_search");
   DBUG_PRINT("enter",("page: %ld",page));
 
@@ -349,9 +345,9 @@ static int w_search(register MI_INFO *info, register MI_KEYDEF *keyinfo,
 	/* get position to record with duplicated key */
     tmp_key_length=(*keyinfo->get_key)(keyinfo,nod_flag,&keypos,keybuff);
     if (tmp_key_length)
-      info->dupp_key_pos=_mi_dpos(info,0,keybuff+tmp_key_length);
+      dupp_key_pos=_mi_dpos(info,0,keybuff+tmp_key_length);
     else
-      info->dupp_key_pos= HA_OFFSET_ERROR;
+      dupp_key_pos= HA_OFFSET_ERROR;
     if (keyinfo->flag & HA_FULLTEXT)
     {
       uint off;
@@ -370,8 +366,9 @@ static int w_search(register MI_INFO *info, register MI_KEYDEF *keyinfo,
       else
       {
         /* popular word. two-level tree. going down */
-        my_off_t root=info->dupp_key_pos;
+        my_off_t root=dupp_key_pos;
         keyinfo=&info->s->ft2_keyinfo;
+        get_key_full_length_rdonly(off, key);
         key+=off;
         keypos-=keyinfo->keylength+nod_flag; /* we'll modify key entry 'in vivo' */
         error=_mi_ck_real_write_btree(info, keyinfo, key, 0,
@@ -388,6 +385,7 @@ static int w_search(register MI_INFO *info, register MI_KEYDEF *keyinfo,
     }
     else /* not HA_FULLTEXT, normal HA_NOSAME key */
     {
+      info->dupp_key_pos= dupp_key_pos;
       my_afree((byte*) temp_buff);
       my_errno=HA_ERR_FOUND_DUPP_KEY;
       DBUG_RETURN(-1);