1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge 10.7 into 10.8

This commit is contained in:
Marko Mäkelä
2022-09-21 09:52:09 +03:00
1213 changed files with 31078 additions and 30257 deletions

View File

@ -5031,7 +5031,7 @@ t2 CREATE TABLE `t2` (
`mid` int(11) DEFAULT NULL,
`name` text DEFAULT NULL,
`mname` text DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
insert into t2 WITH RECURSIVE
cteReports (level, id, mid, name) AS
(
@ -5112,7 +5112,7 @@ t2 CREATE TABLE `t2` (
`mid` int(11) DEFAULT NULL,
`name` text DEFAULT NULL,
`mname` text DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
set @@sql_mode=default;
drop table t1,t2;
#