bk commit into 5.0 tree (igor:1.1936)

[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.1936 05/05/31 04:49:52 igor@stripped +1 -0
  olap.result:
    Post merge corrections.

  mysql-test/r/olap.result
    1.22 05/05/31 04:47:43 igor@stripped +6 -6
    Post merge corrections.

# 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.21/mysql-test/r/olap.result	Mon May 30 05:47:45 2005
+++ 1.22/mysql-test/r/olap.result	Tue May 31 04:47:43 2005
@@ -249,11 +249,11 @@
 product	country_id	year	sum(profit)
 select concat(':',product,':'), sum(profit),avg(profit) from t1 group by product with rollup;
 concat(':',product,':')	sum(profit)	avg(profit)
-:Calculator:	275	68.7500
-:Computer:	6900	1380.0000
-:Phone:	[phone]
-:TV:	600	120.0000
-:TV:	7785	519.0000
+:Calculator:	275	68.75000
+:Computer:	6900	1380.00000
+:Phone:	[phone]
+:TV:	600	120.00000
+NULL	7785	519.00000
 select product, country_id , year, sum(profit) from t1 group by product, country_id, year with cube;
 ERROR 42000: This version of MySQL doesn't yet support 'CUBE'
 explain select product, country_id , year, sum(profit) from t1 group by product, country_id, year with cube;
@@ -503,7 +503,7 @@
 NULL
 SELECT a+SUM(a) FROM t1 GROUP BY a WITH ROLLUP;
 a+SUM(a)
-2
+3
 4
 NULL
 SELECT a, a+1 as b FROM t1 GROUP BY a WITH ROLLUP HAVING b > 2;