diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-09 16:50:58 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-09 16:50:58 +0300 |
| commit | 65f1a42788549a18311cc631fcee582c1c67dc08 (patch) | |
| tree | ccccf7564e0626895d46f55fc843d8eecb13c770 /storage/innobase/dict/dict0dict.cc | |
| parent | 29e8c154172bd6b9dccd9757fddace93be6ad194 (diff) | |
| parent | b25d2a457859b343e98b1a8c43613ad33eeff01d (diff) | |
| download | mariadb-git-65f1a42788549a18311cc631fcee582c1c67dc08.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'storage/innobase/dict/dict0dict.cc')
| -rw-r--r-- | storage/innobase/dict/dict0dict.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc index 74f7af216e3..a1d68ecbc3e 100644 --- a/storage/innobase/dict/dict0dict.cc +++ b/storage/innobase/dict/dict0dict.cc @@ -2504,8 +2504,8 @@ dict_index_build_internal_clust( ulint i; ibool* indexed; - ut_ad(dict_index_is_clust(index)); - ut_ad(!dict_index_is_ibuf(index)); + ut_ad(index->is_primary()); + ut_ad(!index->has_virtual()); dict_sys.assert_locked(); @@ -4234,7 +4234,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; } |