← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-07-30 02:39:13 UTC
  • mto: (1115.3.11 captain)
  • mto: This revision was merged to the branch mainline in revision 1121.
  • Revision ID: osullivan.padraig@gmail.com-20090730023913-o2zuocp32l6btnc2
Removing references to MY_BITMAP throughout the code base and updating calls
to MyBitmap in various places to use the new interface.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
2599
2599
{
2600
2600
  if (session->mark_used_columns != MARK_COLUMNS_NONE)
2601
2601
  {
2602
 
    MY_BITMAP *current_bitmap, *other_bitmap;
 
2602
    MyBitmap *current_bitmap, *other_bitmap;
2603
2603
 
2604
2604
    /*
2605
2605
      We always want to register the used keys, as the column bitmap may have
2620
2620
      other_bitmap=   table->read_set;
2621
2621
    }
2622
2622
 
2623
 
    if (bitmap_test_and_set(current_bitmap, field->field_index))
 
2623
    if (current_bitmap->testAndSet(field->field_index))
2624
2624
    {
2625
2625
      if (session->mark_used_columns == MARK_COLUMNS_WRITE)
2626
2626
        session->dup_field= field;