Details
-
Bug
-
Status: Confirmed (View Workflow)
-
Major
-
Resolution: Unresolved
-
None
-
None
Description
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(
|
|
Attachments
Issue Links
- is caused by
-
MDEV-18931 Rename Mariabackup's xtrabackup_* files to mariadb_backup_*
-
- Closed
-
Activity
| Field | Original Value | New Value |
|---|---|---|
| Link |
This issue is caused by |
| Fix Version/s | 10.5 [ 23123 ] | |
| Fix Version/s | 10.6 [ 24028 ] |
| Fix Version/s | 11.4 [ 29301 ] | |
| Fix Version/s | 10.5 [ 23123 ] | |
| Fix Version/s | 10.6 [ 24028 ] |
| Assignee | Marko Mäkelä [ marko ] |
| Status | Open [ 1 ] | Confirmed [ 10101 ] |
| Assignee | Marko Mäkelä [ marko ] | Ralf Gebhardt [ ralf.gebhardt@mariadb.com ] |
| Component/s | Backup [ 13902 ] |
Is it acceptable to change the data storage format within a generally available (GA) release series? It would seem to make it harder to downgrade mariadb-backup within a release series.