bzr push into mysql-6.0-opt-subqueries branch (sergefp:2757 to 2758)

[Sergey Petrunia]

 2758 Sergey Petrunia	2008-12-27 [merge]
      Merge
modified:
  sql/sql_select.cc

 2757 Sergey Petrunia	2008-12-27 [merge]
      Merge
modified:
  sql/opt_range.cc

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2008-12-22 20:10:35 +0000
+++ b/sql/sql_select.cc	2008-12-27 19:26:43 +0000
@@ -3827,14 +3827,12 @@ int pull_out_semijoin_tables(JOIN *join)
         {
           if (inner_tables & tbl->table->map)
           {
-            // This table is not pulled out
+            /* This table is not pulled out */
             tbl->table->reginfo.join_tab->emb_sj_nest= sj_nest;
           }
           else
           {
-            /* 
-              This table has been pulled out of the semi-join nest
-            */
+            /* This table has been pulled out of the semi-join nest */
             tbl->table->reginfo.join_tab->emb_sj_nest= NULL;
             /*
               Pull the table up in the same way as simplify_joins() does: