#At lp:maria based on revid:monty@mysql.com-20091111111749-dnv4ams2mnb8b8rp 2765 Igor Babaev 2009-11-11 Corrected a line from the patch for table elimination (WL#17) to fix a problem with the test case for bug#42116. modified: sql/sql_select.cc === modified file 'sql/sql_select.cc' --- a/sql/sql_select.cc 2009-11-11 11:17:49 +0000 +++ b/sql/sql_select.cc 2009-11-12 04:45:31 +0000 @@ -8937,7 +8937,7 @@ static uint reset_nj_counters(JOIN *join // ~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);