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
545c9126
Commit
545c9126
authored
Dec 22, 2016
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove an unnecessary comparison.
parent
7e02fd1f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
16 deletions
+0
-16
storage/innobase/fil/fil0crypt.cc
storage/innobase/fil/fil0crypt.cc
+0
-5
storage/innobase/include/fil0crypt.h
storage/innobase/include/fil0crypt.h
+0
-3
storage/xtradb/fil/fil0crypt.cc
storage/xtradb/fil/fil0crypt.cc
+0
-5
storage/xtradb/include/fil0crypt.h
storage/xtradb/include/fil0crypt.h
+0
-3
No files found.
storage/innobase/fil/fil0crypt.cc
View file @
545c9126
...
...
@@ -283,11 +283,6 @@ fil_space_read_crypt_data(
const
byte
*
page
,
/*!< in: page 0 */
ulint
offset
)
/*!< in: offset */
{
if
(
memcmp
(
page
+
offset
,
EMPTY_PATTERN
,
MAGIC_SZ
)
==
0
)
{
/* Crypt data is not stored. */
return
NULL
;
}
if
(
memcmp
(
page
+
offset
,
CRYPT_MAGIC
,
MAGIC_SZ
)
!=
0
)
{
/* Crypt data is not stored. */
return
NULL
;
...
...
storage/innobase/include/fil0crypt.h
View file @
545c9126
...
...
@@ -34,9 +34,6 @@ Created 04/01/2015 Jan Lindström
static
const
unsigned
char
CRYPT_MAGIC
[
MAGIC_SZ
]
=
{
's'
,
0xE
,
0xC
,
'R'
,
'E'
,
't'
};
static
const
unsigned
char
EMPTY_PATTERN
[
MAGIC_SZ
]
=
{
0x0
,
0x0
,
0x0
,
0x0
,
0x0
,
0x0
};
/* This key will be used if nothing else is given */
#define FIL_DEFAULT_ENCRYPTION_KEY ENCRYPTION_KEY_SYSTEM_DATA
...
...
storage/xtradb/fil/fil0crypt.cc
View file @
545c9126
...
...
@@ -283,11 +283,6 @@ fil_space_read_crypt_data(
const
byte
*
page
,
/*!< in: page 0 */
ulint
offset
)
/*!< in: offset */
{
if
(
memcmp
(
page
+
offset
,
EMPTY_PATTERN
,
MAGIC_SZ
)
==
0
)
{
/* Crypt data is not stored. */
return
NULL
;
}
if
(
memcmp
(
page
+
offset
,
CRYPT_MAGIC
,
MAGIC_SZ
)
!=
0
)
{
/* Crypt data is not stored. */
return
NULL
;
...
...
storage/xtradb/include/fil0crypt.h
View file @
545c9126
...
...
@@ -34,9 +34,6 @@ Created 04/01/2015 Jan Lindström
static
const
unsigned
char
CRYPT_MAGIC
[
MAGIC_SZ
]
=
{
's'
,
0xE
,
0xC
,
'R'
,
'E'
,
't'
};
static
const
unsigned
char
EMPTY_PATTERN
[
MAGIC_SZ
]
=
{
0x0
,
0x0
,
0x0
,
0x0
,
0x0
,
0x0
};
/* This key will be used if nothing else is given */
#define FIL_DEFAULT_ENCRYPTION_KEY ENCRYPTION_KEY_SYSTEM_DATA
...
...
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