bk commit into 5.0 tree (evgen:1.2293)

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-29 21:22:47+04:00, evgen@stripped +1 -0
  Merge epotemkin@stripped:/home/bk/mysql-5.0-opt
  into  moonbone.local:/work/20503-bug-5.0-mysql
  MERGE: 1.2285.1.1

  sql/sql_select.cc@stripped, 2006-09-29 21:22:45+04:00, evgen@stripped +0 -0
    Auto merged
    MERGE: 1.454.1.3

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	evgen
# Host:	moonbone.local
# Root:	/work/20503-bug-5.0-mysql/RESYNC

--- 1.458/sql/sql_select.cc	2006-09-29 21:22:51 +04:00
+++ 1.459/sql/sql_select.cc	2006-09-29 21:22:51 +04:00
@@ -13513,7 +13513,19 @@
     disctinct->group_by optimization
   */
   if (select_distinct)
+  {
     group_parts+= fields_list.elements;
+    /*
+      If the ORDER clause is specified then it's possible that
+      it also will be optimized, so reserve space for it too
+    */
+    if (order)
+    {
+      ORDER *ord;
+      for (ord= order; ord; ord= ord->next)
+        group_parts++;
+    }
+  }
 
   /* This must use calloc() as rollup_make_fields depends on this */
   sum_funcs= (Item_sum**) thd->calloc(sizeof(Item_sum**) * (func_count+1) +