mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/10.4' into 10.5

Browse source
This commit is contained in:
Alexander Barkov 2022-09-14 15:00:09 +04:00
commit fe844c16b6
1188 changed files with 48438 additions and 48322 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/main/intersect.result
View file

@ -562,7 +562,7 @@ Table Create Table
t4 CREATE TABLE `t4` (
`a` int(11) DEFAULT NULL,
`b` blob DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
drop tables t1,t2,t3,t4;
create table t1 (a int, b blob) engine=MyISAM;
create table t2 (c int, d blob) engine=MyISAM;