bk commit into 4.1 tree (igor:1.2302) BUG#7894

[igor]

Below is the list of changes that have just been committed into a local
4.1 repository of igor. When igor 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
  1.2302 05/05/30 05:25:12 igor@stripped +1 -0
  sql_select.cc:
    Post-review modifications for the fix of bug #7894.

  sql/sql_select.cc
    1.403 05/05/30 05:23:59 igor@stripped +6 -9
    Post-review modifications for the fix of bug #7894.

# 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:	igor
# Host:	rurik.mysql.com
# Root:	/home/igor/dev/mysql-4.1-0

--- 1.402/sql/sql_select.cc	Mon May 30 02:46:02 2005
+++ 1.403/sql/sql_select.cc	Mon May 30 05:23:59 2005
@@ -9197,17 +9197,14 @@
     1   on error
 */
 
-static bool change_group_ref(THD *thd, Item *expr, ORDER *group_list,
+static bool change_group_ref(THD *thd, Item_func *expr, ORDER *group_list,
                              bool *changed)
 {
-  if (expr->type() != Item::FUNC_ITEM)
-    return 0;
-  Item_func *func_item= (Item_func *) expr;
-  if (func_item->arg_count)
+  if (expr->arg_count)
   {
     Item **arg,**arg_end;
-    for (arg= func_item->arguments(),
-         arg_end= func_item->arguments()+func_item->arg_count;
+    for (arg= expr->arguments(),
+         arg_end= expr->arguments()+expr->arg_count;
          arg != arg_end; arg++)
     {
       Item *item= *arg;
@@ -9228,7 +9225,7 @@
       }
       else if (item->type() == Item::FUNC_ITEM)
       {
-        if (change_group_ref(thd, item, group_list, changed))
+        if (change_group_ref(thd, (Item_func *) item, group_list, changed))
           return 1;
       }
     }
@@ -9294,7 +9291,7 @@
     if (item->type() == Item::FUNC_ITEM)
     {
       bool changed= 0;
-      if (change_group_ref(thd, item, group_list, &changed))
+      if (change_group_ref(thd, (Item_func *) item, group_list, &changed))
         return 1;
       /*
         We have to prevent creation of a field in a temporary table for