diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-13 16:36:38 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-13 16:36:38 +0300 |
| commit | 18795f55122b04cb5c9ea19498b720735b80714b (patch) | |
| tree | 1a749eeaaabaa86e9b755cef817a6267a6b59960 /mysql-test/main/partition_range.result | |
| parent | 9a8faeea142ea6f575419799c9439f4673971573 (diff) | |
| parent | 68ce0231ad6a16e02db9d67a217a88055b6d01ff (diff) | |
| download | mariadb-git-18795f55122b04cb5c9ea19498b720735b80714b.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main/partition_range.result')
| -rw-r--r-- | mysql-test/main/partition_range.result | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/mysql-test/main/partition_range.result b/mysql-test/main/partition_range.result index 6eb7147b461..15c65cefa34 100644 --- a/mysql-test/main/partition_range.result +++ b/mysql-test/main/partition_range.result @@ -21,7 +21,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` datetime DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE (to_days(`a`)) SUBPARTITION BY HASH (to_seconds(`a`)) (PARTITION `p0` VALUES LESS THAN (1) ENGINE = MyISAM) @@ -61,7 +61,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` datetime NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE (to_seconds(`a`)) (PARTITION `p0` VALUES LESS THAN (63340531200) ENGINE = MyISAM, PARTITION `p1` VALUES LESS THAN (63342604800) ENGINE = MyISAM) @@ -92,7 +92,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` date DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE (to_seconds(`a`)) (PARTITION `p0` VALUES LESS THAN (63240134400) ENGINE = MyISAM, PARTITION `p1` VALUES LESS THAN (63271756800) ENGINE = MyISAM) @@ -122,7 +122,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` datetime DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE (to_seconds(`a`)) (PARTITION `p0` VALUES LESS THAN (63240177600) ENGINE = MyISAM, PARTITION `p1` VALUES LESS THAN (63271800000) ENGINE = MyISAM) @@ -152,7 +152,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE (`a`) (PARTITION `p0` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) drop table t1; @@ -283,7 +283,7 @@ t1 CREATE TABLE `t1` ( `b` int(11) NOT NULL, `c` int(11) NOT NULL, PRIMARY KEY (`a`,`b`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE (`a`) (PARTITION `x1` VALUES LESS THAN (5) TABLESPACE = ts1 ENGINE = MyISAM, PARTITION `x2` VALUES LESS THAN (10) TABLESPACE = ts2 ENGINE = MyISAM, @@ -307,7 +307,7 @@ t1 CREATE TABLE `t1` ( `b` int(11) NOT NULL, `c` int(11) NOT NULL, PRIMARY KEY (`a`,`b`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE (`a`) (PARTITION `x1` VALUES LESS THAN (5) TABLESPACE = ts1 ENGINE = MyISAM, PARTITION `x2` VALUES LESS THAN (10) TABLESPACE = ts2 ENGINE = MyISAM, @@ -408,7 +408,7 @@ t1 CREATE TABLE `t1` ( `b` int(11) NOT NULL, `c` int(11) NOT NULL, PRIMARY KEY (`a`,`b`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE (`a`) SUBPARTITION BY HASH (`a` + `b`) (PARTITION `x1` VALUES LESS THAN (1) @@ -426,7 +426,7 @@ t1 CREATE TABLE `t1` ( `c` int(11) NOT NULL, `d` int(11) DEFAULT NULL, PRIMARY KEY (`a`,`b`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE (`a`) SUBPARTITION BY HASH (`a` + `b`) (PARTITION `x1` VALUES LESS THAN (1) @@ -657,7 +657,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` bigint(20) unsigned DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE (`a`) (PARTITION `p0` VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION `p1` VALUES LESS THAN (10) ENGINE = MyISAM) @@ -670,7 +670,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` bigint(20) unsigned DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE (`a`) (PARTITION `p0` VALUES LESS THAN (2) ENGINE = MyISAM, PARTITION `p1` VALUES LESS THAN (10) ENGINE = MyISAM) |