← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Eric Day
  • Date: 2009-03-24 04:59:05 UTC
  • mfrom: (962 drizzle)
  • mto: (968.1.1 lib-merge)
  • mto: This revision was merged to the branch mainline in revision 969.
  • Revision ID: eday@oddments.org-20090324045905-2ptqhz3ves0aa5ed
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
1732
1732
    if (!table->s->tmp_table)
1733
1733
    {
1734
1734
      ha_autocommit_or_rollback(session, 0);
1735
 
      end_active_trans(session);
 
1735
      (void) session->endActiveTransaction();
1736
1736
    }
1737
1737
 
1738
1738
    table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);