mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-14508: encryption.innodb-compressed-blob failed in buildbot, assertion in btr0cur.cc line 1398

Browse source 
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.
This commit is contained in:
Jan Lindström 2018-02-09 17:17:32 +02:00
parent b75d8453d4
commit 564891c532
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
storage/innobase/buf/buf0buf.cc
View file

@ -3453,6 +3453,8 @@ evict_from_pool:
buf_block_unfix(fix_block);
buf_pool_mutex_exit(buf_pool);
rw_lock_x_unlock(&fix_block->lock);
*err = DB_PAGE_CORRUPTED;
return NULL;
}
}

2
storage/xtradb/buf/buf0buf.cc
View file

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