summaryrefslogtreecommitdiff
path: root/mysql-test/suite/parts/r/partition_decimal_myisam.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-09-21 09:33:07 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-09-21 09:33:07 +0300
commit7c7ac6d4a4c77d4c302732da2efe6785b1f0e455 (patch)
tree652c6fd4576bab721661075f3ef1f3962251c8c9 /mysql-test/suite/parts/r/partition_decimal_myisam.result
parentb73c70c265cab9bae2fd5c243b484172bec0a91d (diff)
parent789f55c947a8aa224e5b0a71d5c0bea375320091 (diff)
downloadmariadb-git-7c7ac6d4a4c77d4c302732da2efe6785b1f0e455.tar.gz
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/suite/parts/r/partition_decimal_myisam.result')
-rw-r--r--mysql-test/suite/parts/r/partition_decimal_myisam.result8
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/parts/r/partition_decimal_myisam.result b/mysql-test/suite/parts/r/partition_decimal_myisam.result
index 14999651451..a5175079a4b 100644
--- a/mysql-test/suite/parts/r/partition_decimal_myisam.result
+++ b/mysql-test/suite/parts/r/partition_decimal_myisam.result
@@ -9,7 +9,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` decimal(10,4) NOT NULL,
PRIMARY KEY (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
PARTITION BY KEY (`a`)
(PARTITION `pa1` MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM,
PARTITION `pa2` MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM,
@@ -53,7 +53,7 @@ Table Create Table
t2 CREATE TABLE `t2` (
`a` decimal(18,9) NOT NULL,
PRIMARY KEY (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
PARTITION BY KEY (`a`)
PARTITIONS 10
insert into t2 values (999999999.999999999), (-999999999.999999999), (-1.5), (-1), (0), (1.5), (1234.567), (-1234.567);
@@ -99,7 +99,7 @@ Table Create Table
t3 CREATE TABLE `t3` (
`a` decimal(18,9) NOT NULL,
PRIMARY KEY (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
PARTITION BY RANGE (floor(`a`))
SUBPARTITION BY KEY (`a`)
SUBPARTITIONS 2
@@ -126,7 +126,7 @@ Table Create Table
t4 CREATE TABLE `t4` (
`a` decimal(18,9) NOT NULL,
PRIMARY KEY (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
PARTITION BY LIST (ceiling(`a`))
SUBPARTITION BY KEY (`a`)
SUBPARTITIONS 2