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/suite/archive/partition_archive.result | |
parent | 90d899c30f4091e67989167806545e9a1d933355 (diff) | |
parent | 7c7ac6d4a4c77d4c302732da2efe6785b1f0e455 (diff) | |
download | mariadb-git-4345d9310080e6e4cbf1040263a2653f7d3d9227.tar.gz |
Merge 10.7 into 10.8
Diffstat (limited to 'mysql-test/suite/archive/partition_archive.result')
-rw-r--r-- | mysql-test/suite/archive/partition_archive.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/archive/partition_archive.result b/mysql-test/suite/archive/partition_archive.result index 41be0b31bce..e69679c1298 100644 --- a/mysql-test/suite/archive/partition_archive.result +++ b/mysql-test/suite/archive/partition_archive.result @@ -83,7 +83,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=ARCHIVE DEFAULT CHARSET=latin1 +) ENGINE=ARCHIVE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY HASH (`a`) drop table t1; CREATE TABLE t1(id MEDIUMINT NOT NULL AUTO_INCREMENT, @@ -108,7 +108,7 @@ t1 CREATE TABLE `t1` ( `id` mediumint(9) NOT NULL AUTO_INCREMENT, `f1` varchar(25) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=ARCHIVE AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 +) ENGINE=ARCHIVE AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE (`id`) SUBPARTITION BY HASH (`id`) SUBPARTITIONS 2 @@ -137,7 +137,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `fld1` int(11) NOT NULL, PRIMARY KEY (`fld1`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY HASH (`fld1`) PARTITIONS 5 ALTER TABLE t1 ENGINE= ARCHIVE; @@ -148,7 +148,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `fld1` int(11) NOT NULL, PRIMARY KEY (`fld1`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY HASH (`fld1`) PARTITIONS 5 #Cleanup. |