Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
e2753509
Commit
e2753509
authored
Mar 26, 2018
by
Thirunarayanan Balathandayuthapani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Follow-up fix to MDEV-15229
parent
c764bc0a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
mysql-test/suite/encryption/r/innodb-discard-import.result
mysql-test/suite/encryption/r/innodb-discard-import.result
+1
-0
mysql-test/suite/encryption/t/innodb-discard-import.test
mysql-test/suite/encryption/t/innodb-discard-import.test
+1
-2
storage/innobase/buf/buf0buf.cc
storage/innobase/buf/buf0buf.cc
+2
-0
No files found.
mysql-test/suite/encryption/r/innodb-discard-import.result
View file @
e2753509
...
...
@@ -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;
mysql-test/suite/encryption/t/innodb-discard-import.test
View file @
e2753509
...
...
@@ -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
;
...
...
storage/innobase/buf/buf0buf.cc
View file @
e2753509
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment