← 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-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/sql_base.cc
1919
1919
      current_bitmap= table->write_set;
1920
1920
    }
1921
1921
 
1922
 
    //if (current_bitmap->testAndSet(field->field_index))
1923
 
    if (current_bitmap->test(field->field_index))
 
1922
    //if (current_bitmap->testAndSet(field->position()))
 
1923
    if (current_bitmap->test(field->position()))
1924
1924
    {
1925
1925
      if (session->mark_used_columns == MARK_COLUMNS_WRITE)
1926
1926
        session->dup_field= field;
2230
2230
      {
2231
2231
        Table *table= field_to_set->getTable();
2232
2232
        if (session->mark_used_columns == MARK_COLUMNS_READ)
2233
 
          table->setReadSet(field_to_set->field_index);
 
2233
          table->setReadSet(field_to_set->position());
2234
2234
        else
2235
 
          table->setWriteSet(field_to_set->field_index);
 
2235
          table->setWriteSet(field_to_set->position());
2236
2236
      }
2237
2237
    }
2238
2238
  }
2904
2904
      {
2905
2905
        Table *table_1= nj_col_1->table_ref->table;
2906
2906
        /* Mark field_1 used for table cache. */
2907
 
        table_1->setReadSet(field_1->field_index);
 
2907
        table_1->setReadSet(field_1->position());
2908
2908
        table_1->covering_keys&= field_1->part_of_key;
2909
2909
        table_1->merge_keys|= field_1->part_of_key;
2910
2910
      }
2912
2912
      {
2913
2913
        Table *table_2= nj_col_2->table_ref->table;
2914
2914
        /* Mark field_2 used for table cache. */
2915
 
        table_2->setReadSet(field_2->field_index);
 
2915
        table_2->setReadSet(field_2->position());
2916
2916
        table_2->covering_keys&= field_2->part_of_key;
2917
2917
        table_2->merge_keys|= field_2->part_of_key;
2918
2918
      }
3658
3658
      if ((field= field_iterator.field()))
3659
3659
      {
3660
3660
        /* Mark fields as used to allow storage engine to optimze access */
3661
 
        field->getTable()->setReadSet(field->field_index);
 
3661
        field->getTable()->setReadSet(field->position());
3662
3662
        if (table)
3663
3663
        {
3664
3664
          table->covering_keys&= field->part_of_key;