Below is the list of changes that have just been committed into a local
6.0 repository of igor. When igor does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2008-04-06 14:13:47-07:00, igor@stripped +5 -0
Fixed one valgrind problem.
Removed platform dependent test cases from join_cache.test.
mysql-test/r/join_cache.result@stripped, 2008-04-06 14:13:43-07:00, igor@stripped +0 -82
Removed platform dependents test cases.
mysql-test/r/named_pipe.result@stripped, 2008-04-06 14:13:43-07:00, igor@stripped +6 -6
Adjusted test results after the fix of EXPLAIN for outer joins
that was committed just before BKA code.
mysql-test/r/shm.result@stripped, 2008-04-06 14:13:43-07:00, igor@stripped +6 -6
Adjusted test results after the fix of EXPLAIN for outer joins
that was committed just before BKA code.
mysql-test/t/join_cache.test@stripped, 2008-04-06 14:13:43-07:00, igor@stripped +0 -13
Removed platform dependents test cases.
sql/sql_select.cc@stripped, 2008-04-06 14:13:43-07:00, igor@stripped +2 -0
Fixed one valgrind problem
diff -Nrup a/mysql-test/r/join_cache.result b/mysql-test/r/join_cache.result
--- a/mysql-test/r/join_cache.result 2008-04-06 03:11:26 -07:00
+++ b/mysql-test/r/join_cache.result 2008-04-06 14:13:43 -07:00
@@ -1421,88 +1421,6 @@ Kaunas
Klaipeda
?iauliai
Panevezys
-id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE Country ALL NULL NULL NULL NULL 239 Using where
-1 SIMPLE CountryLanguage eq_ref PRIMARY PRIMARY 33 world.Country.Code,const 1 Using where; Using join buffer
-Name IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
-Afghanistan NULL
-Netherlands NULL
-Algeria NULL
-Angola NULL
-Australia 81.2
-Argentina NULL
-Bangladesh NULL
-Belgium NULL
-United Kingdom 97.3
-Brazil NULL
-Burkina Faso NULL
-Chile NULL
-South Africa 8.5
-Ecuador NULL
-Egypt NULL
-Spain NULL
-Ethiopia NULL
-Philippines NULL
-Ghana NULL
-Guatemala NULL
-Indonesia NULL
-India NULL
-Iraq NULL
-Iran NULL
-Japan 0.1
-Italy NULL
-Yemen NULL
-Yugoslavia NULL
-Cambodia NULL
-Canada 60.4
-Cameroon NULL
-Kazakstan NULL
-Kenya NULL
-China NULL
-Colombia NULL
-Congo, The Democratic Republic of the NULL
-North Korea NULL
-South Korea NULL
-Greece NULL
-Cuba NULL
-Madagascar NULL
-Malaysia 1.6
-Malawi NULL
-Mali NULL
-Morocco NULL
-Mexico NULL
-Mozambique NULL
-Myanmar NULL
-Nepal NULL
-Niger NULL
-Nigeria NULL
-Côte d?Ivoire NULL
-Pakistan NULL
-Peru NULL
-Poland NULL
-France NULL
-Romania NULL
-Germany NULL
-Saudi Arabia NULL
-Somalia NULL
-Sri Lanka NULL
-Sudan NULL
-Syria NULL
-Taiwan NULL
-Tanzania NULL
-Thailand NULL
-Czech Republic NULL
-Turkey NULL
-Uganda NULL
-Ukraine NULL
-Hungary NULL
-Uzbekistan NULL
-Belarus NULL
-United States 86.2
-Venezuela NULL
-Russian Federation NULL
-Vietnam NULL
-Zimbabwe 2.2
Variable_name Value
join_cache_level 6
id select_type table type possible_keys key key_len ref rows Extra
diff -Nrup a/mysql-test/r/named_pipe.result b/mysql-test/r/named_pipe.result
--- a/mysql-test/r/named_pipe.result 2008-02-13 02:02:44 -08:00
+++ b/mysql-test/r/named_pipe.result 2008-04-06 14:13:43 -07:00
@@ -1389,15 +1389,15 @@ id select_type table type possible_keys
explain select companynr,companyname from t4 left join t2 using (companynr) where companynr > 0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL PRIMARY NULL NULL NULL 12 Using where
-1 SIMPLE t2 ALL NULL NULL NULL NULL 1199
+1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 Using where
explain select companynr,companyname from t4 left join t2 using (companynr) where companynr > 0 or companynr < 0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL PRIMARY NULL NULL NULL 12 Using where
-1 SIMPLE t2 ALL NULL NULL NULL NULL 1199
+1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 Using where
explain select companynr,companyname from t4 left join t2 using (companynr) where companynr > 0 and companynr > 0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL PRIMARY NULL NULL NULL 12 Using where
-1 SIMPLE t2 ALL NULL NULL NULL NULL 1199
+1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 Using where
explain select t2.companynr,companyname from t4 left join t2 using (companynr) where t2.companynr > 0 or t2.companynr is null;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL NULL NULL NULL NULL 12
@@ -1413,15 +1413,15 @@ id select_type table type possible_keys
explain select companynr,companyname from t4 left join t2 using (companynr) where companynr > 0 or companynr is null;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL PRIMARY NULL NULL NULL 12 Using where
-1 SIMPLE t2 ALL NULL NULL NULL NULL 1199
+1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 Using where
explain select companynr,companyname from t4 left join t2 using (companynr) where companynr > 0 or companynr < 0 or companynr > 0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL PRIMARY NULL NULL NULL 12 Using where
-1 SIMPLE t2 ALL NULL NULL NULL NULL 1199
+1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 Using where
explain select companynr,companyname from t4 left join t2 using (companynr) where ifnull(companynr,1)>0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL NULL NULL NULL NULL 12 Using where
-1 SIMPLE t2 ALL NULL NULL NULL NULL 1199
+1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 Using where
select distinct t2.companynr,t4.companynr from t2,t4 where t2.companynr=t4.companynr+1;
companynr companynr
37 36
diff -Nrup a/mysql-test/r/shm.result b/mysql-test/r/shm.result
--- a/mysql-test/r/shm.result 2008-02-13 02:02:46 -08:00
+++ b/mysql-test/r/shm.result 2008-04-06 14:13:43 -07:00
@@ -1389,15 +1389,15 @@ id select_type table type possible_keys
explain select companynr,companyname from t4 left join t2 using (companynr) where companynr > 0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL PRIMARY NULL NULL NULL 12 Using where
-1 SIMPLE t2 ALL NULL NULL NULL NULL 1199
+1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 Using where
explain select companynr,companyname from t4 left join t2 using (companynr) where companynr > 0 or companynr < 0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL PRIMARY NULL NULL NULL 12 Using where
-1 SIMPLE t2 ALL NULL NULL NULL NULL 1199
+1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 Using where
explain select companynr,companyname from t4 left join t2 using (companynr) where companynr > 0 and companynr > 0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL PRIMARY NULL NULL NULL 12 Using where
-1 SIMPLE t2 ALL NULL NULL NULL NULL 1199
+1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 Using where
explain select t2.companynr,companyname from t4 left join t2 using (companynr) where t2.companynr > 0 or t2.companynr is null;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL NULL NULL NULL NULL 12
@@ -1413,15 +1413,15 @@ id select_type table type possible_keys
explain select companynr,companyname from t4 left join t2 using (companynr) where companynr > 0 or companynr is null;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL PRIMARY NULL NULL NULL 12 Using where
-1 SIMPLE t2 ALL NULL NULL NULL NULL 1199
+1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 Using where
explain select companynr,companyname from t4 left join t2 using (companynr) where companynr > 0 or companynr < 0 or companynr > 0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL PRIMARY NULL NULL NULL 12 Using where
-1 SIMPLE t2 ALL NULL NULL NULL NULL 1199
+1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 Using where
explain select companynr,companyname from t4 left join t2 using (companynr) where ifnull(companynr,1)>0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL NULL NULL NULL NULL 12 Using where
-1 SIMPLE t2 ALL NULL NULL NULL NULL 1199
+1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 Using where
select distinct t2.companynr,t4.companynr from t2,t4 where t2.companynr=t4.companynr+1;
companynr companynr
37 36
diff -Nrup a/mysql-test/t/join_cache.test b/mysql-test/t/join_cache.test
--- a/mysql-test/t/join_cache.test 2008-04-06 03:11:26 -07:00
+++ b/mysql-test/t/join_cache.test 2008-04-06 14:13:43 -07:00
@@ -292,19 +292,6 @@ SELECT Name FROM City
WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
City.Population > 100000;
-EXPLAIN
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
- FROM Country LEFT JOIN CountryLanguage ON
- (CountryLanguage.Country=Country.Code AND Language='English')
- WHERE
- Country.Population > 10000000;
-
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
- FROM Country LEFT JOIN CountryLanguage ON
- (CountryLanguage.Country=Country.Code AND Language='English')
- WHERE
- Country.Population > 10000000;
-
set join_cache_level=6;
show variables like 'join_cache_level';
diff -Nrup a/sql/sql_select.cc b/sql/sql_select.cc
--- a/sql/sql_select.cc 2008-04-06 03:11:27 -07:00
+++ b/sql/sql_select.cc 2008-04-06 14:13:43 -07:00
@@ -7731,6 +7731,7 @@ make_join_select(JOIN *join,SQL_SELECT *
new Item_cond_and(cond_tab->select_cond,tmp);
if (!cond_tab->select_cond)
DBUG_RETURN(1);
+ cond_tab->select_cond->update_used_tables();
cond_tab->select_cond->quick_fix_field();
}
}
@@ -7785,6 +7786,7 @@ make_join_select(JOIN *join,SQL_SELECT *
(ulong)cond_tab->select_cond));
if (!cond_tab->select_cond)
DBUG_RETURN(1);
+ cond_tab->select_cond->update_used_tables();
cond_tab->select_cond->quick_fix_field();
if (cond_tab->select)
cond_tab->select->cond= cond_tab->select_cond;
| Thread |
|---|
| • bk commit into 6.0 tree (igor:1.2610) | igor | 6 Apr |
