Merge 10.2 into 10.3

dd43c85c · Marko Mäkelä · 94e22efb · 23e4446a · dd43c85c
Commit dd43c85c authored Jan 04, 2019 by Marko Mäkelä
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

extra/mariabackup/fil_cur.cc extra/mariabackup/fil_cur.cc +2 -2

No files found.
--- a/extra/mariabackup/fil_cur.cc
+++ b/extra/mariabackup/fil_cur.cc
@@ -342,7 +342,7 @@ 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,
+		    || !fil_space_decrypt(space, tmp_frame, tmp_page,
 					  &decrypted)) {
 			return true;
 		}