← 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-12-17 00:08:06 UTC
  • mfrom: (2002.1.4 clean)
  • Revision ID: brian@tangent.org-20101217000806-fa6kmggjnhsl4q85
Rollup for field encapsulation, monty fix for bzrignore, and Andrew bug
fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/field.cc
111
111
{
112
112
  Table *table= (Table *) arg;
113
113
  if (field->getTable() == table || !table)
114
 
    field->getTable()->setReadSet(field->field_index);
 
114
    field->getTable()->setReadSet(field->position());
115
115
 
116
116
  return 0;
117
117
}
902
902
      current_bitmap= table->write_set;
903
903
      other_bitmap=   table->read_set;
904
904
    }
905
 
    //if (! current_bitmap->testAndSet(field->field_index))
906
 
    if (! current_bitmap->test(field->field_index))
 
905
    //if (! current_bitmap->testAndSet(field->position()))
 
906
    if (! current_bitmap->test(field->position()))
907
907
    {
908
 
      if (! other_bitmap->test(field->field_index))
 
908
      if (! other_bitmap->test(field->position()))
909
909
      {
910
910
        /* First usage of column */
911
911
        table->used_fields++;                     // Used to optimize loops