summaryrefslogtreecommitdiff
path: root/mysql-test/main/type_bit_innodb.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-09-21 10:07:09 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-09-21 10:07:09 +0300
commita8e45404765db6bc6c57dab3cc834e92a44d0110 (patch)
tree901416c2f3931ea4b9df5a1d95e6c358a7954a25 /mysql-test/main/type_bit_innodb.result
parent4a7367d5282978207ad91e0b595b75a35dc37fec (diff)
parent4345d9310080e6e4cbf1040263a2653f7d3d9227 (diff)
downloadmariadb-git-a8e45404765db6bc6c57dab3cc834e92a44d0110.tar.gz
Merge 10.8 into 10.9
Diffstat (limited to 'mysql-test/main/type_bit_innodb.result')
-rw-r--r--mysql-test/main/type_bit_innodb.result8
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/main/type_bit_innodb.result b/mysql-test/main/type_bit_innodb.result
index a3ac23ebb71..67b4ff55674 100644
--- a/mysql-test/main/type_bit_innodb.result
+++ b/mysql-test/main/type_bit_innodb.result
@@ -43,7 +43,7 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` bit(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
drop table t1;
create table t1 (a bit(64)) engine=innodb;
insert into t1 values
@@ -389,21 +389,21 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` bit(1) DEFAULT NULL,
`b` bit(10) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
alter table t1 engine=heap;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` bit(1) DEFAULT NULL,
`b` bit(10) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
alter table t1 engine=innodb;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` bit(1) DEFAULT NULL,
`b` bit(10) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
drop table t1;
create table t1 (a bit(7)) engine=innodb;
insert into t1 values (0x60);