← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.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/sql_update.cc
211
211
  if (table->timestamp_field)
212
212
  {
213
213
    // Don't set timestamp column if this is modified
214
 
    if (bitmap_is_set(table->write_set,
215
 
                      table->timestamp_field->field_index))
 
214
    if (table->isWriteSet(table->timestamp_field->field_index))
216
215
      table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
217
216
    else
218
217
    {
219
218
      if (table->timestamp_field_type == TIMESTAMP_AUTO_SET_ON_UPDATE ||
220
219
          table->timestamp_field_type == TIMESTAMP_AUTO_SET_ON_BOTH)
221
 
        bitmap_set_bit(table->write_set,
222
 
                       table->timestamp_field->field_index);
 
220
        table->setWriteSet(table->timestamp_field->field_index);
223
221
    }
224
222
  }
225
223
 
850
848
    Table *table= tl->table;
851
849
    /* Only set timestamp column if this is not modified */
852
850
    if (table->timestamp_field &&
853
 
        bitmap_is_set(table->write_set,
854
 
                      table->timestamp_field->field_index))
 
851
        table->isWriteSet(table->timestamp_field->field_index))
855
852
      table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
856
853
 
857
854
    /* if table will be updated then check that it is unique */