database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-11 09:43:05 +03:00
Code Activity

Remove an unnecessary comparison.

Browse Source
This commit is contained in:
Marko Mäkelä
2016-12-22 12:03:36 +02:00
parent 7e02fd1f71
commit 545c912696
4 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
storage/innobase/fil/fil0crypt.cc
View File

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

3
storage/innobase/include/fil0crypt.h
View File

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

5
storage/xtradb/fil/fil0crypt.cc
View File

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

3
storage/xtradb/include/fil0crypt.h
View File

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