← 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-11-18 06:11:12 UTC
  • mfrom: (1220.1.10 staging)
  • Revision ID: brian@gaz-20091118061112-tyf4qrfr5v7i946b
Monty + Brian Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
406
406
    table->cursor->ha_release_auto_increment();
407
407
    if (table->cursor->ha_end_bulk_insert() && !error)
408
408
    {
409
 
      table->cursor->print_error(my_errno,MYF(0));
 
409
      table->print_error(my_errno,MYF(0));
410
410
      error=1;
411
411
    }
412
412
    if (duplic != DUP_ERROR || ignore)
751
751
          goto gok_or_after_err; /* Ignoring a not fatal error, return 0 */
752
752
        goto err;
753
753
      }
754
 
      if ((int) (key_nr = table->cursor->get_dup_key(error)) < 0)
 
754
      if ((int) (key_nr = table->get_dup_key(error)) < 0)
755
755
      {
756
756
        error= HA_ERR_FOUND_DUPP_KEY;         /* Database can't find key */
757
757
        goto err;
936
936
  /* current_select is NULL if this is a delayed insert */
937
937
  if (session->lex->current_select)
938
938
    session->lex->current_select->no_error= 0;        // Give error
939
 
  table->cursor->print_error(error,MYF(0));
 
939
  table->print_error(error,MYF(0));
940
940
 
941
941
before_err:
942
942
  table->cursor->restore_auto_increment(prev_insert_id);
1338
1338
 
1339
1339
  if (error)
1340
1340
  {
1341
 
    table->cursor->print_error(error,MYF(0));
 
1341
    table->print_error(error,MYF(0));
1342
1342
    DRIZZLE_INSERT_SELECT_DONE(error, 0);
1343
1343
    return 1;
1344
1344
  }