bk commit into 5.0 tree (igor:1.1937) BUG#10982

[igor]

Below is the list of changes that have just been committed into a local
5.0 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.1937 05/05/31 05:56:22 igor@stripped +2 -0
  olap.result:
    Fixed bug #10982.
  item.cc:
    Fixed bug #10982. In the function Item_ref::val_decimal
    by mistake the method Item_ref::val_decimal was used
    instead of Item_ref::val_decimal_result.

  mysql-test/r/olap.result
    1.23 05/05/31 05:55:45 igor@stripped +1 -1
    Fixed bug #10982.

  sql/item.cc
    1.127 05/05/31 05:52:42 igor@stripped +1 -1
    Fixed bug #10982. In the function Item_ref::val_decimal
    by mistake the method Item_ref::val_decimal was used
    instead of Item_ref::val_decimal_result.

# 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-5.0-0

--- 1.126/sql/item.cc	Fri May 27 16:28:06 2005
+++ 1.127/sql/item.cc	Tue May 31 05:52:42 2005
@@ -4358,7 +4358,7 @@
 
 my_decimal *Item_ref::val_decimal(my_decimal *decimal_value)
 {
-  my_decimal *val= (*ref)->val_decimal(decimal_value);
+  my_decimal *val= (*ref)->val_decimal_result(decimal_value);
   null_value= (*ref)->null_value;
   return val;
 }

--- 1.22/mysql-test/r/olap.result	Tue May 31 04:47:43 2005
+++ 1.23/mysql-test/r/olap.result	Tue May 31 05:55:45 2005
@@ -503,7 +503,7 @@
 NULL
 SELECT a+SUM(a) FROM t1 GROUP BY a WITH ROLLUP;
 a+SUM(a)
-3
+2
 4
 NULL
 SELECT a, a+1 as b FROM t1 GROUP BY a WITH ROLLUP HAVING b > 2;