~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/hp_rnext.c

  • Committer: Brian Aker
  • Date: 2008-07-18 20:10:26 UTC
  • mfrom: (51.3.29 remove-dbug)
  • Revision ID: brian@tangent.org-20080718201026-tto5golt0xhwqe4a
Merging in Jay's final patch on dbug.

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
  uchar *pos;
23
23
  HP_SHARE *share=info->s;
24
24
  HP_KEYDEF *keyinfo;
25
 
  DBUG_ENTER("heap_rnext");
26
25
  
27
26
  if (info->lastinx < 0)
28
 
    DBUG_RETURN(my_errno=HA_ERR_WRONG_INDEX);
 
27
    return(my_errno=HA_ERR_WRONG_INDEX);
29
28
 
30
29
  keyinfo = share->keydef + info->lastinx;
31
30
  if (keyinfo->algorithm == HA_KEY_ALG_BTREE)
107
106
    info->update=HA_STATE_NEXT_FOUND;           /* For heap_rprev */
108
107
    if (my_errno == HA_ERR_KEY_NOT_FOUND)
109
108
      my_errno=HA_ERR_END_OF_FILE;
110
 
    DBUG_RETURN(my_errno);
 
109
    return(my_errno);
111
110
  }
112
111
  memcpy(record,pos,(size_t) share->reclength);
113
112
  info->update=HA_STATE_AKTIV | HA_STATE_NEXT_FOUND;
114
 
  DBUG_RETURN(0);
 
113
  return(0);
115
114
}