1 files changed, 84 insertions, 83 deletions

diff --git a/storage/maria/ma_rkey.c b/storage/maria/ma_rkey.c
index 27584e3db0b..9e529aca666 100644
--- a/storage/maria/ma_rkey.c
+++ b/storage/maria/ma_rkey.c
@@ -18,17 +18,22 @@
 #include "maria_def.h"
 #include "ma_rt_index.h"
 
-	/* Read a record using key */
-	/* Ordinary search_flag is 0 ; Give error if no record with key */
+/**
+  Read a record using key
 
-int maria_rkey(MARIA_HA *info, uchar *buf, int inx, const uchar *key,
+  @note
+  Ordinary search_flag is 0 ; Give error if no record with key
+*/
+
+int maria_rkey(MARIA_HA *info, uchar *buf, int inx, const uchar *key_data,
                key_part_map keypart_map, enum ha_rkey_function search_flag)
 {
   uchar *key_buff;
   MARIA_SHARE *share= info->s;
   MARIA_KEYDEF *keyinfo;
   HA_KEYSEG *last_used_keyseg;
-  uint pack_key_length, use_key_length, nextflag;
+  uint32 nextflag;
+  MARIA_KEY key;
   DBUG_ENTER("maria_rkey");
   DBUG_PRINT("enter", ("base: 0x%lx  buf: 0x%lx  inx: %d  search_flag: %d",
                        (long) info, (long) buf, inx, search_flag));
@@ -40,6 +45,8 @@ int maria_rkey(MARIA_HA *info, uchar *buf, int inx, const uchar *key,
   info->last_key_func= search_flag;
   keyinfo= share->keyinfo + inx;
 
+  key_buff= info->lastkey_buff+info->s->base.max_key_length;
+
   if (info->once_flags & USE_PACKED_KEYS)
   {
     info->once_flags&= ~USE_PACKED_KEYS;	/* Reset flag */
@@ -47,40 +54,39 @@ int maria_rkey(MARIA_HA *info, uchar *buf, int inx, const uchar *key,
       key is already packed!;  This happens when we are using a MERGE TABLE
       In this key 'key_part_map' is the length of the key !
     */
-    key_buff= info->lastkey+info->s->base.max_key_length;
-    pack_key_length= keypart_map;
-    bmove(key_buff, key, pack_key_length);
-    last_used_keyseg= info->s->keyinfo[inx].seg + info->last_used_keyseg;
+    bmove(key_buff, key_data, keypart_map);
+    key.data=    key_buff;
+    key.keyinfo= keyinfo;
+    key.data_length= keypart_map;
+    key.ref_length= 0;
+    key.flag= 0;
+
+    last_used_keyseg= keyinfo->seg + info->last_used_keyseg;
   }
   else
   {
     DBUG_ASSERT(keypart_map);
     /* Save the packed key for later use in the second buffer of lastkey. */
-    key_buff=info->lastkey+info->s->base.max_key_length;
-    pack_key_length= _ma_pack_key(info,(uint) inx, key_buff, key,
-                                  keypart_map, &last_used_keyseg);
+    _ma_pack_key(info, &key, inx, key_buff, key_data,
+                 keypart_map, &last_used_keyseg);
     /* Save packed_key_length for use by the MERGE engine. */
-    info->pack_key_length= pack_key_length;
+    info->pack_key_length= key.data_length;
     info->last_used_keyseg= (uint16) (last_used_keyseg -
-                                      info->s->keyinfo[inx].seg);
-    DBUG_EXECUTE("key", _ma_print_key(DBUG_FILE, keyinfo->seg,
-                                      key_buff, pack_key_length););
+                                      keyinfo->seg);
+    DBUG_EXECUTE("key", _ma_print_key(DBUG_FILE, &key););
   }
 
   if (fast_ma_readinfo(info))
     goto err;
   if (share->lock_key_trees)
-    rw_rdlock(&share->key_root_lock[inx]);
+    rw_rdlock(&keyinfo->root_lock);
 
-  nextflag=maria_read_vec[search_flag];
-  use_key_length=pack_key_length;
-  if (!(nextflag & (SEARCH_FIND | SEARCH_NO_FIND | SEARCH_LAST)))
-    use_key_length=USE_WHOLE_KEY;
+  nextflag= maria_read_vec[search_flag] | key.flag;
 
-  switch (info->s->keyinfo[inx].key_alg) {
+  switch (keyinfo->key_alg) {
 #ifdef HAVE_RTREE_KEYS
   case HA_KEY_ALG_RTREE:
-    if (maria_rtree_find_first(info,inx,key_buff,use_key_length,nextflag) < 0)
+    if (maria_rtree_find_first(info, &key, nextflag) < 0)
     {
       maria_print_error(info->s, HA_ERR_CRASHED);
       my_errno= HA_ERR_CRASHED;
@@ -90,74 +96,66 @@ int maria_rkey(MARIA_HA *info, uchar *buf, int inx, const uchar *key,
 #endif
   case HA_KEY_ALG_BTREE:
   default:
-    if (!_ma_search(info, keyinfo, key_buff, use_key_length,
-                    maria_read_vec[search_flag],
-                    info->s->state.key_root[inx]) &&
-        share->non_transactional_concurrent_insert)
-    {
+    if (!_ma_search(info, &key, nextflag, info->s->state.key_root[inx]))
+    {      
+      MARIA_KEY lastkey;
+      lastkey.keyinfo= keyinfo;
+      lastkey.data= info->lastkey_buff;
       /*
         Found a key, but it might not be usable. We cannot use rows that
         are inserted by other threads after we got our table lock
         ("concurrent inserts"). The record may not even be present yet.
         Keys are inserted into the index(es) before the record is
-        inserted into the data file. When we got our table lock, we
-        saved the current data_file_length. Concurrent inserts always go
-        to the end of the file. So we can test if the found key
-        references a new record.
+        inserted into the data file. 
       */
-      if (info->cur_row.lastpos >= info->state->data_file_length)
+      if ((*share->row_is_visible)(info))
+        break;
+
+      /* The key references a concurrently inserted record. */
+      if (search_flag == HA_READ_KEY_EXACT &&
+          last_used_keyseg == keyinfo->seg + keyinfo->keysegs)
+      {
+        /* Simply ignore the key if it matches exactly. (Bug #29838) */
+        my_errno= HA_ERR_KEY_NOT_FOUND;
+        info->cur_row.lastpos= HA_OFFSET_ERROR;
+        break;
+      }
+
+      do
       {
-        /* The key references a concurrently inserted record. */
-        if (search_flag == HA_READ_KEY_EXACT &&
-            last_used_keyseg == keyinfo->seg + keyinfo->keysegs)
+        uint not_used[2];
+        /*
+          Skip rows that are inserted by other threads since we got
+          a lock. Note that this can only happen if we are not
+          searching after a full length exact key, because the keys
+          are sorted according to position.
+        */
+        lastkey.data_length= info->last_key.data_length;
+        lastkey.ref_length=  info->last_key.ref_length;
+        lastkey.flag=        info->last_key.flag;
+        if  (_ma_search_next(info, &lastkey, maria_readnext_vec[search_flag],
+                             info->s->state.key_root[inx]))
+          break;                          /* purecov: inspected */
+        /*
+          Check that the found key does still match the search.
+          _ma_search_next() delivers the next key regardless of its
+          value.
+        */
+        if (!(nextflag & (SEARCH_BIGGER | SEARCH_SMALLER)) &&
+            ha_key_cmp(keyinfo->seg, info->last_key.data, key.data,
+                       key.data_length, SEARCH_FIND, not_used))
         {
-          /* Simply ignore the key if it matches exactly. (Bug #29838) */
+          /* purecov: begin inspected */
           my_errno= HA_ERR_KEY_NOT_FOUND;
           info->cur_row.lastpos= HA_OFFSET_ERROR;
+          break;
+          /* purecov: end */
         }
-        else
-        {
-          /*
-            If searching for a partial key (or using >, >=, < or <=) and
-            the data is outside of the data file, we need to continue
-            searching for the first key inside the data file.
-          */
-          do
-          {
-            uint not_used[2];
-            /*
-              Skip rows that are inserted by other threads since we got
-              a lock. Note that this can only happen if we are not
-              searching after a full length exact key, because the keys
-              are sorted according to position.
-            */
-            if  (_ma_search_next(info, keyinfo, info->lastkey,
-                                 info->lastkey_length,
-                                 maria_readnext_vec[search_flag],
-                                 info->s->state.key_root[inx]))
-              break;                          /* purecov: inspected */
-            /*
-              Check that the found key does still match the search.
-              _ma_search_next() delivers the next key regardless of its
-              value.
-            */
-            if (search_flag == HA_READ_KEY_EXACT &&
-                ha_key_cmp(keyinfo->seg, key_buff, info->lastkey,
-                           use_key_length, SEARCH_FIND, not_used))
-            {
-              /* purecov: begin inspected */
-              my_errno= HA_ERR_KEY_NOT_FOUND;
-              info->cur_row.lastpos= HA_OFFSET_ERROR;
-              break;
-              /* purecov: end */
-            }
-          } while (info->cur_row.lastpos >= info->state->data_file_length);
-        }
-      }
+      } while (!(*share->row_is_visible)(info));
     }
   }
   if (share->lock_key_trees)
-    rw_unlock(&share->key_root_lock[inx]);
+    rw_unlock(&keyinfo->root_lock);
 
   if (info->cur_row.lastpos == HA_OFFSET_ERROR)
   {
@@ -166,11 +164,11 @@ int maria_rkey(MARIA_HA *info, uchar *buf, int inx, const uchar *key,
   }
 
   /* Calculate length of the found key;  Used by maria_rnext_same */
-  if ((keyinfo->flag & HA_VAR_LENGTH_KEY) && last_used_keyseg)
-    info->last_rkey_length= _ma_keylength_part(keyinfo, info->lastkey,
+  if ((keyinfo->flag & HA_VAR_LENGTH_KEY))
+    info->last_rkey_length= _ma_keylength_part(keyinfo, info->lastkey_buff,
 					       last_used_keyseg);
   else
-    info->last_rkey_length= pack_key_length;
+    info->last_rkey_length= key.data_length;
 
   /* Check if we don't want to have record back, only error message */
   if (!buf)
@@ -188,10 +186,13 @@ int maria_rkey(MARIA_HA *info, uchar *buf, int inx, const uchar *key,
 
 err:
   /* Store last used key as a base for read next */
-  memcpy(info->lastkey,key_buff,pack_key_length);
-  info->last_rkey_length= pack_key_length;
-  bzero((char*) info->lastkey+pack_key_length,info->s->base.rec_reflength);
-  info->lastkey_length=pack_key_length+info->s->base.rec_reflength;
+  memcpy(info->last_key.data, key_buff, key.data_length);
+  info->last_key.data_length= key.data_length;
+  info->last_key.ref_length=  info->s->base.rec_reflength;
+  info->last_key.flag= 0;
+  /* Create key with rowid 0 */
+  bzero((char*) info->last_key.data + info->last_key.data_length,
+        info->s->base.rec_reflength);
 
   if (search_flag == HA_READ_AFTER_KEY)
     info->update|=HA_STATE_NEXT_FOUND;		/* Previous gives last row */