Merge fixes

sql/sql_union.cc:
  Some further merge fixes

sql/sql_union.cc

@@ -185,8 +185,6 @@ int st_select_lex_unit::prepare(THD *thd, select_result *sel_result,
   union_result->not_describe=1;
   union_result->tmp_table_param=tmp_table_param;
 
-  for (SELECT_LEX *sl= select_cursor; sl; sl= sl->next_select())
-  {
   for (SELECT_LEX *sl= select_cursor; sl; sl= sl->next_select())
   {
     JOIN *join= new JOIN(thd, sl->item_list, 
@@ -215,7 +213,6 @@ int st_select_lex_unit::prepare(THD *thd, select_result *sel_result,
     if (res || thd->is_fatal_error)
       goto err;
   }
-  }
 
   item_list.empty();
   thd->lex.current_select= lex_select_save;