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/set_var.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/set_var.cc')
-rw-r--r-- | sql/set_var.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 36597658077..1028e5441ae 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1395,12 +1395,10 @@ static void fix_thd_mem_root(THD *thd, enum_var_type type) static void fix_trans_mem_root(THD *thd, enum_var_type type) { -#ifdef USING_TRANSACTIONS if (type != OPT_GLOBAL) reset_root_defaults(&thd->transaction.mem_root, thd->variables.trans_alloc_block_size, thd->variables.trans_prealloc_size); -#endif } |