← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Lee Bieber
  • Date: 2011-01-21 21:44:29 UTC
  • mfrom: (2100.1.6 build)
  • Revision ID: kalebral@gmail.com-20110121214429-p7ctkpx00hsb6pv7
Update test for regression.682563 to add now needed COMMIT statements
Need to add new doc files to docs/include.am for distcheck target
update big test, add COMMIT statement per Stewart's recent changes
Merge Stewart - fix bug 701468: TransactionalStorageEngine::doRollback(session, all) "all" isn't true - need to check session autocommit settings
Merge Stewart - 682563: TransactionalStorageEngine::doCommit(session, all) "all" isn't true - need to check session autocommit settings
Merge Andrew - fix bug 705576: Docs need 'How to compile' pages
Merge Andrew - fix bug 705771: Documentation for common client errors

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
2573
2573
    trx_search_latch_release_if_reserved(trx);
2574
2574
  }
2575
2575
 
2576
 
  if (all
2577
 
    || (!session_test_options(session, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) {
2578
 
 
 
2576
  if (all)
 
2577
  {
2579
2578
    /* We were instructed to commit the whole transaction, or
2580
2579
    this is an SQL statement end and autocommit is on */
2581
2580
 
2698
2697
 
2699
2698
  row_unlock_table_autoinc_for_mysql(trx);
2700
2699
 
2701
 
  if (all
2702
 
    || !session_test_options(session, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)) {
2703
 
 
 
2700
  if (all)
 
2701
  {
2704
2702
    error = trx_rollback_for_mysql(trx);
2705
2703
  } else {
2706
2704
    error = trx_rollback_last_sql_stat_for_mysql(trx);