bzr commit into mysql-trunk branch (ole.john.aske:3497) Bug#58134

[Ole John Aske]

#At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-trunk/ based on revid:georgi.kodinov@stripped

 3497 Ole John Aske	2011-01-13 [merge]
      Merged fix for bug#58134 from mysql-5.5 -> mysql->trunk

    modified:
      sql/sql_select.cc
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2011-01-12 09:52:10 +0000
+++ b/sql/sql_select.cc	2011-01-13 09:23:45 +0000
@@ -9676,7 +9676,7 @@ static bool make_join_select(JOIN *join,
               !first_inner_tab)
           {
             Item *push_cond= 
-              make_cond_for_table(tmp, current_map, current_map, 0);
+              make_cond_for_table(tmp, tab->table->map, tab->table->map, 0);
             if (push_cond)
             {
               /* Push condition to handler */
@@ -19140,7 +19140,7 @@ make_cond_for_table_from_pred(Item *root
 	new_cond->argument_list()->push_back(fix);
       }
       /*
-	Item_cond_and do not need fix_fields for execution, its parameters
+	Item_cond_or do not need fix_fields for execution, its parameters
 	are fixed or do not need fix_fields, too
       */
       new_cond->quick_fix_field();

No bundle (reason: revision is a merge).