← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

  • Committer: Brian Aker
  • Date: 2010-05-21 05:06:34 UTC
  • mfrom: (1552.1.4 new-staging)
  • Revision ID: brian@gaz-20100521050634-zsy73ksh4buulhir
Merge for auto increment bug.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
462
462
        /* Non-batched update */
463
463
        error= table->cursor->updateRecord(table->record[1],
464
464
                                            table->record[0]);
 
465
 
 
466
        table->auto_increment_field_not_null= false;
 
467
 
465
468
        if (!error || error == HA_ERR_RECORD_IS_THE_SAME)
466
469
        {
467
470
          if (error != HA_ERR_RECORD_IS_THE_SAME)