Fixed a cost estimation bug introduced into in the function best_access_path

of the 5.3 code line after a merge with 5.2 on 2010-10-28
in order not to allow the cost to access a joined table to be equal
to 0 ever.

Expanded data sets for many test cases to get the same execution plans
as before.

1 files changed, 4 insertions, 2 deletions

diff --git a/mysql-test/t/subselect_mat_cost.test b/mysql-test/t/subselect_mat_cost.test
index 8a0d1ac702d..bfe4a5bcebb 100644
--- a/mysql-test/t/subselect_mat_cost.test
+++ b/mysql-test/t/subselect_mat_cost.test
@@ -222,13 +222,15 @@ select count(*)
 from CountryLanguage
 where (Language, Country) NOT IN
       (SELECT City.Name, Country.Code
-       FROM City LEFT JOIN Country ON (Country = Code and City.Population < 10000));
+       FROM City LEFT JOIN Country ON (Country = Code and City.Population < 10000))
+      AND Language IN ('English','Spanish');
 
 select count(*)
 from CountryLanguage
 where (Language, Country) NOT IN
       (SELECT City.Name, Country.Code
-       FROM City LEFT JOIN Country ON (Country = Code and City.Population < 10000));
+       FROM City LEFT JOIN Country ON (Country = Code and City.Population < 10000))
+      AND Language IN ('English','Spanish');
 
 -- echo Q2.3m:
 -- echo MATERIALIZATION with the PARTIAL_MATCH_MERGE strategy, because the HAVING