diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-03 21:37:38 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-03 21:37:38 +0300 |
| commit | c43f894c51bb7b091dd668f069fb5e5e44dcb0b1 (patch) | |
| tree | e72864841720da65102a5acd0ba5cc908cc8dec8 /sql/handler.h | |
| parent | 3a8a7509199b15c26a88bab5ed97ec093a29f387 (diff) | |
| download | mariadb-git-c43f894c51bb7b091dd668f069fb5e5e44dcb0b1.tar.gz | |
Backport of:
------------------------------------------------------------
revno: 2630.22.3
committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
branch nick: 4284-6.0
timestamp: Thu 2008-08-07 22:33:43 -0300
message:
WL#4284: Transactional DDL locking
Make transaction management more modular through a new interface.
The overall objective of this change is to provide groundwork
for the design of transactional DDL locking by cleaning up the
transaction high level API to better distinguish operations implicit
and explicit, and single statement transaction from operations on
the normal transaction.
Having a a high-level interface for transaction management provides
a better base for implementing transactional concepts that are not
always tied to storage engines and also makes it easier to interect
with other higher level modules of the server.
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sql/handler.h b/sql/handler.h index 7e64a08700f..1bcf6a73b33 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1945,10 +1945,6 @@ extern TYPELIB tx_isolation_typelib; extern TYPELIB myisam_stats_method_typelib; extern ulong total_ha, total_ha_2pc; - /* Wrapper functions */ -#define ha_commit(thd) (ha_commit_trans((thd), TRUE)) -#define ha_rollback(thd) (ha_rollback_trans((thd), TRUE)) - /* lookups */ handlerton *ha_default_handlerton(THD *thd); plugin_ref ha_resolve_by_name(THD *thd, const LEX_STRING *name); @@ -2025,13 +2021,12 @@ int ha_release_temporary_latches(THD *thd); int ha_start_consistent_snapshot(THD *thd); int ha_commit_or_rollback_by_xid(XID *xid, bool commit); int ha_commit_one_phase(THD *thd, bool all); +int ha_commit_trans(THD *thd, bool all); int ha_rollback_trans(THD *thd, bool all); int ha_prepare(THD *thd); int ha_recover(HASH *commit_list); /* transactions: these functions never call handlerton functions directly */ -int ha_commit_trans(THD *thd, bool all); -int ha_autocommit_or_rollback(THD *thd, int error); int ha_enable_transaction(THD *thd, bool on); /* savepoints */ |