From efa74c7dd46897e8fef76e3aab35fc7262267823 Mon Sep 17 00:00:00 2001
From: unknown <knielsen@knielsen-hq.org>
Date: Mon, 16 Nov 2009 21:54:33 +0100
Subject: [PATCH] Corrected a line from the patch for table elimination (WL#17)
 to fix a problem with the test case for bug#42116.

Re-commit of Igor's fix due to re-commit of MySQL 5.1.41 merge.
---
 sql/sql_select.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 30a91e882fe..70e520b3e4a 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -8937,7 +8937,7 @@ static uint reset_nj_counters(JOIN *join, List<TABLE_LIST> *join_list)
       //                                     ~join->eliminated_tables);
       nested_join->n_tables= reset_nj_counters(join, &nested_join->join_list);
     }
-    if (table->table && (table->table->map & ~join->eliminated_tables))
+    if (!table->table || (table->table->map & ~join->eliminated_tables))
       n++;
   }
   DBUG_RETURN(n);