← Back to branch summary

~mordred/drizzle/fix-bell-bugs

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_rsame.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_rsame.cc
31
31
{
32
32
  if (inx != -1 && ! mi_is_key_active(info->s->state.key_map, inx))
33
33
  {
34
 
    return(my_errno=HA_ERR_WRONG_INDEX);
 
34
    return(errno=HA_ERR_WRONG_INDEX);
35
35
  }
36
36
  if (info->lastpos == HA_OFFSET_ERROR || info->update & HA_STATE_DELETED)
37
37
  {
38
 
    return(my_errno=HA_ERR_KEY_NOT_FOUND);      /* No current record */
 
38
    return(errno=HA_ERR_KEY_NOT_FOUND); /* No current record */
39
39
  }
40
40
  info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
41
41
 
42
42
  /* Read row from data file */
43
43
  if (fast_mi_readinfo(info))
44
 
    return(my_errno);
 
44
    return(errno);
45
45
 
46
46
  if (inx >= 0)
47
47
  {
59
59
 
60
60
  if (!(*info->read_record)(info,info->lastpos,record))
61
61
    return(0);
62
 
  if (my_errno == HA_ERR_RECORD_DELETED)
63
 
    my_errno=HA_ERR_KEY_NOT_FOUND;
64
 
  return(my_errno);
 
62
  if (errno == HA_ERR_RECORD_DELETED)
 
63
    errno=HA_ERR_KEY_NOT_FOUND;
 
64
  return(errno);
65
65
} /* mi_rsame */