← 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: 2009-12-01 02:39:03 UTC
  • mfrom: (1234.1.4 push)
  • Revision ID: brian@gaz-20091201023903-1id5z7xnup695jaq
Merge of Brian + Jay test fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
759
759
          key_nr == table->s->next_number_index &&
760
760
          (insert_id_for_cur_row > 0))
761
761
        goto err;
762
 
      if (table->cursor->ha_table_flags() & HA_DUPLICATE_POS)
 
762
      if (table->cursor->getEngine()->check_flag(HTON_BIT_DUPLICATE_POS))
763
763
      {
764
764
        if (table->cursor->rnd_pos(table->record[1],table->cursor->dup_ref))
765
765
          goto err;
808
808
          table->cursor->adjust_next_insert_id_after_explicit_value(
809
809
            table->next_number_field->val_int());
810
810
        info->touched++;
811
 
        if ((table->cursor->ha_table_flags() & HA_PARTIAL_COLUMN_READ &&
 
811
        if ((table->cursor->getEngine()->check_flag(HTON_BIT_PARTIAL_COLUMN_READ) &&
812
812
             !bitmap_is_subset(table->write_set, table->read_set)) ||
813
813
            table->compare_record())
814
814
        {