← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handler.cc

  • Committer: Jay Pipes
  • Date: 2009-08-20 20:29:18 UTC
  • mfrom: (1103.6.6 refactor-bitmap-class)
  • mto: This revision was merged to the branch mainline in revision 1121.
  • Revision ID: jpipes@serialcoder-20090820202918-39ey4uyvwh9z4ya5
Merge Padraig's refactoring of MY_BITMAP struct to a proper class interface.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/handler.cc
2711
2711
int handler::ha_reset()
2712
2712
{
2713
2713
  /* Check that we have called all proper deallocation functions */
2714
 
  assert((unsigned char*) table->def_read_set.bitmap +
 
2714
  assert((unsigned char*) table->def_read_set.getBitmap() +
2715
2715
              table->s->column_bitmap_size ==
2716
 
              (unsigned char*) table->def_write_set.bitmap);
2717
 
  assert(bitmap_is_set_all(&table->s->all_set));
 
2716
              (unsigned char*) table->def_write_set.getBitmap());
 
2717
  assert(table->s->all_set.isSetAll());
2718
2718
  assert(table->key_read == 0);
2719
2719
  /* ensure that ha_index_end / ha_rnd_end has been called */
2720
2720
  assert(inited == NONE);