diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-02 21:45:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-02 21:45:13 +0300 |
| commit | 5182348316bfe5a3b78484caf76875a5aaa77f5f (patch) | |
| tree | dc4dd5e65111417b75fdd83469ed23003caf57e3 /storage/innobase/handler | |
| parent | 158247d3bdd5cc36dd37568c76e7db081b19eb5a (diff) | |
| parent | ada1074bb10359342ee00e220fe9c172574265fb (diff) | |
| download | mariadb-git-5182348316bfe5a3b78484caf76875a5aaa77f5f.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/handler')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index e0e0afd3dc7..1b9adb5e120 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -21448,16 +21448,6 @@ innodb_encrypt_tables_validate( return 1; } - if (!srv_fil_crypt_rotate_key_age) { - const char *msg = (encrypt_tables ? "enable" : "disable"); - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, - HA_ERR_UNSUPPORTED, - "InnoDB: cannot %s encryption, " - "innodb_encryption_rotate_key_age=0" - " i.e. key rotation disabled", msg); - return 1; - } - return 0; } |