~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_rsame.c

Removed/replaced DBUG

Show diffs side-by-side

added added

removed removed

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