From ac4e03a3158fab6c15711daaaa966a851adf0071 Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Thu, 3 Aug 2006 15:48:28 +0200
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index b1da3d3d1de..42a3874db08 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -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