diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 09:33:07 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 09:33:07 +0300 |
| commit | 7c7ac6d4a4c77d4c302732da2efe6785b1f0e455 (patch) | |
| tree | 652c6fd4576bab721661075f3ef1f3962251c8c9 /mysql-test/suite/innodb_i_s/innodb_cmp.result | |
| parent | b73c70c265cab9bae2fd5c243b484172bec0a91d (diff) | |
| parent | 789f55c947a8aa224e5b0a71d5c0bea375320091 (diff) | |
| download | mariadb-git-7c7ac6d4a4c77d4c302732da2efe6785b1f0e455.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/suite/innodb_i_s/innodb_cmp.result')
| -rw-r--r-- | mysql-test/suite/innodb_i_s/innodb_cmp.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp.result b/mysql-test/suite/innodb_i_s/innodb_cmp.result index 6b196a1b993..2931eb1ab4e 100644 --- a/mysql-test/suite/innodb_i_s/innodb_cmp.result +++ b/mysql-test/suite/innodb_i_s/innodb_cmp.result @@ -7,4 +7,4 @@ INNODB_CMP CREATE TEMPORARY TABLE `INNODB_CMP` ( `compress_time` int(11) NOT NULL, `uncompress_ops` int(11) NOT NULL, `uncompress_time` int(11) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci |