← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/field_conv.cc

Merged in Jay's tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/field_conv.cc
175
175
  field->reset();
176
176
  if (field == field->table->next_number_field)
177
177
  {
178
 
    field->table->auto_increment_field_not_null= FALSE;
 
178
    field->table->auto_increment_field_not_null= false;
179
179
    return 0;                             // field is set in fill_record()
180
180
  }
181
181
  if (field->table->in_use->count_cuted_fields == CHECK_FIELD_WARN)
263
263
  if (*copy->from_null_ptr & copy->from_bit)
264
264
  {
265
265
    /* Same as in set_field_to_null_with_conversions() */
266
 
    copy->to_field->table->auto_increment_field_not_null= FALSE;
 
266
    copy->to_field->table->auto_increment_field_not_null= false;
267
267
    copy->to_field->reset();
268
268
  }
269
269
  else