diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-04 01:46:14 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-04 01:46:14 +0300 |
| commit | 411a81954ecab031d58b99aaac3e2ee6518b6d80 (patch) | |
| tree | 533eabae94267d1db186e6a8a0ef840caca311cf /sql/sql_parse.cc | |
| parent | cd155be564a6e42c3a08781ba0d30458e241cdf0 (diff) | |
| download | mariadb-git-411a81954ecab031d58b99aaac3e2ee6518b6d80.tar.gz | |
------------------------------------------------------------
revno: 2617.22.4
committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
branch nick: mysql-6.0-runtime
timestamp: Mon 2009-01-26 15:19:14 -0200
message:
Move checks for OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN to a separate
helper function.
sql/ha_ndbcluster.cc:
Use helper method to check transaction mode.
sql/log.cc:
Use helper method to check transaction mode.
sql/sql_cache.cc:
Use helper method to check transaction mode.
sql/sql_class.cc:
Use helper method to check transaction mode.
sql/sql_class.h:
Add helper method to check whether session is in a multi-statement
transaction.
sql/sql_parse.cc:
Use helper method to check transaction mode.
sql/transaction.cc:
Use helper method to check transaction mode.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 2df66a44fa6..83e45904816 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -5306,7 +5306,7 @@ void mysql_reset_thd_for_next_command(THD *thd) OPTION_STATUS_NO_TRANS_UPDATE | OPTION_KEEP_LOG to not get warnings in ha_rollback_trans() about some tables couldn't be rolled back. */ - if (!(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) + if (!thd->in_multi_stmt_transaction()) { thd->options&= ~OPTION_KEEP_LOG; thd->transaction.all.modified_non_trans_table= FALSE; |