diff options
author | Sergey Petrunya <psergey@askmonty.org> | 2011-11-01 12:04:11 +0400 |
---|---|---|
committer | Sergey Petrunya <psergey@askmonty.org> | 2011-11-01 12:04:11 +0400 |
commit | acb2d4aad85896ce31380f2c90804f3f1240d1d8 (patch) | |
tree | 36078e4aade102489d9926c87b6ee4114801ef56 /sql | |
parent | 57b3fefa03055e579fbcf664ce71b3b41c6b4558 (diff) | |
download | mariadb-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')
-rw-r--r-- | sql/opt_table_elimination.cc | 2 |
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) | |