From acb2d4aad85896ce31380f2c90804f3f1240d1d8 Mon Sep 17 00:00:00 2001
From: Sergey Petrunya <psergey@askmonty.org>
Date: Tue, 1 Nov 2011 12:04:11 +0400
Subject: 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.

---
 sql/opt_table_elimination.cc | 2 --
 1 file changed, 2 deletions(-)

(limited to 'sql')

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) | 
-- 
cgit v1.2.1