diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-10-01 13:50:11 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-10-01 13:50:11 +0300 |
| commit | 3a7cee05d6bac27c3c2f51afb8986c1581649bbc (patch) | |
| tree | 63ddd3d993b5422d47b7bebc12a326db11b289ca | |
| parent | e1cbca185139eed0ba3cf47807967b25f5a76ea1 (diff) | |
| download | mariadb-git-3a7cee05d6bac27c3c2f51afb8986c1581649bbc.tar.gz | |
MDEV-8523: InnoDB: Assertion failure in file buf0buf.cc line 5963 (Failing assertion: key_version == 0 || key_version >= bpage->key_version)
| -rw-r--r-- | storage/innobase/buf/buf0buf.cc | 3 | ||||
| -rw-r--r-- | storage/xtradb/buf/buf0buf.cc | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index 0ba3593b944..4187640fc42 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -6026,8 +6026,7 @@ buf_page_encrypt_before_write( zip_size, dst_frame); - unsigned key_version = - mach_read_from_4(dst_frame + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION); + ulint key_version = mach_read_from_4(dst_frame + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION); ut_ad(key_version == 0 || key_version >= bpage->key_version); bpage->key_version = key_version; bpage->real_size = page_size; diff --git a/storage/xtradb/buf/buf0buf.cc b/storage/xtradb/buf/buf0buf.cc index 2476c8a31f9..ef9a791d631 100644 --- a/storage/xtradb/buf/buf0buf.cc +++ b/storage/xtradb/buf/buf0buf.cc @@ -6206,8 +6206,7 @@ buf_page_encrypt_before_write( zip_size, dst_frame); - unsigned key_version = - mach_read_from_4(dst_frame + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION); + ulint key_version = mach_read_from_4(dst_frame + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION); ut_ad(key_version == 0 || key_version >= bpage->key_version); bpage->key_version = key_version; bpage->real_size = page_size; |