~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Brian Aker
  • Date: 2009-08-21 06:18:23 UTC
  • mfrom: (1115.3.12 captain)
  • Revision ID: brian@gaz-20090821061823-ljcpbpvun22lsvem
Merge Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
156
156
      Unmark the timestamp field so that we can check if this is modified
157
157
      by update_fields
158
158
    */
159
 
    timestamp_mark= bitmap_test_and_clear(table->write_set,
160
 
                                          table->timestamp_field->field_index);
 
159
    timestamp_mark= table->write_set->testAndClear(table->timestamp_field->field_index);
161
160
  }
162
161
 
163
162
  /* Check the fields we are going to modify */
708
707
{
709
708
  int error;
710
709
  char *key=0;
711
 
  MY_BITMAP *save_read_set, *save_write_set;
 
710
  MyBitmap *save_read_set, *save_write_set;
712
711
  uint64_t prev_insert_id= table->file->next_insert_id;
713
712
  uint64_t insert_id_for_cur_row= 0;
714
713