diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-09-14 14:11:23 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-09-14 14:11:23 +0300 |
| commit | 4d3f680c957b3e55fb65d207fd1362271d8f8068 (patch) | |
| tree | 7fa37c440406840bd94526be835b7a22bdd418cd /storage/xtradb/include/fil0crypt.h | |
| parent | ddaddf1019f07f00ba419988f69f8cb9ebd3e169 (diff) | |
| download | mariadb-git-4d3f680c957b3e55fb65d207fd1362271d8f8068.tar.gz | |
MDEV-8772: Assertion failure in file ha_innodb.cc line 20027 when importing page compressed and encrypted tablespace using incorrect keys
Add error handling to decryp function when decrypt fails during
import.
Diffstat (limited to 'storage/xtradb/include/fil0crypt.h')
| -rw-r--r-- | storage/xtradb/include/fil0crypt.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/xtradb/include/fil0crypt.h b/storage/xtradb/include/fil0crypt.h index 68feca69227..760dec98869 100644 --- a/storage/xtradb/include/fil0crypt.h +++ b/storage/xtradb/include/fil0crypt.h @@ -211,7 +211,10 @@ fil_space_decrypt( fil_space_crypt_t* crypt_data, /*!< in: crypt data */ byte* tmp_frame, /*!< in: temporary buffer */ ulint page_size, /*!< in: page size */ - byte* src_frame); /*!< in:out: page buffer */ + byte* src_frame, /*!< in:out: page buffer */ + dberr_t* err); /*!< in: out: DB_SUCCESS or + error code */ + /********************************************************************* Encrypt buffer page |