~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Brian Aker
  • Date: 2009-03-17 06:05:42 UTC
  • mfrom: (934.2.17 small-cleanups)
  • Revision ID: brian@tangent.org-20090317060542-a7ggj7l686cvxw31
Merge Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
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);