diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-02-09 17:17:32 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-02-09 17:17:32 +0200 |
| commit | 564891c5328c20089ba7d1ab450143a3abe3e0d9 (patch) | |
| tree | 567d2c8c0718c66095f88b709630786672395f42 /storage/xtradb | |
| parent | b75d8453d4f41ff9ba0468747585d019ad7c4d0c (diff) | |
| download | mariadb-git-564891c5328c20089ba7d1ab450143a3abe3e0d9.tar.gz | |
MDEV-14508: encryption.innodb-compressed-blob failed in buildbot, assertion in btr0cur.cc line 1398
Before that line there is call to buf_page_get_gen that could
return block = NULL when decrypting a page fails. However,
we should set error to be != DB_SUCCESS also. In error log
there was error about decompression but in that code there
is one case where error is not set correctly.
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/buf/buf0buf.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/xtradb/buf/buf0buf.cc b/storage/xtradb/buf/buf0buf.cc index 80ff1c14a64..83e38fbcc98 100644 --- a/storage/xtradb/buf/buf0buf.cc +++ b/storage/xtradb/buf/buf0buf.cc @@ -3369,6 +3369,8 @@ evict_from_pool: mutex_enter(&buf_pool->LRU_list_mutex); buf_block_unfix(fix_block); mutex_exit(&buf_pool->LRU_list_mutex); + + *err = DB_PAGE_CORRUPTED; return NULL; } } |