← Back to branch summary

~mordred/drizzle/fix-bell-bugs

« back to all changes in this revision

Viewing changes to plugin/heap/hp_rkey.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/hp_rkey.cc
26
26
 
27
27
  if ((uint) inx >= share->keys)
28
28
  {
29
 
    return(my_errno= HA_ERR_WRONG_INDEX);
 
29
    return(errno= HA_ERR_WRONG_INDEX);
30
30
  }
31
31
  info->lastinx= inx;
32
32
  info->current_record= UINT32_MAX;             /* For heap_rrnd() */
53
53
                                                find_flag, &custom_arg)))
54
54
    {
55
55
      info->update= 0;
56
 
      return(my_errno= HA_ERR_KEY_NOT_FOUND);
 
56
      return(errno= HA_ERR_KEY_NOT_FOUND);
57
57
    }
58
58
    memcpy(&pos, pos + (*keyinfo->get_key_length)(keyinfo, pos), sizeof(unsigned char*));
59
59
    info->current_ptr= pos;
63
63
    if (!(pos= hp_search(info, share->keydef + inx, key, 0)))
64
64
    {
65
65
      info->update= 0;
66
 
      return(my_errno);
 
66
      return(errno);
67
67
    }
68
68
    if (!(keyinfo->flag & HA_NOSAME))
69
69
      memcpy(info->lastkey, key, (size_t) keyinfo->length);