summaryrefslogtreecommitdiff
path: root/mysql-test/r/union.result
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-08-03 15:48:28 +0200
committerunknown <msvensson@neptunus.(none)>2006-08-03 15:48:28 +0200
commit98157e78b1cc678c3a6140a38da7420255b206b9 (patch)
tree0312e88bda32e69dff98c5d3bae3f48c29aea6ad /mysql-test/r/union.result
parent4b57917194278a73abc7861525900df426589792 (diff)
downloadmariadb-git-98157e78b1cc678c3a6140a38da7420255b206b9.tar.gz
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.
Diffstat (limited to 'mysql-test/r/union.result')
-rw-r--r--mysql-test/r/union.result2
1 files changed, 1 insertions, 1 deletions
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