diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 10:07:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 10:07:09 +0300 |
| commit | a8e45404765db6bc6c57dab3cc834e92a44d0110 (patch) | |
| tree | 901416c2f3931ea4b9df5a1d95e6c358a7954a25 /mysql-test/suite/innodb/r/alter_table.result | |
| parent | 4a7367d5282978207ad91e0b595b75a35dc37fec (diff) | |
| parent | 4345d9310080e6e4cbf1040263a2653f7d3d9227 (diff) | |
| download | mariadb-git-a8e45404765db6bc6c57dab3cc834e92a44d0110.tar.gz | |
Merge 10.8 into 10.9
Diffstat (limited to 'mysql-test/suite/innodb/r/alter_table.result')
| -rw-r--r-- | mysql-test/suite/innodb/r/alter_table.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/innodb/r/alter_table.result b/mysql-test/suite/innodb/r/alter_table.result index 3b0d3b0659d..d39edd3c826 100644 --- a/mysql-test/suite/innodb/r/alter_table.result +++ b/mysql-test/suite/innodb/r/alter_table.result @@ -8,7 +8,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` text NOT NULL, KEY `idx1` (`a`(3072)) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ROW_FORMAT=DYNAMIC drop table t1; set @@sql_mode=default; create table t1 ( @@ -97,12 +97,12 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 +) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 TRANSACTIONAL=1 show create table t2; Table Create Table t2 CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 TRANSACTIONAL=1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci TRANSACTIONAL=1 alter table t1 engine=innodb; alter table t1 add column b int; drop table t1,t2; |