← 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: 2009-05-06 06:59:53 UTC
  • mfrom: (1003.1.20 merge)
  • Revision ID: brian@gaz-20090506065953-4mrfmaty42e0ixpq
Merge handler cleanup (and ALTER TABLE cleanup) We go from 1 and 2 half
thought out systems... to just 1.

This should all be changed when we finish the StorageEngine rewrite

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
3894
3894
        {
3895
3895
          Table *table= field_to_set->table;
3896
3896
          if (session->mark_used_columns == MARK_COLUMNS_READ)
3897
 
            table->read_set->set(field_to_set->field_index);
 
3897
            table->setReadSet(field_to_set->field_index);
3898
3898
          else
3899
 
            table->write_set->set(field_to_set->field_index);
 
3899
            table->setWriteSet(field_to_set->field_index);
3900
3900
        }
3901
3901
      }
3902
3902
  }
4644
4644
      {
4645
4645
        Table *table_1= nj_col_1->table_ref->table;
4646
4646
        /* Mark field_1 used for table cache. */
4647
 
        table_1->read_set->set(field_1->field_index);
 
4647
        table_1->setReadSet(field_1->field_index);
4648
4648
        table_1->covering_keys&= field_1->part_of_key;
4649
4649
        table_1->merge_keys|= field_1->part_of_key;
4650
4650
      }
4652
4652
      {
4653
4653
        Table *table_2= nj_col_2->table_ref->table;
4654
4654
        /* Mark field_2 used for table cache. */
4655
 
        table_2->read_set->set(field_2->field_index);
 
4655
        table_2->setReadSet(field_2->field_index);
4656
4656
        table_2->covering_keys&= field_2->part_of_key;
4657
4657
        table_2->merge_keys|= field_2->part_of_key;
4658
4658
      }
5446
5446
      if ((field= field_iterator.field()))
5447
5447
      {
5448
5448
        /* Mark fields as used to allow storage engine to optimze access */
5449
 
        field->table->read_set->set(field->field_index);
 
5449
        field->table->setReadSet(field->field_index);
5450
5450
        if (table)
5451
5451
        {
5452
5452
          table->covering_keys&= field->part_of_key;