diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-05 20:36:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-05 20:36:43 +0300 |
| commit | 6877ef9a7c9c7ee55d67e4baaf4e8f7b874c9f89 (patch) | |
| tree | ade4c0b2e50538438e70dc49581541de94098625 /storage/innobase/dict/dict0load.cc | |
| parent | 374f94c5a749ec6af83824c1f55f0f49029a9714 (diff) | |
| parent | 68d9d512e933a1d40670add50f205e5266bc5507 (diff) | |
| download | mariadb-git-6877ef9a7c9c7ee55d67e4baaf4e8f7b874c9f89.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/dict/dict0load.cc')
| -rw-r--r-- | storage/innobase/dict/dict0load.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc index 7f933cde0f6..c837c6a9d9a 100644 --- a/storage/innobase/dict/dict0load.cc +++ b/storage/innobase/dict/dict0load.cc @@ -899,7 +899,7 @@ dict_update_filepath( trx->dict_operation_lock_mode = 0; trx_free(trx); - if (err == DB_SUCCESS) { + if (UNIV_LIKELY(err == DB_SUCCESS)) { /* We just updated SYS_DATAFILES due to the contents in a link file. Make a note that we did this. */ ib::info() << "The InnoDB data dictionary table SYS_DATAFILES" @@ -909,7 +909,7 @@ dict_update_filepath( ib::warn() << "Error occurred while updating InnoDB data" " dictionary table SYS_DATAFILES for tablespace ID " << space_id << " to file " << filepath << ": " - << ut_strerr(err) << "."; + << err << "."; } return(err); @@ -1354,6 +1354,7 @@ static ulint dict_check_sys_tables() for (rec = dict_startscan_system(&pcur, &mtr, SYS_TABLES); rec != NULL; + mtr.commit(), mtr.start(), rec = dict_getnext_system(&pcur, &mtr)) { const byte* field; ulint len; |