diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-02-13 19:13:45 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-02-13 19:13:45 +0200 |
| commit | f8a9f906679e1d1ab026c245f7d24c652050d8b3 (patch) | |
| tree | cb6f6eb922e7af2a139fca3cd8f5292375179c7c /storage/innobase/include/rem0types.h | |
| parent | 7ae21b18a6b73bbc3bf1ff448faf60c29ac1d386 (diff) | |
| download | mariadb-git-f8a9f906679e1d1ab026c245f7d24c652050d8b3.tar.gz | |
MDEV-12353: Remove support for crash-upgradebb-10.5-MDEV-12353
We tighten some assertions regarding dict_index_t::is_dummy
and crash recovery, now that redo log processing will
no longer create dummy objects.
Diffstat (limited to 'storage/innobase/include/rem0types.h')
| -rw-r--r-- | storage/innobase/include/rem0types.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/storage/innobase/include/rem0types.h b/storage/innobase/include/rem0types.h index 754781d62d1..5a9f5945d6a 100644 --- a/storage/innobase/include/rem0types.h +++ b/storage/innobase/include/rem0types.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2015, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2019, MariaDB Corporation. +Copyright (c) 2019, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -40,11 +40,12 @@ typedef unsigned short int offset_t; /* Maximum number of user defined fields/columns. The reserved columns are the ones InnoDB adds internally: DB_ROW_ID, DB_TRX_ID, DB_ROLL_PTR. -We need "* 2" because mlog_parse_index() creates a dummy table object -possibly, with some of the system columns in it, and then adds the 3 -system columns (again) using dict_table_add_system_columns(). The problem -is that mlog_parse_index() cannot recognize the system columns by -just having n_fields, n_uniq and the lengths of the columns. */ +Before MariaDB Server 10.5, we needed "* 2" because mlog_parse_index() +created a dummy table object possibly, with some of the system columns +in it, and then adds the 3 system columns (again) using +dict_table_add_system_columns(). +For now, we will keep this limitation to maintain file format compatibility +with older versions. */ #define REC_MAX_N_USER_FIELDS (REC_MAX_N_FIELDS - DATA_N_SYS_COLS * 2) /* REC_ANTELOPE_MAX_INDEX_COL_LEN is measured in bytes and is the maximum |