← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/hp_scan.c

  • Committer: Monty Taylor
  • Date: 2008-10-16 09:12:23 UTC
  • mto: (511.1.6 codestyle)
  • mto: This revision was merged to the branch mainline in revision 521.
  • Revision ID: monty@inaugust.com-20081016091223-17ngih0qu9vssjs3
We pass -Wunused-macros now!

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/hp_scan.c
15
15
 
16
16
/* Scan through all rows */
17
17
 
18
 
#include "heap_priv.h"
 
18
#include "heapdef.h"
19
19
 
20
20
/*
21
21
           Returns one of following values:
35
35
 
36
36
int heap_scan(register HP_INFO *info, unsigned char *record)
37
37
{
38
 
  HP_SHARE *share=info->getShare();
 
38
  HP_SHARE *share=info->s;
39
39
  uint32_t pos;
40
40
 
41
41
  pos= ++info->current_record;
52
52
      if (pos >= info->next_block)
53
53
      {
54
54
        info->update= 0;
55
 
        return(errno= HA_ERR_END_OF_FILE);
 
55
        return(my_errno= HA_ERR_END_OF_FILE);
56
56
      }
57
57
    }
58
58
    hp_find_record(info, pos);
60
60
  if (get_chunk_status(&share->recordspace, info->current_ptr) != CHUNK_STATUS_ACTIVE)
61
61
  {
62
62
    info->update= HA_STATE_PREV_FOUND | HA_STATE_NEXT_FOUND;
63
 
    return(errno=HA_ERR_RECORD_DELETED);
 
63
    return(my_errno=HA_ERR_RECORD_DELETED);
64
64
  }
65
65
  info->update= HA_STATE_PREV_FOUND | HA_STATE_NEXT_FOUND | HA_STATE_AKTIV;
66
66
  hp_extract_record(share, record, info->current_ptr);