Merge branch '10.0-galera' into 10.1

This commit is contained in:
Sergei Golubchik 2016-11-02 13:44:07 +01:00
commit a98c85bb50
162 changed files with 5627 additions and 860 deletions

View file

@ -4906,7 +4906,9 @@ database_corrupted:
recv_recover_page(TRUE, (buf_block_t*) bpage);
}
if (uncompressed && !recv_no_ibuf_operations) {
if (uncompressed && !recv_no_ibuf_operations
&& fil_page_get_type(frame) == FIL_PAGE_INDEX
&& page_is_leaf(frame)) {
buf_block_t* block;
ibool update_ibuf_bitmap;