← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Monty Taylor
  • Date: 2009-05-09 22:57:25 UTC
  • mto: This revision was merged to the branch mainline in revision 1009.
  • Revision ID: mordred@inaugust.com-20090509225725-bphxydmrz1poxbz7
Moved some things to the API.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
2726
2726
    We must set bit in read set as update_auto_increment() is using the
2727
2727
    store() to check overflow of auto_increment values
2728
2728
  */
2729
 
  bitmap_set_bit(read_set, found_next_number_field->field_index);
2730
 
  bitmap_set_bit(write_set, found_next_number_field->field_index);
 
2729
  setReadSet(found_next_number_field->field_index);
 
2730
  setWriteSet(found_next_number_field->field_index);
2731
2731
  if (s->next_number_keypart)
2732
2732
    mark_columns_used_by_index_no_reset(s->next_number_index);
2733
2733
}
2776
2776
    for (reg_field= field ; *reg_field ; reg_field++)
2777
2777
    {
2778
2778
      if ((*reg_field)->flags & PART_KEY_FLAG)
2779
 
        bitmap_set_bit(read_set, (*reg_field)->field_index);
 
2779
        setReadSet((*reg_field)->field_index);
2780
2780
    }
2781
2781
  }
2782
2782
}
2825
2825
    {
2826
2826
      /* Merge keys is all keys that had a column refered to in the query */
2827
2827
      if (is_overlapping(merge_keys, (*reg_field)->part_of_key))
2828
 
        bitmap_set_bit(read_set, (*reg_field)->field_index);
 
2828
        setReadSet((*reg_field)->field_index);
2829
2829
    }
2830
2830
  }
2831
2831
 
4372
4372
  /* Compare updated fields */
4373
4373
  for (Field **ptr= field ; *ptr ; ptr++)
4374
4374
  {
4375
 
    if (bitmap_is_set(write_set, (*ptr)->field_index) &&
 
4375
    if (isWriteSet((*ptr)->field_index) &&
4376
4376
        (*ptr)->cmp_binary_offset(s->rec_buff_length))
4377
4377
      return true;
4378
4378
  }