Merge bk-internal:/home/bk/mysql-4.0/

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
476a0c0f · serg@serg.mylan · 17d8cc22 · 4808a6d9 · 476a0c0f
Commit 476a0c0f authored Aug 28, 2003 by serg@serg.mylan
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

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

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -906,9 +906,9 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
  if (join.group || join.tmp_table_param.sum_func_count ||
      (procedure && (procedure->flags & PROC_GROUP)))
  {
-    alloc_group_fields(&join,group);
+    if (alloc_group_fields(&join,group) ||
-    setup_copy_fields(thd, &join.tmp_table_param,all_fields);
+        setup_copy_fields(thd, &join.tmp_table_param,all_fields) ||
-    if (make_sum_func_list(&join,all_fields) || thd->fatal_error)
+        make_sum_func_list(&join,all_fields) || thd->fatal_error)
      goto err; /* purecov: inspected */
  }
  if (group || order)