← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/memory/hp_scan.cc

  • Committer: Lee Bieber
  • Date: 2011-01-12 04:30:24 UTC
  • mfrom: (2075.1.3 build)
  • Revision ID: kalebral@gmail.com-20110112043024-zgws6jzd54oym9um
Merge Brian - fix bug 527084 - DROP TABLE: getTableDefiniton returns EEXIST but doDropTable returns ENOENT leads to SIGSEGV
Merge Shrews - fix bug 686781 - Transaction message segmenting does not work in all cases 
Merge Stewart - fix bug 376299: sum_distinct-big test fails after resetting max_heap_table_size

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/memory/hp_scan.cc
52
52
      if (pos >= info->next_block)
53
53
      {
54
54
        info->update= 0;
55
 
        return(errno= HA_ERR_END_OF_FILE);
 
55
        return(errno=  drizzled::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(errno= drizzled::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);