diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-20 16:53:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-20 16:53:20 +0300 |
| commit | 44fd2c4b24b35cdb5f573395fe07800d05b7c8b6 (patch) | |
| tree | 13c130d521c7c1dea3bc9b8b26d9057a1c268668 /mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result | |
| parent | 5d9d379329abcbb661ed6c027efbb9fd763958c6 (diff) | |
| parent | 0792aff161132fb953510555fe45544991dec95d (diff) | |
| download | mariadb-git-44fd2c4b24b35cdb5f573395fe07800d05b7c8b6.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result')
| -rw-r--r-- | mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result b/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result index 481b5c0e6fa..013e4e67fb9 100644 --- a/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result +++ b/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result @@ -11,4 +11,4 @@ INNODB_TABLESPACES_ENCRYPTION CREATE TEMPORARY TABLE `INNODB_TABLESPACES_ENCRYPT `KEY_ROTATION_MAX_PAGE_NUMBER` bigint(21) unsigned, `CURRENT_KEY_ID` int(11) unsigned NOT NULL, `ROTATING_OR_FLUSHING` int(1) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci |