bk commit into 5.0 tree (mhansson:1.2492) BUG#24791

[mhansson]

Below is the list of changes that have just been committed into a local
5.0 repository of martin. When martin 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, 2007-03-22 14:58:43+01:00, mhansson@stripped +1 -0
  Bug#24791: Union with AVG-groups generates wrong results
  
  Patch appled after doing a pull from the team tree. Additional tests had to be
  fixed

  mysql-test/r/union.result@stripped, 2007-03-22 14:58:37+01:00, mhansson@stripped +2 -2
    Bug 24791
    
    The tests for temporary tables have been fixed. Since the call to 
    display_length(Item) was removed from the constructor for Item_type_holder, items 
    in temporary tables keep the original values of the items, rather than the magic
    numbers supplied by display_length.

# 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:	mhansson
# Host:	linux-st28.site
# Root:	/home/martin/mysql/src/5.0o-bug24791

--- 1.90/mysql-test/r/union.result	2007-03-21 19:53:53 +01:00
+++ 1.91/mysql-test/r/union.result	2007-03-22 14:58:37 +01:00
@@ -554,7 +554,7 @@ aa
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varbinary(20) NOT NULL default ''
+  `a` varbinary(2) NOT NULL default ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 SELECT 12 as a UNION select 12.2 as a;
@@ -655,7 +655,7 @@ f
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `f` varbinary(24) default NULL
+  `f` varbinary(12) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 SELECT y from t2 UNION select da from t2;