Merge pull request bareos#1835

fix bareos#1775 plugin: fd mariabackup add support mariadb 11+

CHANGELOG.md

@@ -115,6 +115,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - dir: fix crash on purge with job without client [PR #1857]
 - fix runtime status [PR #1872]
 - Fix multiple ACL handling bugs [PR #1875]
+- fix #1775 plugin: fd mariabackup add support mariadb 11+ [PR #1835]
 
 [PR #1538]: https://github.com/bareos/bareos/pull/1538
 [PR #1581]: https://github.com/bareos/bareos/pull/1581
@@ -203,6 +204,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [PR #1810]: https://github.com/bareos/bareos/pull/1810
 [PR #1821]: https://github.com/bareos/bareos/pull/1821
 [PR #1829]: https://github.com/bareos/bareos/pull/1829
+[PR #1835]: https://github.com/bareos/bareos/pull/1835
 [PR #1840]: https://github.com/bareos/bareos/pull/1840
 [PR #1846]: https://github.com/bareos/bareos/pull/1846
 [PR #1847]: https://github.com/bareos/bareos/pull/1847

core/cmake/BareosFindPrograms.cmake

@@ -1,6 +1,6 @@
 #   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2021 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2023 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -117,26 +117,26 @@ message(STATUS "XTRABACKUP_BINARY: ${XTRABACKUP_BINARY}")
 message(STATUS "MYSQL_DAEMON_BINARY:${MYSQL_DAEMON_BINARY}")
 message(STATUS "MYSQL_CLIENT_BINARY:${MYSQL_CLIENT_BINARY}")
 
-# For mariadb: MARIABACKUP_BINARY MARIADB_DAEMON_BINARY MARIADB_CLIENT_BINARY
+# For mariadb: MARIADB_BACKUP_BINARY MARIADB_DAEMON_BINARY MARIADB_CLIENT_BINARY
 # MARIADB_MYSQL_INSTALL_DB_SCRIPT
 
-if(NOT DEFINED MARIABACKUP_BINARY)
-  find_program(MARIABACKUP_BINARY mariabackup)
+if(NOT DEFINED MARIADB_BACKUP_BINARY)
+  find_program(MARIADB_BACKUP_BINARY mariadb-backup)
 endif()
 
 find_program_and_verify_version_string(
-  MARIADB_DAEMON_BINARY mysqld MariaDB "/usr/libexec" ""
+  MARIADB_DAEMON_BINARY mariadbd MariaDB "/usr/libexec" ""
 )
 find_program_and_verify_version_string(
-  MARIADB_CLIENT_BINARY mysql MariaDB "" ""
+  MARIADB_CLIENT_BINARY mariadb MariaDB "" ""
 )
 
 if(NOT DEFINED MARIADB_MYSQL_INSTALL_DB_SCRIPT)
   find_program(MARIADB_MYSQL_INSTALL_DB_SCRIPT mysql_install_db)
 endif()
 
-message(STATUS "MARIABACKUP_BINARY: ${MARIABACKUP_BINARY}")
-message(STATUS "MARIADB_DAEMON_BINARY:${MARIADB_DAEMON_BINARY}")
+message(STATUS "MARIADB_BACKUP_BINARY: ${MARIADB_BACKUP_BINARY}")
+message(STATUS "MARIADB_DAEMON_BINARY: ${MARIADB_DAEMON_BINARY}")
 message(STATUS "MARIADB_CLIENT_BINARY: ${MARIADB_CLIENT_BINARY}")
 message(
   STATUS "MARIADB_MYSQL_INSTALL_DB_SCRIPT: ${MARIADB_MYSQL_INSTALL_DB_SCRIPT}"