← Back to branch summary

~stewart/drizzle/embedded-innodb-autoincrement

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
721
721
 
722
722
  if (info->handle_duplicates == DUP_REPLACE || info->handle_duplicates == DUP_UPDATE)
723
723
  {
724
 
    while ((error=table->cursor->ha_write_row(table->record[0])))
 
724
    while ((error=table->cursor->insertRecord(table->record[0])))
725
725
    {
726
726
      uint32_t key_nr;
727
727
      /*
820
820
             !bitmap_is_subset(table->write_set, table->read_set)) ||
821
821
            table->compare_record())
822
822
        {
823
 
          if ((error=table->cursor->ha_update_row(table->record[1],
 
823
          if ((error=table->cursor->updateRecord(table->record[1],
824
824
                                                table->record[0])) &&
825
825
              error != HA_ERR_RECORD_IS_THE_SAME)
826
826
          {
875
875
            (table->timestamp_field_type == TIMESTAMP_NO_AUTO_SET ||
876
876
             table->timestamp_field_type == TIMESTAMP_AUTO_SET_ON_BOTH))
877
877
        {
878
 
          if ((error=table->cursor->ha_update_row(table->record[1],
 
878
          if ((error=table->cursor->updateRecord(table->record[1],
879
879
                                                table->record[0])) &&
880
880
              error != HA_ERR_RECORD_IS_THE_SAME)
881
881
            goto err;
892
892
        }
893
893
        else
894
894
        {
895
 
          if ((error=table->cursor->ha_delete_row(table->record[1])))
 
895
          if ((error=table->cursor->deleteRecord(table->record[1])))
896
896
            goto err;
897
897
          info->deleted++;
898
898
          if (!table->cursor->has_transactions())
910
910
        table->write_set != save_write_set)
911
911
      table->column_bitmaps_set(save_read_set, save_write_set);
912
912
  }
913
 
  else if ((error=table->cursor->ha_write_row(table->record[0])))
 
913
  else if ((error=table->cursor->insertRecord(table->record[0])))
914
914
  {
915
915
    if (!info->ignore ||
916
916
        table->cursor->is_fatal_error(error, HA_CHECK_DUP))