diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-03 22:14:55 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-04 01:59:46 +0200 |
| commit | 23e4446adc0de8b6f763f746fd20f0e546a40129 (patch) | |
| tree | b388107a4a81bd5b883ec4e65611b2a047380ea3 /extra | |
| parent | b7392d142a2e7ae15fa07d536fd1e7aaee65554a (diff) | |
| download | mariadb-git-23e4446adc0de8b6f763f746fd20f0e546a40129.tar.gz | |
Fix a merge error in the parent commit
Fix an inadvertently inverted condition that caused
galera.galera_sst_mariabackup_table_options test failure.
Diffstat (limited to 'extra')
| -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 4ce32f828d2..e1b7c670f57 100644 --- a/extra/mariabackup/fil_cur.cc +++ b/extra/mariabackup/fil_cur.cc @@ -343,8 +343,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; } |