diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 09:12:16 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 09:12:16 +0300 |
commit | de0e7cd72a6e071aba686178a8ff461dd5a757f5 (patch) | |
tree | 9beb054fb01d917e1359b60debce629056c6ef4b /mysql-test/suite/encryption | |
parent | 90c8d773ed0ea7de5e735e836e1e33a190711f17 (diff) | |
parent | a79c25789474f32097e083d3b4953927c04909bc (diff) | |
download | mariadb-git-de0e7cd72a6e071aba686178a8ff461dd5a757f5.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/suite/encryption')
-rw-r--r-- | mysql-test/suite/encryption/r/innodb_encrypt_log.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/encryption/r/innodb_encrypt_log.result b/mysql-test/suite/encryption/r/innodb_encrypt_log.result index b999e8cb34a..cd37330f2b0 100644 --- a/mysql-test/suite/encryption/r/innodb_encrypt_log.result +++ b/mysql-test/suite/encryption/r/innodb_encrypt_log.result @@ -7,7 +7,7 @@ # SET GLOBAL innodb_log_checksums=0; Warnings: -Warning 138 innodb_encrypt_log implies innodb_log_checksums +Warning 138 innodb_log_checksums is deprecated and has no effect outside recovery SELECT @@global.innodb_log_checksums; @@global.innodb_log_checksums 1 |