← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Brian Aker
  • Date: 2010-12-09 20:06:21 UTC
  • mfrom: (1991 build)
  • mto: (2017.3.1 catalogs)
  • mto: This revision was merged to the branch mainline in revision 2073.
  • Revision ID: brian@tangent.org-20101209200621-bjflgmj82j4bcnvq
Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
846
846
          table->cursor->adjust_next_insert_id_after_explicit_value(
847
847
            table->next_number_field->val_int());
848
848
        info->touched++;
849
 
        if ((table->cursor->getEngine()->check_flag(HTON_BIT_PARTIAL_COLUMN_READ) &&
850
 
            ! table->write_set->is_subset_of(*table->read_set)) ||
851
 
            table->compare_record())
 
849
 
 
850
        if (! table->records_are_comparable() || table->compare_records())
852
851
        {
853
852
          if ((error=table->cursor->updateRecord(table->getUpdateRecord(),
854
853
                                                table->getInsertRecord())) &&