← Back to branch summary

~dshrews/drizzle/bug614061-alter-schema

« back to all changes in this revision

Viewing changes to plugin/memory/hp_rrnd.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_rrnd.cc
32
32
  if (!(info->current_ptr= pos))
33
33
  {
34
34
    info->update= 0;
35
 
    return(errno= HA_ERR_END_OF_FILE);
 
35
    return(errno=  drizzled::HA_ERR_END_OF_FILE);
36
36
  }
37
37
  if (get_chunk_status(&share->recordspace, info->current_ptr) != CHUNK_STATUS_ACTIVE)
38
38
  {
39
39
    /* treat deleted and linked chunks as deleted */
40
40
    info->update= HA_STATE_PREV_FOUND | HA_STATE_NEXT_FOUND;
41
 
    return(errno=HA_ERR_RECORD_DELETED);
 
41
    return(errno= drizzled::HA_ERR_RECORD_DELETED);
42
42
  }
43
43
  info->update=HA_STATE_PREV_FOUND | HA_STATE_NEXT_FOUND | HA_STATE_AKTIV;
44
44
  hp_extract_record(share, record, info->current_ptr);