Removed unnecessary key search in the hp_rb_write_key() function

2 files changed, 16 insertions, 15 deletions

diff --git a/heap/hp_open.c b/heap/hp_open.c
index 3aa35e2cf88..d48423c506a 100644
--- a/heap/hp_open.c
+++ b/heap/hp_open.c
@@ -99,8 +99,8 @@ HP_INFO *heap_open(const char *name, int mode, uint keys, HP_KEYDEF *keydef,
 
       if (keydef[i].algorithm == HA_KEY_ALG_BTREE)
       {
-	init_tree(&keyinfo->rb_tree, 0, 0, 0, (qsort_cmp2)keys_compare, 1, 
-		  NULL, NULL);
+	init_tree(&keyinfo->rb_tree, 0, 0, sizeof(byte*), 
+		  (qsort_cmp2)keys_compare, 1, NULL, NULL);
 	keyinfo->delete_key= hp_rb_delete_key;
 	keyinfo->write_key= hp_rb_write_key;
 	nsegs++;
diff --git a/heap/hp_write.c b/heap/hp_write.c
index fcfe922d9c0..3e74a98b23c 100644
--- a/heap/hp_write.c
+++ b/heap/hp_write.c
@@ -96,22 +96,23 @@ int hp_rb_write_key(HP_INFO *info, HP_KEYDEF *keyinfo, const byte *record,
   info->last_pos= NULL; /* For heap_rnext/heap_rprev */
   custom_arg.keyseg= keyinfo->seg;
   custom_arg.key_length= hp_rb_make_key(keyinfo, info->recbuf, record, recpos);
-  if ((keyinfo->flag & HA_NOSAME) &&
-      (!(keyinfo->flag & HA_NULL_PART_KEY) ||
-       !hp_if_null_in_key(keyinfo, record)))
+  if (keyinfo->flag & HA_NOSAME)
   {
     custom_arg.search_flag= SEARCH_FIND | SEARCH_SAME;
-    if (tree_search_key(&keyinfo->rb_tree, info->recbuf, info->parents, 
-	&info->last_pos, 0, &custom_arg))
-    {
-      my_errno= HA_ERR_FOUND_DUPP_KEY;
-      return 1;
-    }
+    keyinfo->rb_tree.flag= TREE_NO_DUPS;
+  }
+  else
+  {
+    custom_arg.search_flag= SEARCH_SAME;
+    keyinfo->rb_tree.flag= 0;
+  }
+  if (!tree_insert(&keyinfo->rb_tree, (void*)info->recbuf,
+		   custom_arg.key_length, &custom_arg))
+  {
+    my_errno= HA_ERR_FOUND_DUPP_KEY;
+    return 1;
   }
-  custom_arg.search_flag= SEARCH_SAME;
-  return tree_insert(&keyinfo->rb_tree, (void*)info->recbuf,
-		     custom_arg.key_length + sizeof(byte*),
-		     &custom_arg) ? 0 : 1;
+  return 0;
 }
 
 	/* Find where to place new record */