← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/field.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/item/field.cc
30
30
#include <drizzled/item/outer_ref.h>
31
31
#include <drizzled/plugin/client.h>
32
32
 
 
33
#include <boost/dynamic_bitset.hpp>
 
34
 
33
35
namespace drizzled
34
36
{
35
37
 
889
891
  else if (session->mark_used_columns != MARK_COLUMNS_NONE)
890
892
  {
891
893
    Table *table= field->getTable();
892
 
    MyBitmap *current_bitmap, *other_bitmap;
 
894
    boost::dynamic_bitset<> *current_bitmap, *other_bitmap;
893
895
    if (session->mark_used_columns == MARK_COLUMNS_READ)
894
896
    {
895
897
      current_bitmap= table->read_set;
900
902
      current_bitmap= table->write_set;
901
903
      other_bitmap=   table->read_set;
902
904
    }
903
 
    if (! current_bitmap->testAndSet(field->field_index))
 
905
    //if (! current_bitmap->testAndSet(field->field_index))
 
906
    if (! current_bitmap->test(field->field_index))
904
907
    {
905
 
      if (! other_bitmap->isBitSet(field->field_index))
 
908
      if (! other_bitmap->test(field->field_index))
906
909
      {
907
910
        /* First usage of column */
908
911
        table->used_fields++;                     // Used to optimize loops