mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

- Follow-up fix to MDEV-15229

Browse source
This commit is contained in:
Thirunarayanan Balathandayuthapani 2018-03-26 15:48:27 +05:30
commit e27535093d
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/suite/encryption/r/innodb-discard-import.result
View file

@ -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;

3
mysql-test/suite/encryption/t/innodb-discard-import.test
View file

@ -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;

2
storage/innobase/buf/buf0buf.cc
View file

@ -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