← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/field.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/item/field.cc
881
881
  else if (session->mark_used_columns != MARK_COLUMNS_NONE)
882
882
  {
883
883
    Table *table= field->table;
884
 
    MY_BITMAP *current_bitmap, *other_bitmap;
 
884
    MyBitmap *current_bitmap, *other_bitmap;
885
885
    if (session->mark_used_columns == MARK_COLUMNS_READ)
886
886
    {
887
887
      current_bitmap= table->read_set;
892
892
      current_bitmap= table->write_set;
893
893
      other_bitmap=   table->read_set;
894
894
    }
895
 
    if (!bitmap_test_and_set(current_bitmap, field->field_index))
 
895
    if (! current_bitmap->testAndSet(field->field_index))
896
896
    {
897
 
      if (!bitmap_is_set(other_bitmap, field->field_index))
 
897
      if (! other_bitmap->isBitSet(field->field_index))
898
898
      {
899
899
        /* First usage of column */
900
900
        table->used_fields++;                     // Used to optimize loops