← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/hp_rfirst.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:
storage/heap/hp_rfirst.c
22
22
  HP_SHARE *share = info->s;
23
23
  HP_KEYDEF *keyinfo = share->keydef + inx;
24
24
  
25
 
  DBUG_ENTER("heap_rfirst");
26
25
  info->lastinx= inx;
27
26
  if (keyinfo->algorithm == HA_KEY_ALG_BTREE)
28
27
  {
51
50
    else
52
51
    {
53
52
      my_errno = HA_ERR_END_OF_FILE;
54
 
      DBUG_RETURN(my_errno);
 
53
      return(my_errno);
55
54
    }
56
 
    DBUG_RETURN(0);
 
55
    return(0);
57
56
  }
58
57
  else
59
58
  {
60
59
    if (!(info->s->records))
61
60
    {
62
61
      my_errno=HA_ERR_END_OF_FILE;
63
 
      DBUG_RETURN(my_errno);
 
62
      return(my_errno);
64
63
    }
65
 
    DBUG_ASSERT(0); /* TODO fix it */
 
64
    assert(0); /* TODO fix it */
66
65
    info->current_record=0;
67
66
    info->current_hash_ptr=0;
68
67
    info->update=HA_STATE_PREV_FOUND;
69
 
    DBUG_RETURN(heap_rnext(info,record));
 
68
    return(heap_rnext(info,record));
70
69
  }
71
70
}