- Follow-up fix to MDEV-15229

MariaDB · Mar 26, 2018 · e275350 · e275350
1 parent c764bc0
commit e275350
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/mysql-test/suite/encryption/r/innodb-discard-import.result b/mysql-test/suite/encryption/r/innodb-discard-import.result
@@ -130,5 +130,6 @@ NOT FOUND /barfoo/ in t2.ibd
 NOT FOUND /tmpres/ in t3.ibd
 # t4 yes on expecting NOT FOUND
 # MDEV-15527 FIXME: Enable this test!
+NOT FOUND /mysql/ in t4.ibd
 DROP PROCEDURE innodb_insert_proc;
 DROP TABLE t1,t2,t3,t4;
diff --git a/mysql-test/suite/encryption/t/innodb-discard-import.test b/mysql-test/suite/encryption/t/innodb-discard-import.test
@@ -111,8 +111,7 @@ SELECT COUNT(*) FROM t4;
 --let SEARCH_PATTERN=mysql
 --echo # t4 yes on expecting NOT FOUND
 -- let SEARCH_FILE=$t4_IBD
---echo # MDEV-15527 FIXME: Enable this test!
-#-- source include/search_pattern_in_file.inc
+-- source include/search_pattern_in_file.inc
 
 DROP PROCEDURE innodb_insert_proc;
 DROP TABLE t1,t2,t3,t4;

diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc
@@ -7402,6 +7402,8 @@ buf_page_encrypt_before_write(
 
 		bpage->real_size = out_len;
 
+		/* Workaround for MDEV-15527. */
+		memset(tmp + out_len, 0 , srv_page_size - out_len);
 #ifdef UNIV_DEBUG
 		fil_page_type_validate(tmp);
 #endif