diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-04 02:06:41 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-04 02:06:41 +0200 |
| commit | dd43c85c48650b5303818e43cbbf26a388e05e68 (patch) | |
| tree | 5d786e4303cfa19ca4fc61f4e85244502e1ea49f | |
| parent | 94e22efb79869e45a38424c0339752d78da80f96 (diff) | |
| parent | 23e4446adc0de8b6f763f746fd20f0e546a40129 (diff) | |
| download | mariadb-git-dd43c85c48650b5303818e43cbbf26a388e05e68.tar.gz | |
Merge 10.2 into 10.3
| -rw-r--r-- | extra/mariabackup/fil_cur.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/mariabackup/fil_cur.cc b/extra/mariabackup/fil_cur.cc index dedae192e2b..953b3aa0653 100644 --- a/extra/mariabackup/fil_cur.cc +++ b/extra/mariabackup/fil_cur.cc @@ -342,8 +342,8 @@ static bool page_is_corrupted(const byte *page, ulint page_no, bool decrypted = false; if (!space->crypt_data || space->crypt_data->type == CRYPT_SCHEME_UNENCRYPTED - || fil_space_decrypt(space, tmp_frame, tmp_page, - &decrypted)) { + || !fil_space_decrypt(space, tmp_frame, tmp_page, + &decrypted)) { return true; } |