1
0
mirror of https://github.com/MariaDB/server.git synced 2025-09-11 05:52:26 +03:00

MDEV-36253 Redundant check in wf_incremental_process()

- Remove the redundant check of TRX_SYS page change in
wf_incremental_process()

- Remove the double casting of srv_undo_tablespaces
in write_backup_config_file()

- Remove the unused variables like checkpoint_lsn_start
and checkpoint_no_start.

This is a regression which caused by commit 1c55b845e0.
This commit is contained in:
Thirunarayanan Balathandayuthapani
2025-03-10 11:11:50 +05:30
parent 0331f1fff7
commit 5b686cc8f9
3 changed files with 1 additions and 15 deletions

View File

@@ -1893,7 +1893,7 @@ bool write_backup_config_file(ds_ctxt *datasink)
srv_log_file_size,
srv_page_size,
srv_undo_dir,
(uint) srv_undo_tablespaces,
srv_undo_tablespaces,
page_zip_level,
innobase_buffer_pool_filename ?
"innodb_buffer_pool_filename=" : "",

View File

@@ -144,18 +144,6 @@ wf_incremental_process(xb_write_filt_ctxt_t *ctxt, ds_file_t *dstfile)
return false;
}
/* Check whether TRX_SYS page has been changed */
if (mach_read_from_4(page + FIL_PAGE_SPACE_ID)
== TRX_SYS_SPACE
&& mach_read_from_4(page + FIL_PAGE_OFFSET)
== TRX_SYS_PAGE_NO) {
msg(cursor->thread_n,
"--incremental backup is impossible if "
"the server had been restarted with "
"different innodb_undo_tablespaces.");
return false;
}
/* updated page */
if (cp->npages == page_size / 4) {
/* flush buffer */

View File

@@ -201,8 +201,6 @@ struct xb_filter_entry_t{
xb_filter_entry_t *name_hash;
};
lsn_t checkpoint_lsn_start;
lsn_t checkpoint_no_start;
/** whether log_copying_thread() is active; protected by recv_sys.mutex */
static bool log_copying_running;
/** for --backup, target LSN to copy the log to; protected by recv_sys.mutex */