summaryrefslogtreecommitdiff
path: root/sql/opt_table_elimination.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2011-11-01 12:04:11 +0400
committerSergey Petrunya <psergey@askmonty.org>2011-11-01 12:04:11 +0400
commitacb2d4aad85896ce31380f2c90804f3f1240d1d8 (patch)
tree36078e4aade102489d9926c87b6ee4114801ef56 /sql/opt_table_elimination.cc
parent57b3fefa03055e579fbcf664ce71b3b41c6b4558 (diff)
downloadmariadb-git-acb2d4aad85896ce31380f2c90804f3f1240d1d8.tar.gz
BUG#884631: Table elimination works 5.3 release builds even if turned off
- Make table elimination to actually switch itself on/off in release builds.
Diffstat (limited to 'sql/opt_table_elimination.cc')
-rw-r--r--sql/opt_table_elimination.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/opt_table_elimination.cc b/sql/opt_table_elimination.cc
index c8c61720068..56396181619 100644
--- a/sql/opt_table_elimination.cc
+++ b/sql/opt_table_elimination.cc
@@ -588,10 +588,8 @@ void eliminate_tables(JOIN *join)
if (!join->outer_join)
DBUG_VOID_RETURN;
-#ifndef DBUG_OFF
if (!optimizer_flag(thd, OPTIMIZER_SWITCH_TABLE_ELIMINATION))
DBUG_VOID_RETURN; /* purecov: inspected */
-#endif
/* Find the tables that are referred to from WHERE/HAVING */
used_tables= (join->conds? join->conds->used_tables() : 0) |