diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 09:52:09 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 09:52:09 +0300 |
commit | 4345d9310080e6e4cbf1040263a2653f7d3d9227 (patch) | |
tree | 84b4f98615e1ec93d2bf12443e0de514783dd0db /mysql-test/main/myisam.result | |
parent | 90d899c30f4091e67989167806545e9a1d933355 (diff) | |
parent | 7c7ac6d4a4c77d4c302732da2efe6785b1f0e455 (diff) | |
download | mariadb-git-4345d9310080e6e4cbf1040263a2653f7d3d9227.tar.gz |
Merge 10.7 into 10.8
Diffstat (limited to 'mysql-test/main/myisam.result')
-rw-r--r-- | mysql-test/main/myisam.result | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/mysql-test/main/myisam.result b/mysql-test/main/myisam.result index 981131889e4..0b0099d7b84 100644 --- a/mysql-test/main/myisam.result +++ b/mysql-test/main/myisam.result @@ -1146,7 +1146,7 @@ t1 CREATE TABLE `t1` ( `v` varchar(10) DEFAULT NULL, `c` char(10) DEFAULT NULL, `t` text DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci create table t2 like t1; show create table t2; Table Create Table @@ -1154,7 +1154,7 @@ t2 CREATE TABLE `t2` ( `v` varchar(10) DEFAULT NULL, `c` char(10) DEFAULT NULL, `t` text DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci create table t3 select * from t1; show create table t3; Table Create Table @@ -1162,7 +1162,7 @@ t3 CREATE TABLE `t3` ( `v` varchar(10) DEFAULT NULL, `c` char(10) DEFAULT NULL, `t` text DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci alter table t1 modify c varchar(10); show create table t1; Table Create Table @@ -1170,7 +1170,7 @@ t1 CREATE TABLE `t1` ( `v` varchar(10) DEFAULT NULL, `c` varchar(10) DEFAULT NULL, `t` text DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci alter table t1 modify v char(10); show create table t1; Table Create Table @@ -1178,7 +1178,7 @@ t1 CREATE TABLE `t1` ( `v` char(10) DEFAULT NULL, `c` varchar(10) DEFAULT NULL, `t` text DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci alter table t1 modify t varchar(10); Warnings: Note 1265 Data truncated for column 't' at row 2 @@ -1188,7 +1188,7 @@ t1 CREATE TABLE `t1` ( `v` char(10) DEFAULT NULL, `c` varchar(10) DEFAULT NULL, `t` varchar(10) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select concat('*',v,'*',c,'*',t,'*') from t1; concat('*',v,'*',c,'*',t,'*') *+*+*+ * @@ -1204,7 +1204,7 @@ t1 CREATE TABLE `t1` ( KEY `v` (`v`), KEY `c` (`c`), KEY `t` (`t`(10)) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select count(*) from t1; count(*) 270 @@ -1428,7 +1428,7 @@ t1 CREATE TABLE `t1` ( KEY `c` (`c`), KEY `t` (`t`(10)), KEY `v` (`v`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select count(*) from t1 where v='a'; count(*) 10 @@ -1508,7 +1508,7 @@ t1 CREATE TABLE `t1` ( KEY `c` (`c`), KEY `t` (`t`(10)), KEY `v` (`v`(30)) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select count(*) from t1 where v='a'; count(*) 10 @@ -1588,7 +1588,7 @@ t1 CREATE TABLE `t1` ( KEY `c` (`c`), KEY `t` (`t`(10)), KEY `v` (`v`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select v,count(*) from t1 group by v limit 10; v count(*) a 1 @@ -1666,14 +1666,14 @@ t1 CREATE TABLE `t1` ( KEY `v` (`v`(5)), KEY `c` (`c`(5)), KEY `t` (`t`(5)) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (v char(10) character set utf8); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` char(10) CHARACTER SET utf8mb3 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 + `v` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (v varchar(10), c char(10)) row_format=fixed; show create table t1; @@ -1681,7 +1681,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `v` varchar(10) DEFAULT NULL, `c` char(10) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ROW_FORMAT=FIXED insert into t1 values('a','a'),('a ','a '); select concat('*',v,'*',c,'*') from t1; concat('*',v,'*',c,'*') @@ -1715,7 +1715,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `v` mediumtext DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; set statement sql_mode = 'NO_ENGINE_SUBSTITUTION' for create table t1 (v varchar(65530) character set utf8); @@ -1724,8 +1724,8 @@ Note 1246 Converting column 'v' from VARCHAR to TEXT show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 + `v` mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; set statement sql_mode='' for create table t1 (v varchar(65535)); @@ -1735,7 +1735,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `v` text DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; set default_storage_engine=MyISAM; set @save_concurrent_insert=@@concurrent_insert; @@ -1967,7 +1967,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, KEY `a` (`a`) KEY_BLOCK_SIZE=1024 -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (a int not null, key `a` (a) key_block_size=2048); show create table t1; @@ -1975,7 +1975,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, KEY `a` (`a`) KEY_BLOCK_SIZE=2048 -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (a varchar(2048), key `a` (a)); Warnings: @@ -1985,7 +1985,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(2048) DEFAULT NULL, KEY `a` (`a`(1000)) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (a varchar(2048), key `a` (a) key_block_size=1024); Warnings: @@ -1995,7 +1995,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(2048) DEFAULT NULL, KEY `a` (`a`(1000)) KEY_BLOCK_SIZE=4096 -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (a int not null, b varchar(2048), key (a), key(b)) key_block_size=1024; Warnings: @@ -2007,7 +2007,7 @@ t1 CREATE TABLE `t1` ( `b` varchar(2048) DEFAULT NULL, KEY `a` (`a`), KEY `b` (`b`(1000)) KEY_BLOCK_SIZE=4096 -) ENGINE=MyISAM DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=1024 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci KEY_BLOCK_SIZE=1024 alter table t1 key_block_size=2048; show create table t1; Table Create Table @@ -2016,7 +2016,7 @@ t1 CREATE TABLE `t1` ( `b` varchar(2048) DEFAULT NULL, KEY `a` (`a`) KEY_BLOCK_SIZE=1024, KEY `b` (`b`(1000)) KEY_BLOCK_SIZE=4096 -) ENGINE=MyISAM DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=2048 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci KEY_BLOCK_SIZE=2048 alter table t1 add c int, add key (c); show create table t1; Table Create Table @@ -2027,7 +2027,7 @@ t1 CREATE TABLE `t1` ( KEY `a` (`a`) KEY_BLOCK_SIZE=1024, KEY `b` (`b`(1000)) KEY_BLOCK_SIZE=4096, KEY `c` (`c`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=2048 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci KEY_BLOCK_SIZE=2048 alter table t1 key_block_size=0; alter table t1 add d int, add key (d); show create table t1; @@ -2041,7 +2041,7 @@ t1 CREATE TABLE `t1` ( KEY `b` (`b`(1000)) KEY_BLOCK_SIZE=4096, KEY `c` (`c`) KEY_BLOCK_SIZE=2048, KEY `d` (`d`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (a int not null, b varchar(2048), key (a), key(b)) key_block_size=8192; Warnings: @@ -2053,7 +2053,7 @@ t1 CREATE TABLE `t1` ( `b` varchar(2048) DEFAULT NULL, KEY `a` (`a`), KEY `b` (`b`(1000)) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=8192 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci KEY_BLOCK_SIZE=8192 drop table t1; create table t1 (a int not null, b varchar(512), key (a), key(b)); show create table t1; @@ -2063,7 +2063,7 @@ t1 CREATE TABLE `t1` ( `b` varchar(512) DEFAULT NULL, KEY `a` (`a`), KEY `b` (`b`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci alter table t1 key_block_size=2048; show create table t1; Table Create Table @@ -2072,7 +2072,7 @@ t1 CREATE TABLE `t1` ( `b` varchar(512) DEFAULT NULL, KEY `a` (`a`) KEY_BLOCK_SIZE=1024, KEY `b` (`b`) KEY_BLOCK_SIZE=3072 -) ENGINE=MyISAM DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=2048 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci KEY_BLOCK_SIZE=2048 alter table t1 add c int, add key (c); show create table t1; Table Create Table @@ -2083,7 +2083,7 @@ t1 CREATE TABLE `t1` ( KEY `a` (`a`) KEY_BLOCK_SIZE=1024, KEY `b` (`b`) KEY_BLOCK_SIZE=4096, KEY `c` (`c`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=2048 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci KEY_BLOCK_SIZE=2048 alter table t1 key_block_size=4096; show create table t1; Table Create Table @@ -2094,7 +2094,7 @@ t1 CREATE TABLE `t1` ( KEY `a` (`a`) KEY_BLOCK_SIZE=1024, KEY `b` (`b`), KEY `c` (`c`) KEY_BLOCK_SIZE=2048 -) ENGINE=MyISAM DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=4096 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci KEY_BLOCK_SIZE=4096 alter table t1 key_block_size=0; show create table t1; Table Create Table @@ -2105,7 +2105,7 @@ t1 CREATE TABLE `t1` ( KEY `a` (`a`) KEY_BLOCK_SIZE=1024, KEY `b` (`b`) KEY_BLOCK_SIZE=4096, KEY `c` (`c`) KEY_BLOCK_SIZE=2048 -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci alter table t1 add d int, add key (d); show create table t1; Table Create Table @@ -2118,7 +2118,7 @@ t1 CREATE TABLE `t1` ( KEY `b` (`b`) KEY_BLOCK_SIZE=4096, KEY `c` (`c`) KEY_BLOCK_SIZE=2048, KEY `d` (`d`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci alter table t1 key_block_size=8192; show create table t1; Table Create Table @@ -2131,7 +2131,7 @@ t1 CREATE TABLE `t1` ( KEY `b` (`b`) KEY_BLOCK_SIZE=4096, KEY `c` (`c`) KEY_BLOCK_SIZE=2048, KEY `d` (`d`) KEY_BLOCK_SIZE=1024 -) ENGINE=MyISAM DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=8192 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci KEY_BLOCK_SIZE=8192 drop table t1; create table t1 (a int not null, b varchar(2048), key (a) key_block_size=1024, key(b)) key_block_size=8192; Warnings: @@ -2143,7 +2143,7 @@ t1 CREATE TABLE `t1` ( `b` varchar(2048) DEFAULT NULL, KEY `a` (`a`) KEY_BLOCK_SIZE=1024, KEY `b` (`b`(1000)) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=8192 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci KEY_BLOCK_SIZE=8192 drop table t1; create table t1 (a int not null, b int, key (a) key_block_size=1024, key(b) key_block_size=8192) key_block_size=16384; show create table t1; @@ -2153,7 +2153,7 @@ t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT NULL, KEY `a` (`a`) KEY_BLOCK_SIZE=1024, KEY `b` (`b`) KEY_BLOCK_SIZE=8192 -) ENGINE=MyISAM DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=16384 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci KEY_BLOCK_SIZE=16384 drop table t1; create table t1 (a int not null, key `a` (a) key_block_size=512); show create table t1; @@ -2161,7 +2161,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, KEY `a` (`a`) KEY_BLOCK_SIZE=1024 -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (a varchar(2048), key `a` (a) key_block_size=1000000000000000000); Warnings: @@ -2171,7 +2171,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(2048) DEFAULT NULL, KEY `a` (`a`(1000)) KEY_BLOCK_SIZE=4096 -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (a int not null, key `a` (a) key_block_size=1025); show create table t1; @@ -2179,7 +2179,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, KEY `a` (`a`) KEY_BLOCK_SIZE=2048 -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (a int not null, key key_block_size=1024 (a)); ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '=1024 (a))' at line 1 @@ -2420,7 +2420,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `n` int(11) NOT NULL, `c` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 TRANSACTIONAL=1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci TRANSACTIONAL=1 drop table t1; CREATE TABLE t1 (line LINESTRING NOT NULL) engine=myisam; INSERT INTO t1 VALUES (GeomFromText("LINESTRING(0 0)")); |