mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 11:27:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.4 into 10.5

Browse source
This commit is contained in:
Marko Mäkelä 2021-06-09 14:29:58 +03:00
commit b25d2a4578
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/innobase/dict/dict0dict.cc
View file

@ -4256,7 +4256,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;
}

7
storage/innobase/handler/ha_innodb.cc
View file

@ -14833,10 +14833,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;