← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Brian Aker
  • Date: 2010-10-08 14:22:02 UTC
  • mfrom: (1802.16.21 bug621875)
  • mto: This revision was merged to the branch mainline in revision 1824.
  • Revision ID: brian@tangent.org-20101008142202-96maf31n9odkc13n
Merge Padraig

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
2319
2319
{
2320
2320
  if (session->mark_used_columns != MARK_COLUMNS_NONE)
2321
2321
  {
2322
 
    MyBitmap *current_bitmap, *other_bitmap;
 
2322
    boost::dynamic_bitset<> *current_bitmap= NULL;
2323
2323
 
2324
2324
    /*
2325
2325
      We always want to register the used keys, as the column bitmap may have
2332
2332
    if (session->mark_used_columns == MARK_COLUMNS_READ)
2333
2333
    {
2334
2334
      current_bitmap= table->read_set;
2335
 
      other_bitmap=   table->write_set;
2336
2335
    }
2337
2336
    else
2338
2337
    {
2339
2338
      current_bitmap= table->write_set;
2340
 
      other_bitmap=   table->read_set;
2341
2339
    }
2342
2340
 
2343
 
    if (current_bitmap->testAndSet(field->field_index))
 
2341
    //if (current_bitmap->testAndSet(field->field_index))
 
2342
    if (current_bitmap->test(field->field_index))
2344
2343
    {
2345
2344
      if (session->mark_used_columns == MARK_COLUMNS_WRITE)
2346
2345
        session->dup_field= field;