summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2015-03-19 07:07:56 +0200
committerJan Lindström <jan.lindstrom@mariadb.com>2015-03-19 07:13:07 +0200
commitbab0bdbb5c1221bac03082d27318deb524808ebb (patch)
tree0a7c28e28849c5da6a7f36d8eee54b69eaf5cdb2
parente28a241907aa7a511b65b196703efaeea71e1dc4 (diff)
downloadmariadb-git-bab0bdbb5c1221bac03082d27318deb524808ebb.tar.gz
Introduce two debug crash points while writing crypt data to test
redo operations.
-rw-r--r--storage/innobase/fil/fil0crypt.cc6
-rw-r--r--storage/xtradb/fil/fil0crypt.cc6
2 files changed, 12 insertions, 0 deletions
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc
index 10d49bb3798..4a783138416 100644
--- a/storage/innobase/fil/fil0crypt.cc
+++ b/storage/innobase/fil/fil0crypt.cc
@@ -510,6 +510,9 @@ fil_space_write_crypt_data_low(fil_space_crypt_t *crypt_data,
mlog_write_ulint(page + offset + MAGIC_SZ + 2 + len, min_key_version,
MLOG_4BYTES, mtr);
+ DBUG_EXECUTE_IF("ib_file_crypt_redo_crash_1",
+ ut_error;);
+
byte* log_ptr = mlog_open(mtr, 11 + 12 + len);
if (log_ptr != NULL) {
log_ptr = mlog_write_initial_log_record_fast(
@@ -530,6 +533,9 @@ fil_space_write_crypt_data_low(fil_space_crypt_t *crypt_data,
mlog_catenate_string(mtr, crypt_data->iv, len);
}
+
+ DBUG_EXECUTE_IF("ib_file_crypt_redo_crash_2",
+ ut_error;);
}
/******************************************************************
diff --git a/storage/xtradb/fil/fil0crypt.cc b/storage/xtradb/fil/fil0crypt.cc
index 10d49bb3798..4a783138416 100644
--- a/storage/xtradb/fil/fil0crypt.cc
+++ b/storage/xtradb/fil/fil0crypt.cc
@@ -510,6 +510,9 @@ fil_space_write_crypt_data_low(fil_space_crypt_t *crypt_data,
mlog_write_ulint(page + offset + MAGIC_SZ + 2 + len, min_key_version,
MLOG_4BYTES, mtr);
+ DBUG_EXECUTE_IF("ib_file_crypt_redo_crash_1",
+ ut_error;);
+
byte* log_ptr = mlog_open(mtr, 11 + 12 + len);
if (log_ptr != NULL) {
log_ptr = mlog_write_initial_log_record_fast(
@@ -530,6 +533,9 @@ fil_space_write_crypt_data_low(fil_space_crypt_t *crypt_data,
mlog_catenate_string(mtr, crypt_data->iv, len);
}
+
+ DBUG_EXECUTE_IF("ib_file_crypt_redo_crash_2",
+ ut_error;);
}
/******************************************************************