Type:
Bug
Priority:
Major
Resolution:
Unresolved
Affects Version/s:
None
When renaming file prefixes from xtrabackup_.. to mariadb_backup_... the xtrabackup_binlog_pos_innodb file was left out, probably as this name is hardcoded in xtrabackup.cc while the other names are defined as constants in backup_copy.h
Proposed patch:
diff --git a/extra/mariabackup/backup_copy.h b/extra/mariabackup/backup_copy.h
index 869bfff19a3..160e0569776 100644
--- a/extra/mariabackup/backup_copy.h
+++ b/extra/mariabackup/backup_copy.h
@@ -14,6 +14,7 @@
#define XTRABACKUP_BINLOG_INFO "xtrabackup_binlog_info"
#define XTRABACKUP_INFO "xtrabackup_info"
#define XTRABACKUP_METADATA_FILENAME "xtrabackup_checkpoints"
+#define XTRABACKUP_BINLOG_POS_INNODB "xtrabackup_binlog_pos_innodb"
/* special files */
#define MB_SLAVE_INFO "mariadb_backup_slave_info"
@@ -21,6 +22,7 @@
#define MB_BINLOG_INFO "mariadb_backup_binlog_info"
#define MB_INFO "mariadb_backup_info"
#define MB_METADATA_FILENAME "mariadb_backup_checkpoints"
+#define MB_BINLOG_POS_INNODB "mariadb_backup_binlog_pos_innodb"
extern bool binlog_locked;
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 543052f0e49..397c41c0c7f 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -6903,13 +6903,13 @@ static bool xtrabackup_prepare_func(char** argv)
trx_sys.recovered_binlog_filename,
longlong(trx_sys.recovered_binlog_offset));
- /* output to xtrabackup_binlog_pos_innodb and (if
+ /* output to mariadb_ackup_binlog_pos_innodb and (if
backup_safe_binlog_info was available on the server) to
- xtrabackup_binlog_info. In the latter case
- xtrabackup_binlog_pos_innodb becomes redundant and is created
+ mariadb_backup_binlog_info. In the latter case
+ mariadb_backup_binlog_pos_innodb becomes redundant and is created
only for compatibility. */
ok = store_binlog_info(
- "xtrabackup_binlog_pos_innodb",
+ MB_BINLOG_POS_INNODB,
trx_sys.recovered_binlog_filename,
trx_sys.recovered_binlog_offset)
&& (!recover_binlog_info || store_binlog_info(
is caused by
MDEV-18931
Rename Mariabackup's xtrabackup_* files to mariadb_backup_*
Closed
JiraAutomate
made changes -
2025-03-11 06:35
Fix Version/s
10.5
[ 23123
]
Fix Version/s
10.6
[ 24028
]
Julien Fritsch
made changes -
2025-03-11 06:54
Fix Version/s
11.4
[ 29301
]
Fix Version/s
10.5
[ 23123
]
Fix Version/s
10.6
[ 24028
]
Julien Fritsch
made changes -
2025-03-13 07:43
Assignee
Marko Mäkelä
[ marko
]
Julien Fritsch
made changes -
2025-03-13 07:43
Status
Open
[ 1
]
Confirmed
[ 10101
]
{"report":{"fcp":853.3999996185303,"ttfb":291.69999980926514,"pageVisibility":"visible","entityId":133249,"key":"jira.project.issue.view-issue","isInitial":true,"threshold":1000,"elementTimings":{},"userDeviceMemory":8,"userDeviceProcessors":64,"apdex":1,"journeyId":"7134b6f9-0f6f-469e-9388-8b483c34b312","navigationType":0,"readyForUser":931.8999996185303,"redirectCount":0,"resourceLoadedEnd":999.0999994277954,"resourceLoadedStart":296.79999923706055,"resourceTiming":[{"duration":28.90000057220459,"initiatorType":"link","name":"https://jira.mariadb.org/s/2c21342762a6a02add1c328bed317ffd-CDN/lu2bv2/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/css/_super/batch.css","startTime":296.79999923706055,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":296.79999923706055,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":325.69999980926514,"responseStart":0,"secureConnectionStart":0},{"duration":29.100000381469727,"initiatorType":"link","name":"https://jira.mariadb.org/s/7ebd35e77e471bc30ff0eba799ebc151-CDN/lu2bv2/820016/12ta74/2380add21a9a1006587582385952de73/_/download/contextbatch/css/jira.browse.project,project.issue.navigator,jira.view.issue,jira.general,jira.global,atl.general,-_super/batch.css?agile_global_admin_condition=true&jag=true&jira.create.linked.issue=true&slack-enabled=true","startTime":297.0999994277954,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":297.0999994277954,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":326.19999980926514,"responseStart":0,"secureConnectionStart":0},{"duration":85.40000057220459,"initiatorType":"script","name":"https://jira.mariadb.org/s/e9b27a47da5fb0f74a35acd57e9847fb-CDN/lu2bv2/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/js/_super/batch.js?locale=en","startTime":297.29999923706055,"connectEnd":297.29999923706055,"connectStart":297.29999923706055,"domainLookupEnd":297.29999923706055,"domainLookupStart":297.29999923706055,"fetchStart":297.29999923706055,"redirectEnd":0,"redirectStart":0,"requestStart":297.29999923706055,"responseEnd":382.69999980926514,"responseStart":382.69999980926514,"secureConnectionStart":297.29999923706055},{"duration":147.10000038146973,"initiatorType":"script","name":"https://jira.mariadb.org/s/c32eb0da7ad9831253f8397e6cc26afd-CDN/lu2bv2/820016/12ta74/2380add21a9a1006587582385952de73/_/download/contextbatch/js/jira.browse.project,project.issue.navigator,jira.view.issue,jira.general,jira.global,atl.general,-_super/batch.js?agile_global_admin_condition=true&jag=true&jira.create.linked.issue=true&locale=en&slack-enabled=true","startTime":297.3999996185303,"connectEnd":297.3999996185303,"connectStart":297.3999996185303,"domainLookupEnd":297.3999996185303,"domainLookupStart":297.3999996185303,"fetchStart":297.3999996185303,"redirectEnd":0,"redirectStart":0,"requestStart":297.3999996185303,"responseEnd":444.5,"responseStart":444.5,"secureConnectionStart":297.3999996185303},{"duration":150.5,"initiatorType":"script","name":"https://jira.mariadb.org/s/bc0bcb146314416123c992714ee00ff7-CDN/lu2bv2/820016/12ta74/c92c0caa9a024ae85b0ebdbed7fb4bd7/_/download/contextbatch/js/atl.global,-_super/batch.js?locale=en","startTime":297.5999994277954,"connectEnd":297.5999994277954,"connectStart":297.5999994277954,"domainLookupEnd":297.5999994277954,"domainLookupStart":297.5999994277954,"fetchStart":297.5999994277954,"redirectEnd":0,"redirectStart":0,"requestStart":297.5999994277954,"responseEnd":448.0999994277954,"responseStart":448.0999994277954,"secureConnectionStart":297.5999994277954},{"duration":150.80000019073486,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bv2/820016/12ta74/1.0/_/download/batch/jira.webresources:calendar-en/jira.webresources:calendar-en.js","startTime":297.79999923706055,"connectEnd":297.79999923706055,"connectStart":297.79999923706055,"domainLookupEnd":297.79999923706055,"domainLookupStart":297.79999923706055,"fetchStart":297.79999923706055,"redirectEnd":0,"redirectStart":0,"requestStart":297.79999923706055,"responseEnd":448.5999994277954,"responseStart":448.5999994277954,"secureConnectionStart":297.79999923706055},{"duration":151.0999994277954,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bv2/820016/12ta74/1.0/_/download/batch/jira.webresources:calendar-localisation-moment/jira.webresources:calendar-localisation-moment.js","startTime":298,"connectEnd":298,"connectStart":298,"domainLookupEnd":298,"domainLookupStart":298,"fetchStart":298,"redirectEnd":0,"redirectStart":0,"requestStart":298,"responseEnd":449.0999994277954,"responseStart":449.0999994277954,"secureConnectionStart":298},{"duration":229.4000005722046,"initiatorType":"link","name":"https://jira.mariadb.org/s/b04b06a02d1959df322d9cded3aeecc1-CDN/lu2bv2/820016/12ta74/a2ff6aa845ffc9a1d22fe23d9ee791fc/_/download/contextbatch/css/jira.global.look-and-feel,-_super/batch.css","startTime":298.0999994277954,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":298.0999994277954,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":527.5,"responseStart":0,"secureConnectionStart":0},{"duration":151.4000005722046,"initiatorType":"script","name":"https://jira.mariadb.org/rest/api/1.0/shortcuts/820016/47140b6e0a9bc2e4913da06536125810/shortcuts.js?context=issuenavigation&context=issueaction","startTime":298.29999923706055,"connectEnd":298.29999923706055,"connectStart":298.29999923706055,"domainLookupEnd":298.29999923706055,"domainLookupStart":298.29999923706055,"fetchStart":298.29999923706055,"redirectEnd":0,"redirectStart":0,"requestStart":298.29999923706055,"responseEnd":449.69999980926514,"responseStart":449.69999980926514,"secureConnectionStart":298.29999923706055},{"duration":229.0999994277954,"initiatorType":"link","name":"https://jira.mariadb.org/s/3ac36323ba5e4eb0af2aa7ac7211b4bb-CDN/lu2bv2/820016/12ta74/d176f0986478cc64f24226b3d20c140d/_/download/contextbatch/css/com.atlassian.jira.projects.sidebar.init,-_super,-project.issue.navigator,-jira.view.issue/batch.css?jira.create.linked.issue=true","startTime":298.5,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":298.5,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":527.5999994277954,"responseStart":0,"secureConnectionStart":0},{"duration":151.69999980926514,"initiatorType":"script","name":"https://jira.mariadb.org/s/719848dd97ebe0663199f49a3936487a-CDN/lu2bv2/820016/12ta74/d176f0986478cc64f24226b3d20c140d/_/download/contextbatch/js/com.atlassian.jira.projects.sidebar.init,-_super,-project.issue.navigator,-jira.view.issue/batch.js?jira.create.linked.issue=true&locale=en","startTime":298.69999980926514,"connectEnd":298.69999980926514,"connectStart":298.69999980926514,"domainLookupEnd":298.69999980926514,"domainLookupStart":298.69999980926514,"fetchStart":298.69999980926514,"redirectEnd":0,"redirectStart":0,"requestStart":298.69999980926514,"responseEnd":450.3999996185303,"responseStart":450.3999996185303,"secureConnectionStart":298.69999980926514},{"duration":692.3999996185303,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bv2/820016/12ta74/1.0/_/download/batch/jira.webresources:bigpipe-js/jira.webresources:bigpipe-js.js","startTime":304.5,"connectEnd":304.5,"connectStart":304.5,"domainLookupEnd":304.5,"domainLookupStart":304.5,"fetchStart":304.5,"redirectEnd":0,"redirectStart":0,"requestStart":304.5,"responseEnd":996.8999996185303,"responseStart":996.8999996185303,"secureConnectionStart":304.5},{"duration":693.1999998092651,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bv2/820016/12ta74/1.0/_/download/batch/jira.webresources:bigpipe-init/jira.webresources:bigpipe-init.js","startTime":305.8999996185303,"connectEnd":305.8999996185303,"connectStart":305.8999996185303,"domainLookupEnd":305.8999996185303,"domainLookupStart":305.8999996185303,"fetchStart":305.8999996185303,"redirectEnd":0,"redirectStart":0,"requestStart":305.8999996185303,"responseEnd":999.0999994277954,"responseStart":999.0999994277954,"secureConnectionStart":305.8999996185303},{"duration":458.19999980926514,"initiatorType":"xmlhttprequest","name":"https://jira.mariadb.org/rest/webResources/1.0/resources","startTime":539,"connectEnd":539,"connectStart":539,"domainLookupEnd":539,"domainLookupStart":539,"fetchStart":539,"redirectEnd":0,"redirectStart":0,"requestStart":539,"responseEnd":997.1999998092651,"responseStart":997.1999998092651,"secureConnectionStart":539},{"duration":155.19999980926514,"initiatorType":"script","name":"https://www.google-analytics.com/analytics.js","startTime":847.5999994277954,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":847.5999994277954,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":1002.7999992370605,"responseStart":0,"secureConnectionStart":0}],"fetchStart":0,"domainLookupStart":0,"domainLookupEnd":0,"connectStart":0,"connectEnd":0,"requestStart":110,"responseStart":292,"responseEnd":306,"domLoading":295,"domInteractive":1063,"domContentLoadedEventStart":1063,"domContentLoadedEventEnd":1110,"domComplete":1487,"loadEventStart":1487,"loadEventEnd":1487,"userAgent":"Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +claudebot@anthropic.com)","marks":[{"name":"bigPipe.sidebar-id.start","time":1043},{"name":"bigPipe.sidebar-id.end","time":1043.8999996185303},{"name":"bigPipe.activity-panel-pipe-id.start","time":1044},{"name":"bigPipe.activity-panel-pipe-id.end","time":1046.0999994277954},{"name":"activityTabFullyLoaded","time":1127.6999998092651}],"measures":[],"correlationId":"9a1873a41e6400","effectiveType":"4g","downlink":10,"rtt":0,"serverDuration":118,"dbReadsTimeInMs":18,"dbConnsTimeInMs":26,"applicationHash":"9d11dbea5f4be3d4cc21f03a88dd11d8c8687422","experiments":[]}}