diff options
| author | Monty <monty@mariadb.org> | 2016-04-28 16:59:33 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-04-28 16:59:33 +0300 |
| commit | 9c846373f02d6431d83add639e7560a69ba885a2 (patch) | |
| tree | 101d110d3ec9a4796b4050779fb052120fd6d516 /storage/xtradb/log/log0recv.cc | |
| parent | fabeab781920dfcaf8e606708ba2c6812f6ae5d8 (diff) | |
| parent | d5822a3ad0657040114cdc185c6387b9eb3a12b2 (diff) | |
| download | mariadb-git-9c846373f02d6431d83add639e7560a69ba885a2.tar.gz | |
Merge commit 'd5822a3ad0657040114cdc185c6387b9eb3a12b2' into 10.2
Diffstat (limited to 'storage/xtradb/log/log0recv.cc')
| -rw-r--r-- | storage/xtradb/log/log0recv.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/xtradb/log/log0recv.cc b/storage/xtradb/log/log0recv.cc index f98adbbca08..23ca8b1381f 100644 --- a/storage/xtradb/log/log0recv.cc +++ b/storage/xtradb/log/log0recv.cc @@ -2786,6 +2786,8 @@ recv_scan_log_recs( /* Garbage or an incompletely written log block */ + /* Print checkpoint encryption keys if present */ + log_crypt_print_checkpoint_keys(log_block); finished = TRUE; if (maybe_encrypted) { |