Skip to content

Commit 5b686cc

Browse files
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 1c55b84.
1 parent 0331f1f commit 5b686cc

File tree

3 files changed

+1
-15
lines changed

3 files changed

+1
-15
lines changed

extra/mariabackup/backup_mysql.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1893,7 +1893,7 @@ bool write_backup_config_file(ds_ctxt *datasink)
18931893
srv_log_file_size,
18941894
srv_page_size,
18951895
srv_undo_dir,
1896-
(uint) srv_undo_tablespaces,
1896+
srv_undo_tablespaces,
18971897
page_zip_level,
18981898
innobase_buffer_pool_filename ?
18991899
"innodb_buffer_pool_filename=" : "",

extra/mariabackup/write_filt.cc

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -144,18 +144,6 @@ wf_incremental_process(xb_write_filt_ctxt_t *ctxt, ds_file_t *dstfile)
144144
return false;
145145
}
146146

147-
/* Check whether TRX_SYS page has been changed */
148-
if (mach_read_from_4(page + FIL_PAGE_SPACE_ID)
149-
== TRX_SYS_SPACE
150-
&& mach_read_from_4(page + FIL_PAGE_OFFSET)
151-
== TRX_SYS_PAGE_NO) {
152-
msg(cursor->thread_n,
153-
"--incremental backup is impossible if "
154-
"the server had been restarted with "
155-
"different innodb_undo_tablespaces.");
156-
return false;
157-
}
158-
159147
/* updated page */
160148
if (cp->npages == page_size / 4) {
161149
/* flush buffer */

extra/mariabackup/xtrabackup.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,6 @@ struct xb_filter_entry_t{
201201
xb_filter_entry_t *name_hash;
202202
};
203203

204-
lsn_t checkpoint_lsn_start;
205-
lsn_t checkpoint_no_start;
206204
/** whether log_copying_thread() is active; protected by recv_sys.mutex */
207205
static bool log_copying_running;
208206
/** for --backup, target LSN to copy the log to; protected by recv_sys.mutex */

0 commit comments

Comments
 (0)