Merge.

1 files changed, 6 insertions, 4 deletions

diff --git a/mysql-test/r/subselect_mat_cost.result b/mysql-test/r/subselect_mat_cost.result
index e8312c837e6..7a4fec3823e 100644
--- a/mysql-test/r/subselect_mat_cost.result
+++ b/mysql-test/r/subselect_mat_cost.result
@@ -344,18 +344,20 @@ 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');
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	CountryLanguage	index	NULL	PRIMARY	33	NULL	984	Using where; Using index
+1	PRIMARY	CountryLanguage	range	Language	Language	30	NULL	72	Using index condition; Using where; Rowid-ordered scan
 2	DEPENDENT SUBQUERY	City	ref	CityName	CityName	35	func	2	Using index condition
 2	DEPENDENT SUBQUERY	Country	eq_ref	PRIMARY	PRIMARY	3	world.City.Country	1	Using where; Using index
 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');
 count(*)
-979
+88
 Q2.3m:
 MATERIALIZATION with the PARTIAL_MATCH_MERGE strategy, because the HAVING
 clause prevents the use of the index on City(Name), and in practice reduces