1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Merge 10.5 into 10.6

This commit is contained in:
Marko Mäkelä
2022-09-20 16:53:20 +03:00
1152 changed files with 30607 additions and 29546 deletions

View File

@ -587,7 +587,7 @@ s CREATE TABLE `s` (
`cache` bigint(21) NOT NULL,
`cycle` tinyint(1) unsigned NOT NULL,
`round` bigint(21) NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
show create table s2;
Table Create Table
s2 CREATE TABLE `s2` (
@ -599,7 +599,7 @@ s2 CREATE TABLE `s2` (
`cache` bigint(21) NOT NULL,
`cycle` tinyint(1) unsigned NOT NULL,
`round` bigint(21) NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
show create sequence s;
ERROR 42S02: 'test.s' is not a SEQUENCE
show create sequence s2;
@ -615,7 +615,7 @@ show create table s;
Table Create Table
s CREATE TEMPORARY TABLE `s` (
`i` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
drop table s;
create or replace sequence s;
create temporary sequence s;