Merge mysql.com:/home/hf/work/029717/my41-29717

into  mysql.com:/home/hf/work/29717/my41-29717

1 files changed, 3 insertions, 1 deletions

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index afbffc499ad..61690f09980 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -777,6 +777,7 @@ JOIN::optimize()
     order=0;					// The output has only one row
     simple_order=1;
     select_distinct= 0;                       // No need in distinct for 1 row
+    group_optimized_away= 1;
   }
 
   calc_group_buffer(this, group_list);
@@ -6896,7 +6897,8 @@ end_send_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
   if (!join->first_record || end_of_records ||
       (idx=test_if_group_changed(join->group_fields)) >= 0)
   {
-    if (join->first_record || (end_of_records && !join->group))
+    if (join->first_record || 
+        (end_of_records && !join->group && !join->group_optimized_away))
     {
       if (join->procedure)
 	join->procedure->end_group();