bk commit into 6.0 tree (igor:1.2609)

[igor]

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 03:11:30-07:00, igor@stripped +3 -0
  Fixed problems found by LINT.

  mysql-test/r/join_cache.result@stripped, 2008-04-06 03:11:26-07:00, igor@stripped +0
-82
    Removed platform-dependent a test case.

  mysql-test/t/join_cache.test@stripped, 2008-04-06 03:11:26-07:00, igor@stripped +0 -13
    Removed platform-dependent a test case.

  sql/sql_select.cc@stripped, 2008-04-06 03:11:27-07:00, igor@stripped +3 -4
    Fixed problems found by LINT.

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 00:20:36 -07:00
+++ b/mysql-test/r/join_cache.result	2008-04-06 03:11:26 -07:00
@@ -1688,88 +1688,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_buffer_size	131072
 Variable_name	Value
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 00:20:37 -07:00
+++ b/mysql-test/t/join_cache.test	2008-04-06 03:11:26 -07:00
@@ -341,19 +341,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=default;
 set join_buffer_size=default;
 
diff -Nrup a/sql/sql_select.cc b/sql/sql_select.cc
--- a/sql/sql_select.cc	2008-04-06 00:20:37 -07:00
+++ b/sql/sql_select.cc	2008-04-06 03:11:27 -07:00
@@ -8188,9 +8188,9 @@ void revise_cache_usage(JOIN_TAB *join_t
       end_tab= first_inner;
     }
   }
-  else if (tab->first_sj_inner_tab)
+  else if (join_tab->first_sj_inner_tab)
   {
-    first_inner= tab->first_sj_inner_tab;
+    first_inner= join_tab->first_sj_inner_tab;
     for (tab= join_tab-1; tab >= first_inner; tab--)
     {
       if (tab->first_sj_inner_tab == first_inner)
@@ -8310,7 +8310,6 @@ make_join_readinfo(JOIN *join, ulonglong
 
   for (i=join->const_tables ; i < join->tables ; i++)
   {
-    JOIN_TAB *first_revised;
     JOIN_TAB *tab=join->join_tab+i;
     TABLE *table=tab->table;
     bool using_join_cache;
@@ -17631,7 +17630,7 @@ bool JOIN_CACHE::put_record()
 bool JOIN_CACHE::get_record()
 { 
   bool res;
-  uchar *prev_rec_ptr;
+  uchar *prev_rec_ptr= 0;
   if (with_length)
     pos+= size_of_rec_len;
   if (prev_cache)