diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-16 18:11:37 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-16 18:11:37 +0200 |
| commit | acf46b7b36a794cd66033e61e064f16896cf7d22 (patch) | |
| tree | c648d7f39b367d7825ea7169cee7bf54d2be1f86 /storage/innobase/srv/srv0start.cc | |
| parent | e97560eac0321d43e98033f00fb0bd4f008bc9e9 (diff) | |
| parent | a55b951e6082a4ce9a1f2ed5ee176ea7dbbaf1f2 (diff) | |
| download | mariadb-git-acf46b7b36a794cd66033e61e064f16896cf7d22.tar.gz | |
Merge 10.6 into 10.8
Diffstat (limited to 'storage/innobase/srv/srv0start.cc')
| -rw-r--r-- | storage/innobase/srv/srv0start.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index 3684866770b..ac70a52cb3b 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -454,7 +454,8 @@ err_exit: fil_set_max_space_id_if_bigger(space_id); fil_space_t *space= fil_space_t::create(space_id, fsp_flags, - FIL_TYPE_TABLESPACE, NULL); + FIL_TYPE_TABLESPACE, nullptr, + FIL_ENCRYPTION_DEFAULT, true); ut_a(fil_validate()); ut_a(space); @@ -800,9 +801,7 @@ static lsn_t srv_prepare_to_delete_redo_log_file() { DBUG_ENTER("srv_prepare_to_delete_redo_log_file"); - /* Disable checkpoints in the page cleaner. */ - ut_ad(!recv_sys.recovery_on); - recv_sys.recovery_on= true; + ut_ad(recv_sys.recovery_on); /* Clean the buffer pool. */ buf_flush_sync(); @@ -1342,8 +1341,6 @@ dberr_t srv_start(bool create_new_db) } } - recv_sys.debug_free(); - if (srv_operation != SRV_OPERATION_NORMAL) { ut_ad(srv_operation == SRV_OPERATION_RESTORE_EXPORT || srv_operation == SRV_OPERATION_RESTORE); @@ -1395,6 +1392,8 @@ dberr_t srv_start(bool create_new_db) return(srv_init_abort(err)); } } + + recv_sys.debug_free(); } ut_ad(err == DB_SUCCESS); @@ -1715,12 +1714,12 @@ void innodb_shutdown() ut_ad(dict_sys.is_initialised() || !srv_was_started); ut_ad(trx_sys.is_initialised() || !srv_was_started); - ut_ad(buf_dblwr.is_initialised() || !srv_was_started + ut_ad(buf_dblwr.is_created() || !srv_was_started || srv_read_only_mode || srv_force_recovery >= SRV_FORCE_NO_TRX_UNDO); ut_ad(lock_sys.is_initialised() || !srv_was_started); ut_ad(log_sys.is_initialised() || !srv_was_started); - ut_ad(ibuf.index || !srv_was_started + ut_ad(ibuf.index || !innodb_change_buffering || !srv_was_started || srv_force_recovery >= SRV_FORCE_NO_DDL_UNDO); dict_stats_deinit(); |