From d64ade302eb322b9690e7c24ae7237fab782fb7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Sat, 7 Oct 2023 21:17:09 -0700 Subject: [PATCH] Properly introduce wsrep_sst_backup script in project packaging The script wsrep_sst_backup was introduced on MariaDB 10.3 in commit 9b2fa2a. The new script was automatically included in RPM packages but not in Debian packages (which started to fail on warning about stray file). Include wsrep_sst_backup in the mariadb-server-10.5+ package, and also include a stub man page so that packaging of a new script is complete. Related: https://galeracluster.com/documentation/html_docs_20210213-1355-master/documentation/backup-cluster.html This commit was originally submitted in May 2022 in https://github.com/MariaDB/server/pull/2129 but upstream indicated only in May 2023 that it might get merged, thus this is for a later release. All new code of the whole pull request, including one or several files that are either new files or modified ones, are contributed under the BSD-new license. I am contributing on behalf of my employer Amazon Web Services, Inc. --- debian/mariadb-server-10.5.install | 1 + man/CMakeLists.txt | 3 ++- man/wsrep_sst_backup.1 | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 man/wsrep_sst_backup.1 diff --git a/debian/mariadb-server-10.5.install b/debian/mariadb-server-10.5.install index 874e2ff19bf..42f0d85a781 100644 --- a/debian/mariadb-server-10.5.install +++ b/debian/mariadb-server-10.5.install @@ -100,6 +100,7 @@ usr/share/man/man1/mysqlhotcopy.1 usr/share/man/man1/perror.1 usr/share/man/man1/replace.1 usr/share/man/man1/resolve_stack_dump.1 +usr/share/man/man1/wsrep_sst_backup.1 usr/share/man/man1/wsrep_sst_common.1 usr/share/man/man1/wsrep_sst_mariabackup.1 usr/share/man/man1/wsrep_sst_mysqldump.1 diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index 975bfd5e887..94829d332e7 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -14,7 +14,8 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA SET(MAN1_WSREP wsrep_sst_rsync.1 wsrep_sst_common.1 wsrep_sst_mariabackup.1 - wsrep_sst_mysqldump.1 wsrep_sst_rsync_wan.1 galera_recovery.1 galera_new_cluster.1) + wsrep_sst_mysqldump.1 wsrep_sst_rsync_wan.1 galera_recovery.1 galera_new_cluster.1 + wsrep_sst_backup.1) SET(MAN1_SERVER innochecksum.1 myisam_ftdump.1 myisamchk.1 aria_chk.1 aria_dump_log.1 aria_ftdump.1 aria_pack.1 aria_read_log.1 aria_s3_copy.1 diff --git a/man/wsrep_sst_backup.1 b/man/wsrep_sst_backup.1 new file mode 100644 index 00000000000..d7b145575cc --- /dev/null +++ b/man/wsrep_sst_backup.1 @@ -0,0 +1,16 @@ +'\" t +.\" +.TH "\FBWSREP_SST_BACKUP\FR" "1" "22 May 2022" "MariaDB 10\&.3" "MariaDB Database System" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH NAME +wsrep_sst_backup \- backup helper script for the MariaDB Galera Cluster +.SH DESCRIPTION +Use: See source code of script\. +.PP +For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/