diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 09:52:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 09:52:09 +0300 |
| commit | 4345d9310080e6e4cbf1040263a2653f7d3d9227 (patch) | |
| tree | 84b4f98615e1ec93d2bf12443e0de514783dd0db /mysql-test/suite/innodb/r/instant_drop.result | |
| parent | 90d899c30f4091e67989167806545e9a1d933355 (diff) | |
| parent | 7c7ac6d4a4c77d4c302732da2efe6785b1f0e455 (diff) | |
| download | mariadb-git-4345d9310080e6e4cbf1040263a2653f7d3d9227.tar.gz | |
Merge 10.7 into 10.8
Diffstat (limited to 'mysql-test/suite/innodb/r/instant_drop.result')
| -rw-r--r-- | mysql-test/suite/innodb/r/instant_drop.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/innodb/r/instant_drop.result b/mysql-test/suite/innodb/r/instant_drop.result index 2b82eb3c805..b9df9b0c29a 100644 --- a/mysql-test/suite/innodb/r/instant_drop.result +++ b/mysql-test/suite/innodb/r/instant_drop.result @@ -56,7 +56,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `f3` int(11) NOT NULL, `f5` blob DEFAULT repeat('aaa',950) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select f3 from t1; f3 2 @@ -98,7 +98,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `f2` int(11) NOT NULL, KEY `idx` (`f2`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1(f1 int, f2 int not null)engine=innodb; insert into t1 values(1, 2); @@ -149,7 +149,7 @@ t2 CREATE TABLE `t2` ( `f1` int(11) DEFAULT NULL, `f4` varchar(100) DEFAULT repeat('a',20), `f5` int(11) DEFAULT 10 -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci alter table t2 add column f6 char(100) default repeat('a', 99), algorithm=instant; create table t3(f1 int, f2 int not null)engine=innodb; insert into t3 values(1, 2); @@ -184,7 +184,7 @@ t2 CREATE TABLE `t2` ( `f4` varchar(100) DEFAULT repeat('a',20), `f5` int(11) DEFAULT 10, `f6` char(100) DEFAULT repeat('a',99) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select * from t3; f1 f3 f4 1 1 4 |