Skip to content

M
MariaDB
Commit 545c9126 authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Remove an unnecessary comparison.

parent 7e02fd1f
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 16 deletions
storage/innobase/fil/fil0crypt.cc
View file @ 545c9126
...@@ -283,11 +283,6 @@ fil_space_read_crypt_data( ...@@ -283,11 +283,6 @@ fil_space_read_crypt_data(
const byte* page, /*!< in: page 0 */ const byte* page, /*!< in: page 0 */
ulint offset) /*!< in: offset */ 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) { if (memcmp(page + offset, CRYPT_MAGIC, MAGIC_SZ) != 0) {
/* Crypt data is not stored. */ /* Crypt data is not stored. */
return NULL; return NULL;
......
storage/innobase/include/fil0crypt.h
View file @ 545c9126
...@@ -34,9 +34,6 @@ Created 04/01/2015 Jan Lindström ...@@ -34,9 +34,6 @@ Created 04/01/2015 Jan Lindström
static const unsigned char CRYPT_MAGIC[MAGIC_SZ] = { static const unsigned char CRYPT_MAGIC[MAGIC_SZ] = {
's', 0xE, 0xC, 'R', 'E', 't' }; '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 */ /* This key will be used if nothing else is given */
#define FIL_DEFAULT_ENCRYPTION_KEY ENCRYPTION_KEY_SYSTEM_DATA #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( ...@@ -283,11 +283,6 @@ fil_space_read_crypt_data(
const byte* page, /*!< in: page 0 */ const byte* page, /*!< in: page 0 */
ulint offset) /*!< in: offset */ 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) { if (memcmp(page + offset, CRYPT_MAGIC, MAGIC_SZ) != 0) {
/* Crypt data is not stored. */ /* Crypt data is not stored. */
return NULL; return NULL;
......
storage/xtradb/include/fil0crypt.h
View file @ 545c9126
...@@ -34,9 +34,6 @@ Created 04/01/2015 Jan Lindström ...@@ -34,9 +34,6 @@ Created 04/01/2015 Jan Lindström
static const unsigned char CRYPT_MAGIC[MAGIC_SZ] = { static const unsigned char CRYPT_MAGIC[MAGIC_SZ] = {
's', 0xE, 0xC, 'R', 'E', 't' }; '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 */ /* This key will be used if nothing else is given */
#define FIL_DEFAULT_ENCRYPTION_KEY ENCRYPTION_KEY_SYSTEM_DATA #define FIL_DEFAULT_ENCRYPTION_KEY ENCRYPTION_KEY_SYSTEM_DATA
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7