1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 10.3 to 10.4

Browse Source
This commit is contained in:
Marko Mäkelä 2021-06-09 14:28:57 +03:00
commit c7ee039d36
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5239,7 +5239,7 @@ dict_set_corrupted(
/* If this is read only mode, do not update SYS_INDEXES, just /* If this is read only mode, do not update SYS_INDEXES, just
mark it as corrupted in memory */ mark it as corrupted in memory */
if (srv_read_only_mode) { if (high_level_read_only) {
index->type |= DICT_CORRUPT; index->type |= DICT_CORRUPT;
goto func_exit; goto func_exit;
} }

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

@ -14816,10 +14816,9 @@ ha_innobase::check(
/* We must run the index record counts at an isolation level /* We must run the index record counts at an isolation level
>= READ COMMITTED, because a dirty read can see a wrong number >= READ COMMITTED, because a dirty read can see a wrong number
of records in some index; to play safe, we use always of records in some index; to play safe, we normally use
REPEATABLE READ here (except when undo logs are unavailable) */ REPEATABLE READ here */
m_prebuilt->trx->isolation_level = srv_force_recovery m_prebuilt->trx->isolation_level = high_level_read_only
>= SRV_FORCE_NO_UNDO_LOG_SCAN
? TRX_ISO_READ_UNCOMMITTED ? TRX_ISO_READ_UNCOMMITTED
: TRX_ISO_REPEATABLE_READ; : TRX_ISO_REPEATABLE_READ;