bzr commit into mysql-6.0-opt branch (sergefp:2734) Bug#42740

[Sergey Petrunia]

#At file:///home/spetrunia/dev/mysql-6.0-opt-fix/ based on revid:igor@stripped

 2734 Sergey Petrunia	2009-04-11
      BUG#42740: Pushbuild fixes
modified:
  sql/sql_select.cc

per-file messages:
  sql/sql_select.cc
    BUG#42740: Pushbuild fixes
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2009-04-02 21:57:08 +0000
+++ b/sql/sql_select.cc	2009-04-11 14:53:21 +0000
@@ -3873,13 +3873,15 @@ int pull_out_semijoin_tables(JOIN *join)
         }
       }
 
-      /* Remove the sj-nest itself if we've removed everything from it*/
+      /* Remove the sj-nest itself if we've removed everything from it */
       if (!inner_tables)
       {
         List_iterator<TABLE_LIST> li(*upper_join_list);
         /* Find the sj_nest in the list. */
         while (sj_nest != li++);
         li.remove();
+        /* Also remove it from the list of SJ-nests: */
+        sj_list_it.remove();
       }
 
       if (arena)
@@ -4501,8 +4503,7 @@ static bool optimize_semijoin_nests(JOIN
     while ((sj_nest= sj_list_it++))
     {
       /* semi-join nests with only constant tables are not valid */
-      DBUG_ASSERT(!sj_nest->sj_inner_tables ||
-                  (sj_nest->sj_inner_tables & ~join->const_table_map));
+      DBUG_ASSERT(sj_nest->sj_inner_tables & ~join->const_table_map);
 
       sj_nest->sj_mat_info= NULL;
       if (sj_nest->sj_inner_tables && /* not everything was pulled out */