diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-05 16:51:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-05 16:51:26 +0300 |
| commit | 680463a8d991389f4ea5942e87764137c55c0eb4 (patch) | |
| tree | 427f8946aa9085c7f6346e1047144995cb7c459e /storage/innobase/dict/dict0load.cc | |
| parent | 05693cf2149f8792863a32325090e789015286fc (diff) | |
| parent | efc70da5fd0459ff44153529d13651741cc32bc4 (diff) | |
| download | mariadb-git-680463a8d991389f4ea5942e87764137c55c0eb4.tar.gz | |
Merge 10.2 into 10.3
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 d901d5f7f4c..0c5343205a7 100644 --- a/storage/innobase/dict/dict0load.cc +++ b/storage/innobase/dict/dict0load.cc @@ -904,7 +904,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" @@ -914,7 +914,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); @@ -1361,6 +1361,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; |