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_explicit_prune.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_explicit_prune.result')
| -rw-r--r-- | mysql-test/main/partition_explicit_prune.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/main/partition_explicit_prune.result b/mysql-test/main/partition_explicit_prune.result index 56fd0ff569a..740bc1a159c 100644 --- a/mysql-test/main/partition_explicit_prune.result +++ b/mysql-test/main/partition_explicit_prune.result @@ -201,7 +201,7 @@ t1 CREATE TABLE `t1` ( `b` varchar(64) DEFAULT NULL, PRIMARY KEY (`a`), KEY `b` (`b`,`a`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE (`a`) SUBPARTITION BY HASH (`a`) (PARTITION `pNeg` VALUES LESS THAN (0) @@ -1133,7 +1133,7 @@ t1 CREATE TABLE `t1` ( `b` varchar(64) DEFAULT NULL, PRIMARY KEY (`a`), KEY `b` (`b`,`a`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE (`a`) SUBPARTITION BY HASH (`a`) (PARTITION `pNeg` VALUES LESS THAN (0) @@ -1165,7 +1165,7 @@ t2 CREATE TABLE `t2` ( `b` varchar(64) DEFAULT NULL, PRIMARY KEY (`a`), KEY `b` (`b`,`a`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE (`a`) SUBPARTITION BY HASH (`a`) (PARTITION `pNeg` VALUES LESS THAN (0) @@ -1192,7 +1192,7 @@ Table Create Table t3 CREATE TABLE `t3` ( `a` int(11) NOT NULL, `b` varchar(64) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t3; a b -4 (pNeg-)subp0, Updated, Updated2, Updated from a = -2 @@ -1665,7 +1665,7 @@ t1 CREATE TABLE `t1` ( `b` varchar(64) DEFAULT NULL, PRIMARY KEY (`a`), KEY `b` (`b`,`a`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE (`a`) SUBPARTITION BY HASH (`a`) (PARTITION `pNeg` VALUES LESS THAN (0) |