diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-12-03 17:01:48 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-12-03 17:01:48 +0200 |
| commit | fa1325512b002f4f517dacd851fea998a7af498c (patch) | |
| tree | fec06832bfc34df3010b75a2c033024d84a51f58 | |
| parent | 5d7da02793b514644574b35eff8aa480d98b6a5d (diff) | |
| download | mariadb-git-fa1325512b002f4f517dacd851fea998a7af498c.tar.gz | |
Correct some comments
In commit aae3f921adec9b9d1bff093c9a75a94e44f5c8d4
recv_apply_hashed_log_recs() was replaced by recv_sys_t::apply().
| -rw-r--r-- | storage/innobase/include/log0recv.h | 6 | ||||
| -rw-r--r-- | storage/innobase/srv/srv0start.cc | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/storage/innobase/include/log0recv.h b/storage/innobase/include/log0recv.h index f822a874565..fcc7e989885 100644 --- a/storage/innobase/include/log0recv.h +++ b/storage/innobase/include/log0recv.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2020, MariaDB Corporation. +Copyright (c) 2017, 2021, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -214,8 +214,8 @@ struct recv_sys_t /** whether recv_recover_page(), invoked from buf_page_read_complete(), should apply log records*/ bool apply_log_recs; - /** whether recv_apply_hashed_log_recs() is running */ - bool apply_batch_on; + /** whether apply() is running */ + bool apply_batch_on; byte* buf; /*!< buffer for parsing log records */ ulint len; /*!< amount of data in buf */ lsn_t parse_start_lsn; diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index aa6e7ce11f9..f545b482220 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -1474,8 +1474,7 @@ file_checked: } /* fall through */ case SRV_OPERATION_RESTORE: - /* This must precede - recv_apply_hashed_log_recs(true). */ + /* This must precede recv_sys.apply(true). */ srv_undo_tablespaces_active = trx_rseg_get_n_undo_tablespaces(); err = srv_validate_undo_tablespaces(); |