bk commit into 5.0 tree (msvensson:1.2237)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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, 2006-08-03 15:48:28+02:00, msvensson@neptunus.(none) +1 -0
  Update result after merge, since the function Item::tmp_table_field_from_field_type() 
  now takes mbmaxlen into account when calculating max_length of new field. 

  mysql-test/r/union.result@stripped, 2006-08-03 15:48:26+02:00, msvensson@neptunus.(none) +1 -1
    Update result after merge, since the function Item::tmp_table_field_from_field_type() 
    now takes mbmaxlen into account when calculating max_length of new field. 

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.84/mysql-test/r/union.result	2006-08-03 15:48:33 +02:00
+++ 1.85/mysql-test/r/union.result	2006-08-03 15:48:33 +02:00
@@ -1318,7 +1318,7 @@ t2	CREATE TABLE `t2` (
   `f5` timestamp NOT NULL default '0000-00-00 00:00:00',
   `f6` varchar(1) character set utf8 default NULL,
   `f7` text,
-  `f8` text character set utf8
+  `f8` mediumtext character set utf8
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 (select avg(1)) union (select avg(1)) union (select avg(1)) union