diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-11 19:44:41 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-11 19:44:41 +0200 |
| commit | 6dd302d164d13d6c4793af9f03412ee092652226 (patch) | |
| tree | 40a566b6c1971bbf8bbf9d4e36c42f17dad84ef3 /storage/innobase/log | |
| parent | 0ca2ea1a6550bb718efc878ed451be69e8244cd4 (diff) | |
| parent | cca611d1c083286396e34d8fc242bbeb90f01d2a (diff) | |
| download | mariadb-git-6dd302d164d13d6c4793af9f03412ee092652226.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'storage/innobase/log')
| -rw-r--r-- | storage/innobase/log/log0recv.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc index 92373afbeff..cacf823f596 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -842,7 +842,7 @@ recv_find_max_checkpoint_0(log_group_t** max_group, ulint* max_field) " This redo log was created before MariaDB 10.2.2," " and we did not find a valid checkpoint." " Please follow the instructions at" - " " REFMAN "upgrading.html"; + " https://mariadb.com/kb/en/library/upgrading/"; return(DB_ERROR); } @@ -1159,6 +1159,8 @@ parse_log: redo log been written with something older than InnoDB Plugin 1.0.4. */ ut_ad(0 + /* fil_crypt_rotate_page() writes this */ + || offs == FIL_PAGE_SPACE_ID || offs == IBUF_TREE_SEG_HEADER + IBUF_HEADER + FSEG_HDR_SPACE || offs == IBUF_TREE_SEG_HEADER |