diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-09 14:28:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-09 14:28:57 +0300 |
| commit | c7ee039d36f69f24fb3b1c422fcff8dbf974e3eb (patch) | |
| tree | 36c3ad4dedbecfa147fdeab0df62c261a44c3a75 | |
| parent | b8d38c5e39d526e006f4e8e8977ac4c6166bc4c6 (diff) | |
| parent | 75a65d3201a4486af96cf3277b6c5a4ba460eef7 (diff) | |
| download | mariadb-git-c7ee039d36f69f24fb3b1c422fcff8dbf974e3eb.tar.gz | |
Merge 10.3 to 10.4mariadb-10.4.20
| -rw-r--r-- | storage/innobase/dict/dict0dict.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc index 1ffeb8d1e16..cf094891eba 100644 --- a/storage/innobase/dict/dict0dict.cc +++ b/storage/innobase/dict/dict0dict.cc @@ -5239,7 +5239,7 @@ dict_set_corrupted( /* If this is read only mode, do not update SYS_INDEXES, just mark it as corrupted in memory */ - if (srv_read_only_mode) { + if (high_level_read_only) { index->type |= DICT_CORRUPT; goto func_exit; } diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index dacb1eb98b4..ce2e4b6990f 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -14816,10 +14816,9 @@ ha_innobase::check( /* We must run the index record counts at an isolation level >= READ COMMITTED, because a dirty read can see a wrong number - of records in some index; to play safe, we use always - REPEATABLE READ here (except when undo logs are unavailable) */ - m_prebuilt->trx->isolation_level = srv_force_recovery - >= SRV_FORCE_NO_UNDO_LOG_SCAN + of records in some index; to play safe, we normally use + REPEATABLE READ here */ + m_prebuilt->trx->isolation_level = high_level_read_only ? TRX_ISO_READ_UNCOMMITTED : TRX_ISO_REPEATABLE_READ; |