database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

BUG#884631: Table elimination works 5.3 release builds even if turned off

Browse Source 
- Make table elimination to actually switch itself on/off in release builds.
This commit is contained in:
Sergey Petrunya
2011-11-01 12:04:11 +04:00
parent 57b3fefa03
commit acb2d4aad8
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/t/table_elim_debug.test
View File

@ -1,7 +1,8 @@
# #
# Table elimination (MWL#17) tests that need debug build # Table elimination (MWL#17) tests that need debug build
# #
--source include/have_debug.inc # In MariaDB 5.3, one can switch table_elimination on/off without debug, too:
## --source include/have_debug.inc
--disable_warnings --disable_warnings
drop table if exists t1, t2; drop table if exists t1, t2;

2
sql/opt_table_elimination.cc
View File

@ -588,10 +588,8 @@ void eliminate_tables(JOIN *join)
if (!join->outer_join) if (!join->outer_join)
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
#ifndef DBUG_OFF
if (!optimizer_flag(thd, OPTIMIZER_SWITCH_TABLE_ELIMINATION)) if (!optimizer_flag(thd, OPTIMIZER_SWITCH_TABLE_ELIMINATION))
DBUG_VOID_RETURN; /* purecov: inspected */ DBUG_VOID_RETURN; /* purecov: inspected */
#endif
/* Find the tables that are referred to from WHERE/HAVING */ /* Find the tables that are referred to from WHERE/HAVING */
used_tables= (join->conds? join->conds->used_tables() : 0) | used_tables= (join->conds? join->conds->used_tables() : 0) |