diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-11-23 16:09:39 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-11-23 16:09:39 +0300 |
| commit | 9f49582531b7a3a9b74973f0534f9430f7fee75c (patch) | |
| tree | 5cc2ddb21e4fef0b2576a1f92415cbf6282446e4 /sql/sql_class.cc | |
| parent | f238113decc10e345a6e2b26d83eefeb53f188f0 (diff) | |
| download | mariadb-git-9f49582531b7a3a9b74973f0534f9430f7fee75c.tar.gz | |
Backport of:
------------------------------------------------------------
revno: 2630.13.2
committer: Davi Arnaut <davi@sun.com>
branch nick: WL4284-6.0
timestamp: Thu 2008-07-03 18:26:51 -0300
message:
Remove unused USING_TRANSACTIONS macro which unnecessarily
cumbers the code. This macro is a historical leftover and
has no practical use since its unconditionally defined.
sql/handler.cc:
Remove an always defined #ifdef (USING_TRNASACTIONS).
sql/handler.h:
Remove an always defined #ifdef (USING_TRNASACTIONS).
sql/log.cc:
Remove an always defined #ifdef (USING_TRNASACTIONS).
sql/log_event.cc:
Remove an always defined #ifdef (USING_TRNASACTIONS).
sql/set_var.cc:
Remove an always defined #ifdef (USING_TRNASACTIONS).
sql/sql_class.cc:
Remove an always defined #ifdef (USING_TRNASACTIONS).
sql/sql_class.h:
Remove an always defined #ifdef (USING_TRNASACTIONS).
sql/sql_parse.cc:
Remove an always defined #ifdef (USING_TRNASACTIONS).
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 441a3037317..b7d88eca89a 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -936,11 +936,9 @@ void THD::init_for_queries() reset_root_defaults(mem_root, variables.query_alloc_block_size, variables.query_prealloc_size); -#ifdef USING_TRANSACTIONS reset_root_defaults(&transaction.mem_root, variables.trans_alloc_block_size, variables.trans_prealloc_size); -#endif transaction.xid_state.xid.null(); transaction.xid_state.in_thd=1; } @@ -1059,9 +1057,7 @@ THD::~THD() DBUG_PRINT("info", ("freeing security context")); main_security_ctx.destroy(); safeFree(db); -#ifdef USING_TRANSACTIONS free_root(&transaction.mem_root,MYF(0)); -#endif mysys_var=0; // Safety (shouldn't be needed) pthread_mutex_destroy(&LOCK_thd_data); #ifndef DBUG_OFF |