Fix merge of sql/sql_select.cc using Igor's patch (Bug #9254)

dcd336d7 · jimw@mysql.com · c59e0fc7 · dcd336d7
Commit dcd336d7 authored Mar 17, 2005 by jimw@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

sql/sql_select.cc sql/sql_select.cc +4 -3

No files found.
--- a/sql/sql_select.cc
+++ b/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) ||
+					1, TRUE))
-          setup_sum_funcs(curr_join->thd, curr_join->sum_funcs) ||
+        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)))
      {