Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/my/mysql-5.0

1 files changed, 4 insertions, 0 deletions

diff --git a/sql/item.cc b/sql/item.cc
index a0d1d8cbacf..30e03916a74 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -3069,6 +3069,10 @@ void Item_ref::set_properties()
   maybe_null= (*ref)->maybe_null;
   decimals=   (*ref)->decimals;
   collation.set((*ref)->collation);
+  /*
+    We have to remember if we refer to a sum function, to ensure that
+    split_sum_func() doesn't try to change the reference.
+  */
   with_sum_func= (*ref)->with_sum_func;
   if ((*ref)->type() == FIELD_ITEM)
     alias_name_used= ((Item_ident *) (*ref))->alias_name_used;