Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 82 insertions, 0 deletions

diff --git a/storage/heap/hp_rkey.c b/storage/heap/hp_rkey.c
new file mode 100644
index 00000000..2d9fae4c
--- /dev/null
+++ b/storage/heap/hp_rkey.c
@@ -0,0 +1,82 @@
+/* Copyright (c) 2000, 2002-2007 MySQL AB, 2009 Sun Microsystems, Inc.
+   Use is subject to license terms.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
+
+#include "heapdef.h"
+
+int heap_rkey(HP_INFO *info, uchar *record, int inx, const uchar *key, 
+              key_part_map keypart_map, enum ha_rkey_function find_flag)
+{
+  uchar *pos;
+  HP_SHARE *share= info->s;
+  HP_KEYDEF *keyinfo= share->keydef + inx;
+  DBUG_ENTER("heap_rkey");
+  DBUG_PRINT("enter",("info: %p  inx: %d", info, inx));
+
+  if ((uint) inx >= share->keys)
+  {
+    DBUG_RETURN(my_errno= HA_ERR_WRONG_INDEX);
+  }
+  info->lastinx= inx;
+  info->current_record= (ulong) ~0L;		/* For heap_rrnd() */
+  info->key_version= info->s->key_version;
+
+  if (keyinfo->algorithm == HA_KEY_ALG_BTREE)
+  {
+    heap_rb_param custom_arg;
+
+    custom_arg.keyseg= info->s->keydef[inx].seg;
+    custom_arg.key_length= info->lastkey_len= 
+      hp_rb_pack_key(keyinfo, (uchar*) info->lastkey,
+		     (uchar*) key, keypart_map);
+    custom_arg.search_flag= SEARCH_FIND | SEARCH_SAME;
+    /* for next rkey() after deletion */
+    if (find_flag == HA_READ_AFTER_KEY)
+      info->last_find_flag= HA_READ_KEY_OR_NEXT;
+    else if (find_flag == HA_READ_BEFORE_KEY)
+      info->last_find_flag= HA_READ_KEY_OR_PREV;
+    else
+      info->last_find_flag= find_flag;
+    if (!(pos= tree_search_key(&keyinfo->rb_tree, info->lastkey, info->parents,
+			       &info->last_pos, find_flag, &custom_arg)))
+    {
+      info->update= HA_STATE_NO_KEY;
+      DBUG_RETURN(my_errno= HA_ERR_KEY_NOT_FOUND);
+    }
+    memcpy(&pos, pos + (*keyinfo->get_key_length)(keyinfo, pos), sizeof(uchar*));
+    info->current_ptr= pos;
+  }
+  else
+  {
+    if (!(pos= hp_search(info, share->keydef + inx, key, 0)))
+    {
+      info->update= HA_STATE_NO_KEY;
+      DBUG_RETURN(my_errno);
+    }
+    if ((keyinfo->flag & (HA_NOSAME | HA_NULL_PART_KEY)) != HA_NOSAME)
+      memcpy(info->lastkey, key, (size_t) keyinfo->length);
+  }
+  memcpy(record, pos, (size_t) share->reclength);
+  info->update= HA_STATE_AKTIV;
+  DBUG_RETURN(0);
+}
+
+
+	/* Quick find of record */
+
+uchar* heap_find(HP_INFO *info, int inx, const uchar *key)
+{
+  return hp_search(info, info->s->keydef + inx, key, 0);
+}