← 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-02-11 02:00:55 UTC
  • mfrom: (2155.1.3 build)
  • Revision ID: kalebral@gmail.com-20110211020055-xck466i0geihtgc8
Merge Stewart - moves mark_transaction_to_rollback to be a method in Session
Merge Vijay -  715789: test-drizzle, test-jp etc dont run check
Merge Stewart - 565053: Fork to background

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
1054
1054
    tell it also to MySQL so that MySQL knows to empty the
1055
1055
    cached binlog for this transaction */
1056
1056
 
1057
 
    mark_transaction_to_rollback(session, TRUE);
 
1057
    session->markTransactionForRollback(TRUE);
1058
1058
 
1059
1059
    return(HA_ERR_LOCK_DEADLOCK);
1060
1060
 
1063
1063
    latest SQL statement in a lock wait timeout. Previously, we
1064
1064
    rolled back the whole transaction. */
1065
1065
 
1066
 
    mark_transaction_to_rollback(session, (bool)row_rollback_on_timeout);
 
1066
    session->markTransactionForRollback((bool)row_rollback_on_timeout);
1067
1067
 
1068
1068
    return(HA_ERR_LOCK_WAIT_TIMEOUT);
1069
1069
 
1110
1110
    tell it also to MySQL so that MySQL knows to empty the
1111
1111
    cached binlog for this transaction */
1112
1112
 
1113
 
    mark_transaction_to_rollback(session, TRUE);
 
1113
    session->markTransactionForRollback(TRUE);
1114
1114
 
1115
1115
    return(HA_ERR_LOCK_TABLE_FULL);
1116
1116