Merge mysql.com:/home/jimw/my/mysql-5.0-build

into mysql.com:/home/jimw/my/mysql-5.0-clean

Build-tools/Do-compile

@@ -377,8 +377,8 @@ system("cd $pwd/$host; perl $ENV{HOME}/my_md5sum $tar_file_lite > ${tar_file_lit
 #
 # Unpack the binary distribution
 #
-if ($opt_stage <= 4 && !$opt_no_test)
 $global_step= "extract binary distribution";
+if ($opt_stage <= 4 && !$opt_no_test)
 {
   log_timestamp("START");
   rm_all(<$pwd/$host/test/*>);
@@ -396,8 +396,8 @@ $ENV{"LD_LIBRARY_PATH"}= ("$test_dir/lib" .
 #
 # Run the test suite
 #
-if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest)
 $global_step= "tests in default mode";
+if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest)
 {
   log_timestamp("START");
   my $flags= "";

sql/sql_select.cc

@@ -1386,7 +1386,6 @@ JOIN::exec()
 	{
 	  DBUG_VOID_RETURN;
 	}
-	curr_join->group_list= 0;
       }
       
       thd->proc_info="Copying to group table";
@@ -1407,8 +1406,10 @@ JOIN::exec()
 	}
       }
       if (curr_join->make_sum_func_list(*curr_all_fields, *curr_fields_list,
-					1, TRUE) ||
-          setup_sum_funcs(curr_join->thd, curr_join->sum_funcs) ||
+					1, TRUE))
+        DBUG_VOID_RETURN;
+      curr_join->group_list= 0;
+      if (setup_sum_funcs(curr_join->thd, curr_join->sum_funcs) ||
 	  (tmp_error= do_select(curr_join, (List<Item> *) 0, curr_tmp_table,
 				0)))
       {