bzr commit into mysql-6.0-opt-subqueries branch (sergefp:2689)

[Sergey Petrunia]

#At file:///home/psergey/dev/mysql-6.0-subq-r16/

 2689 Sergey Petrunia	2008-08-22
      Post-merge fixes
modified:
  sql/sql_select.cc

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2008-08-21 15:19:35 +0000
+++ b/sql/sql_select.cc	2008-08-21 21:51:40 +0000
@@ -1599,7 +1599,7 @@ JOIN::optimize()
     /* Handle the case where we have an OUTER JOIN without a WHERE */
     conds=new Item_int((longlong) 1,1);	// Always true
   }
-  select_= make_select(all_tables, const_table_map,
+  select_= make_select(*all_tables, const_table_map,
                       const_table_map, conds, 1, &error);
   if (error)
   {						/* purecov: inspected */
@@ -15075,15 +15075,6 @@ do_select(JOIN *join,List<Item> *fields,
   DBUG_RETURN(join->thd->is_error() ? -1 : rc);
 }
 
-//////////////////////////
-  if (rc)
-  {
-    DBUG_PRINT("error",("Error: do_select() failed"));
-  }
-#endif
-  DBUG_RETURN(join->thd->is_error() ? -1 : rc);
-}
-
 
 int rr_sequential_and_unpack(READ_RECORD *info)
 {
@@ -15158,7 +15149,7 @@ sub_select_sjm(JOIN *join,JOIN_TAB *join
 
       /* Initialize full scan of the materialized table */
       init_read_record(&last_tab->read_record, join->thd, 
-                       sjm->table, NULL, 1, 1);
+                       sjm->table, NULL, TRUE, TRUE, FALSE);
 
       DBUG_ASSERT(last_tab->read_record.read_record= rr_sequential);
       last_tab->read_first_record= join_read_record_no_init;
@@ -15184,7 +15175,6 @@ sub_select_sjm(JOIN *join,JOIN_TAB *join
     return res;
   }
   else
-    rc= -1;
   {
     /* Do index lookup in the materialized table */
     if ((res= join_read_key2(join_tab, sjm->table, sjm->tab_ref)) == 1)
@@ -15196,7 +15186,6 @@ sub_select_sjm(JOIN *join,JOIN_TAB *join
   return (*join_tab[sjm->n_tables - 1].next_select)(join,
                                                     join_tab + sjm->n_tables,
                                                     FALSE);
-  //return NESTED_LOOP_OK;
 }