Commit efa74c7d authored by unknown's avatar unknown

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.
parent a962160e
...@@ -8937,7 +8937,7 @@ static uint reset_nj_counters(JOIN *join, List<TABLE_LIST> *join_list) ...@@ -8937,7 +8937,7 @@ static uint reset_nj_counters(JOIN *join, List<TABLE_LIST> *join_list)
// ~join->eliminated_tables); // ~join->eliminated_tables);
nested_join->n_tables= reset_nj_counters(join, &nested_join->join_list); 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++; n++;
} }
DBUG_RETURN(n); DBUG_RETURN(n);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment