← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Monty Taylor
  • Date: 2009-05-08 19:27:21 UTC
  • mto: This revision was merged to the branch mainline in revision 1009.
  • Revision ID: mordred@inaugust.com-20090508192721-glbsg850k7wqp1rd
Further reversion of P.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
166
166
    Field **field;
167
167
    for (field=table->field; *field ; field++)
168
168
      fields_vars.push_back(new Item_field(*field));
169
 
    table->write_set->set();
 
169
    bitmap_set_all(table->write_set);
170
170
    table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
171
171
    /*
172
172
      Let us also prepare SET clause, altough it is probably empty
189
189
    */
190
190
    if (table->timestamp_field)
191
191
    {
192
 
      if (table->write_set->test(table->timestamp_field->field_index))
 
192
      if (bitmap_is_set(table->write_set,
 
193
                        table->timestamp_field->field_index))
193
194
        table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
194
195
      else
195
196
      {
196
 
        table->write_set->set(table->timestamp_field->field_index);
 
197
        bitmap_set_bit(table->write_set,
 
198
                       table->timestamp_field->field_index);
197
199
      }
198
200
    }
199
201
    /* Fix the expressions in SET clause */