database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Manual merge 5.0->5.1. Post-merge fixes.

Browse Source
This commit is contained in:
kostja@bodhi.local
2006-08-14 13:27:11 +04:00
parent 04c97488f9
commit 5dfdc8bfce
30 changed files with 116 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/union.result
View File

@@ -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` mediumtext 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