← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Mark Atwood
  • Date: 2011-06-24 11:45:17 UTC
  • mfrom: (2318.6.64 rf)
  • Revision ID: me@mark.atwood.name-20110624114517-1mq8no6jlp2nrg7m
merge lp:~olafvdspek/drizzle/refactor15

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
961
961
gok_or_after_err:
962
962
  if (!table->cursor->has_transactions())
963
963
    session->transaction.stmt.markModifiedNonTransData();
964
 
  return(0);
 
964
  return 0;
965
965
 
966
966
err:
967
967
  info->last_errno= error;
1244
1244
  if (session->lex().current_select->options & OPTION_BUFFER_RESULT)
1245
1245
    table->cursor->ha_start_bulk_insert((ha_rows) 0);
1246
1246
 
1247
 
  return(0);
 
1247
  return 0;
1248
1248
}
1249
1249
 
1250
1250
 
1728
1728
 
1729
1729
  table->mark_columns_needed_for_insert();
1730
1730
  table->cursor->extra(HA_EXTRA_WRITE_CACHE);
1731
 
  return(0);
 
1731
  return 0;
1732
1732
}
1733
1733
 
1734
1734
void select_create::store_values(List<Item> &values)
1768
1768
    */
1769
1769
    if (!table->getShare()->getType())
1770
1770
    {
1771
 
      TransactionServices &transaction_services= TransactionServices::singleton();
1772
 
      transaction_services.autocommitOrRollback(*session, 0);
 
1771
      TransactionServices::autocommitOrRollback(*session, 0);
1773
1772
      (void) session->endActiveTransaction();
1774
1773
    }
1775
1774