MariaDB · lvoytek · Sep 9, 2026
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
@@ -88,7 +88,7 @@ It was originally forked from Percona XtraBackup 2.3.8.")
 # Packages with default description
 SET(CPACK_RPM_client_PACKAGE_SUMMARY "MariaDB database client binaries")
 SET(CPACK_RPM_client_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_DESCRIPTION}")
-SET(CPACK_RPM_common_PACKAGE_SUMMARY "MariaDB database common configuration files (e.g. /etc/mysql/conf.d/mariadb.cnf)")
+SET(CPACK_RPM_common_PACKAGE_SUMMARY "MariaDB database common configuration files (e.g. /etc/mariadb/conf.d/mariadb.cnf)")
 SET(CPACK_RPM_common_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_DESCRIPTION}")
 SET(CPACK_RPM_compat_PACKAGE_SUMMARY "MariaDB database client library MySQL compat package")
 SET(CPACK_RPM_compat_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_DESCRIPTION}")

diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
@@ -42,7 +42,7 @@
 # - INSTALL_SBINDIR         (directory with mysqld)
 # - INSTALL_SCRIPTDIR       (several scripts, rarely used)
 # - INSTALL_SYSCONFDIR	    (my.cnf config file. Usually /etc or nothing)
-# - INSTALL_SYSCONF2DIR     (additional config files, e.g. /etc/mysql/conf.d)
+# - INSTALL_SYSCONF2DIR     (additional config files, e.g. /etc/mariadb/conf.d)
 #
 # - INSTALL_LIBDIR          (directory with client end embedded libraries)
 # - INSTALL_PLUGINDIR       (directory for plugins)
@@ -179,7 +179,7 @@ SET(INSTALL_BINDIR_DEB                  "bin")
 SET(INSTALL_SBINDIR_DEB                 "sbin")
 SET(INSTALL_SCRIPTDIR_DEB               "bin")
 SET(INSTALL_SYSCONFDIR_DEB              "/etc")
-SET(INSTALL_SYSCONF2DIR_DEB             "/etc/mysql/mariadb.conf.d")
+SET(INSTALL_SYSCONF2DIR_DEB             "/etc/mariadb/mariadb.conf.d")
 #
 SET(INSTALL_LIBDIR_DEB                  "lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}")
 SET(INSTALL_PLUGINDIR_DEB               "lib/mysql/plugin")

diff --git a/cmake/systemd.cmake b/cmake/systemd.cmake
@@ -50,7 +50,7 @@ MACRO(CHECK_SYSTEMD)
           SET(SYSTEMD_SCRIPTS ${SYSTEMD_SCRIPTS} galera_recovery)
         ENDIF()
         IF(DEB)
-          SET(SYSTEMD_EXECSTARTPOST "ExecStartPost=!/etc/mysql/debian-start")
+          SET(SYSTEMD_EXECSTARTPOST "ExecStartPost=!/etc/mariadb/debian-start")
         ENDIF()
 	IF(URING_FOUND)
 	  SET(SYSTEMD_LIMIT "# For liburing and io_uring_setup()

diff --git a/debian/additions/debian-start b/debian/additions/debian-start
@@ -22,10 +22,10 @@ then
   . /etc/default/mariadb
 fi
 
-MARIADB="/usr/bin/mariadb --defaults-extra-file=/etc/mysql/debian.cnf"
-MYADMIN="/usr/bin/mariadb-admin --defaults-extra-file=/etc/mysql/debian.cnf"
+MARIADB="/usr/bin/mariadb --defaults-extra-file=/etc/mariadb/debian.cnf"
+MYADMIN="/usr/bin/mariadb-admin --defaults-extra-file=/etc/mariadb/debian.cnf"
 # Don't run full mariadb-upgrade on every server restart, use --version-check to do it only once
-MYUPGRADE="/usr/bin/mariadb-upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check --silent"
+MYUPGRADE="/usr/bin/mariadb-upgrade --defaults-extra-file=/etc/mariadb/debian.cnf --version-check --silent"
 
 # The following commands should be run when the server is up but in background
 # where they do not block the server start and in one shell instance so that

diff --git a/debian/additions/debian-start.inc.sh b/debian/additions/debian-start.inc.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# This file is included by /etc/mysql/debian-start
+# This file is included by /etc/mariadb/debian-start
 #
 
 ## Check for tables needing an upgrade.

diff --git a/debian/additions/mariadb.cnf b/debian/additions/mariadb.cnf
@@ -1,11 +1,10 @@
 # The MariaDB configuration file
 #
-# The MariaDB/MySQL tools read configuration files in the following order:
-# 0. "/etc/mysql/my.cnf" symlinks to this file, reason why all the rest is read.
-# 1. "/etc/mysql/mariadb.cnf" (this file) to set global defaults,
-# 2. "/etc/mysql/conf.d/*.cnf" to set global options.
-# 3. "/etc/mysql/mariadb.conf.d/*.cnf" to set MariaDB-only options.
-# 4. "~/.my.cnf" to set user-specific options.
+# MariaDB reads configuration files in the following order:
+# 0. "/etc/mariadb/my.cnf" (a symlink to this file) to set global defaults,
+# 1. "/etc/mariadb/conf.d/*.cnf" to set global options,
+# 2. "/etc/mariadb/mariadb.conf.d/*.cnf" to set MariaDB-only options,
+# 3. "~/.my.cnf" to set user-specific options.
 #
 # If the same option is defined multiple times, the last one will apply.
 #
@@ -25,5 +24,5 @@
 socket = /run/mysqld/mysqld.sock
 
 # Import all .cnf files from configuration directory
-!includedir /etc/mysql/conf.d/
-!includedir /etc/mysql/mariadb.conf.d/
+!includedir /etc/mariadb/conf.d/
+!includedir /etc/mariadb/mariadb.conf.d/
diff --git a/debian/additions/mariadb.conf.d/50-client.cnf b/debian/additions/mariadb.conf.d/50-client.cnf
@@ -5,14 +5,14 @@
 
 [client]
 # Example of client certificate usage
-#ssl-cert = /etc/mysql/client-cert.pem
-#ssl-key  = /etc/mysql/client-key.pem
+#ssl-cert = /etc/mariadb/client-cert.pem
+#ssl-key  = /etc/mariadb/client-key.pem
 #
 # Allow only TLS encrypted connections
 #ssl-verify-server-cert = on
 
 # This group is *never* read by mysql client library, though this
-# /etc/mysql/mariadb.cnf.d/client.cnf file is not read by Oracle MySQL
+# /etc/mariadb/mariadb.cnf.d/client.cnf file is not read by Oracle MySQL
 # client anyway.
 # If you use the same .cnf file for MySQL and MariaDB,
 # use it for MariaDB-only client options

diff --git a/debian/additions/mariadb.conf.d/50-server.cnf b/debian/additions/mariadb.conf.d/50-server.cnf
@@ -82,9 +82,9 @@ expire_logs_days        = 10
 
 # For documentation, please read
 # https://mariadb.com/docs/server/security/encryption/data-in-transit-encryption/securing-connections-for-client-and-server
-#ssl-ca = /etc/mysql/cacert.pem
-#ssl-cert = /etc/mysql/server-cert.pem
-#ssl-key = /etc/mysql/server-key.pem
+#ssl-ca = /etc/mariadb/cacert.pem
+#ssl-cert = /etc/mariadb/server-cert.pem
+#ssl-key = /etc/mariadb/server-key.pem
 #require-secure-transport = on
 
 #

diff --git a/debian/additions/source_mariadb.py b/debian/additions/source_mariadb.py
@@ -37,11 +37,11 @@ def add_info(report):
             report[key] += line + '\n'
     attach_mac_events(report, '/usr/sbin/mariadbd')
     attach_file(report,'/etc/apparmor.d/usr.sbin.mariadbd')
-    _add_my_conf_files(report, '/etc/mysql/mariadb.cnf')
-    for f in os.listdir('/etc/mysql/conf.d'):
-        _add_my_conf_files(report, os.path.join('/etc/mysql/conf.d', f))
-    for f in os.listdir('/etc/mysql/mariadb.conf.d'):
-        _add_my_conf_files(report, os.path.join('/etc/mysql/mariadb.conf.d', f))
+    _add_my_conf_files(report, '/etc/mariadb/mariadb.cnf')
+    for f in os.listdir('/etc/mariadb/conf.d'):
+        _add_my_conf_files(report, os.path.join('/etc/mariadb/conf.d', f))
+    for f in os.listdir('/etc/mariadb/mariadb.conf.d'):
+        _add_my_conf_files(report, os.path.join('/etc/mariadb/mariadb.conf.d', f))
     try:
         report['MySQLVarLibDirListing'] = str(os.listdir('/var/lib/mysql'))
     except OSError:

diff --git a/debian/control b/debian/control
@@ -273,26 +273,12 @@ Description: MariaDB embedded database, development files package
  This package includes the MariaDB embedded server library development
  and header files.
 
-Package: mysql-common
-Architecture: all
-Depends:
- ${misc:Depends},
-Description: MariaDB client common configuration files package (e.g. /etc/mysql/my.cnf)
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes files needed by all versions of the client library
- (e.g. /etc/mysql/my.cnf).
-
 Package: mariadb-common
 Architecture: all
 Depends:
- mysql-common (>= 5.6.25),
  ${misc:Depends},
 Multi-Arch: foreign
-Description: MariaDB database common files (e.g. /etc/mysql/mariadb.conf.d/)
+Description: MariaDB database common files (e.g. /etc/mariadb/mariadb.conf.d/)
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MariaDB are speed, robustness and

diff --git a/debian/mariadb-client.README.Debian b/debian/mariadb-client.README.Debian
@@ -1,4 +1,4 @@
 FAQ:
 
 Q: My <tab> completion is gone, why?
-A: You have "no-auto-rehash" in the "[mysql]" section of /etc/mysql/my.cnf!
+A: You have "no-auto-rehash" in the "[mysql]" section of /etc/mariadb/my.cnf!
diff --git a/debian/mariadb-client.install b/debian/mariadb-client.install
@@ -1,7 +1,7 @@
 debian/additions/innotop/innotop usr/bin/
 debian/additions/mariadb-report usr/bin/
-debian/additions/mariadb.conf.d/50-client.cnf etc/mysql/mariadb.conf.d
-debian/additions/mariadb.conf.d/50-mariadb-clients.cnf etc/mysql/mariadb.conf.d
+debian/additions/mariadb.conf.d/50-client.cnf etc/mariadb/mariadb.conf.d
+debian/additions/mariadb.conf.d/50-mariadb-clients.cnf etc/mariadb/mariadb.conf.d
 usr/bin/mariadb-access
 usr/bin/mariadb-admin
 usr/bin/mariadb-binlog

diff --git a/debian/mariadb-common.dirs b/debian/mariadb-common.dirs
@@ -1 +1,2 @@
-etc/mysql/mariadb.conf.d
+etc/mariadb/mariadb.conf.d
+etc/mariadb/conf.d
diff --git a/debian/mariadb-common.install b/debian/mariadb-common.install
@@ -1 +1 @@
-debian/additions/mariadb.cnf etc/mysql/
+debian/additions/mariadb.cnf etc/mariadb/
diff --git a/debian/mariadb-common.links b/debian/mariadb-common.links
@@ -0,0 +1 @@
+etc/mariadb/mariadb.cnf etc/mariadb/my.cnf
diff --git a/debian/mariadb-common.lintian-overrides b/debian/mariadb-common.lintian-overrides
@@ -1,2 +1,2 @@
 # This false-positive as is just seeks dot
-synopsis-is-a-sentence "MariaDB database common files (e.g. /etc/mysql/mariadb.conf.d/)"
+synopsis-is-a-sentence "MariaDB database common files (e.g. /etc/mariadb/mariadb.conf.d/)"
diff --git a/debian/mariadb-common.postinst b/debian/mariadb-common.postinst
@@ -4,37 +4,13 @@ set -e
 
 case "$1" in
   configure)
-    # New packaging paradigm for my.cnf handling among MySQL variants
-    # Used in Ubuntu since Dec-2014 and in Debian since Jul-2015
-    #
-    # If the new mysql-common package does not provide
-    # the update-alternatives facility, notify user about manual fall back
+    # Remove my.cnf alternatives pointing to MariaDB.
     if [ -f /usr/share/mysql-common/configure-symlinks ]
     then
-      /usr/share/mysql-common/configure-symlinks install mariadb "/etc/mysql/mariadb.cnf"
-    else
-      # As configure can be called many times, don't re-create the symlink
-      # if it is there already
-      if [ ! -L /etc/mysql/my.cnf ]
-      then
-        echo "Notice: configure-symlinks trigger could not be called."
-        echo "Please manually create symlinks by running: "
-        echo "  mv -f /etc/mysql/my.cnf /etc/mysql/my.cnf.old"
-        echo "  ln -sf mariadb.cnf /etc/mysql/my.cnf"
-      fi
+      /usr/share/mysql-common/configure-symlinks remove mariadb "/etc/mysql/mariadb.cnf" || true
     fi
 
-    # Note that MySQL in Debian runs the configure-symlinks from the
-    # mysql-server-x.x.postinst and postrm files, while the MySQL.com (and
-    # Percona.com) packaging triggers update-alternatives directly form the
-    # mysql-common (and percona-x-common) package using priority 200.
-    #
-    # Thus, we need to ensure here that mariadb.cnf indeed became the primary
-    # alternative and override with priority 500 if needed.
-    if ! update-alternatives --query my.cnf | grep --quiet "Value: /etc/mysql/mariadb.cnf"
-    then
-      update-alternatives --install /etc/mysql/my.cnf my.cnf "/etc/mysql/mariadb.cnf" 500 || true
-    fi
+    update-alternatives --remove my.cnf "/etc/mysql/mariadb.cnf" 2>/dev/null || true
     ;;
 esac
 

diff --git a/debian/mariadb-common.postrm b/debian/mariadb-common.postrm
@@ -4,12 +4,16 @@ set -e
 
 case "$1" in
   remove|disappear)
-    # New packaging paradigm for my.cnf handling among MySQL variants
-    # Used in Ubuntu since Dec-2014 and in Debian since Jul-2015
+    # Withdraw from the /etc/mysql/my.cnf alternatives if still registered from
+    # previous MySQL variant packaging paradigm.
     if [ -f /usr/share/mysql-common/configure-symlinks ]
     then
-      /usr/share/mysql-common/configure-symlinks remove mariadb "/etc/mysql/mariadb.cnf"
+      /usr/share/mysql-common/configure-symlinks remove mariadb "/etc/mysql/mariadb.cnf" || true
     fi
+    update-alternatives --remove my.cnf "/etc/mysql/mariadb.cnf" 2>/dev/null || true
+    ;;
+  purge)
+    rmdir /etc/mariadb 2>/dev/null || true
     ;;
 esac
 

diff --git a/debian/mariadb-common.preinst b/debian/mariadb-common.preinst
@@ -0,0 +1,47 @@
+#!/bin/sh
+set -e
+
+mariadb_cfgdir=/etc/mariadb
+legacy_mariadb_cfgdir=/etc/mysql
+
+# Migrate MariaDB's configuration from /etc/mysql to /etc/mariadb on upgrade.
+if [ "$1" = "upgrade" ] && [ -d "$legacy_mariadb_cfgdir" ]
+then
+  mkdir -p "$mariadb_cfgdir"
+
+  # Main config file.
+  if [ -e "$legacy_mariadb_cfgdir/mariadb.cnf" ] && [ ! -e "$mariadb_cfgdir/mariadb.cnf" ]
+  then
+    mv "$legacy_mariadb_cfgdir/mariadb.cnf" "$mariadb_cfgdir/mariadb.cnf"
+    echo "Moved $legacy_mariadb_cfgdir/mariadb.cnf to $mariadb_cfgdir/mariadb.cnf"
+  fi
+
+  # MariaDB-specific config directory.
+  if [ -d "$legacy_mariadb_cfgdir/mariadb.conf.d" ] && [ ! -e "$mariadb_cfgdir/mariadb.conf.d" ]
+  then
+    mv "$legacy_mariadb_cfgdir/mariadb.conf.d" "$mariadb_cfgdir/mariadb.conf.d"
+    echo "Moved $legacy_mariadb_cfgdir/mariadb.conf.d/ to $mariadb_cfgdir/mariadb.conf.d/"
+  elif [ -d "$legacy_mariadb_cfgdir/mariadb.conf.d" ]
+  then
+    # Folder exists, move any missing files over.
+    for f in "$legacy_mariadb_cfgdir/mariadb.conf.d"/*.cnf
+    do
+      [ -e "$f" ] || continue
+      base=$(basename "$f")
+      if [ ! -e "$mariadb_cfgdir/mariadb.conf.d/$base" ]
+      then
+        mv "$f" "$mariadb_cfgdir/mariadb.conf.d/$base"
+        echo "Moved $f to $mariadb_cfgdir/mariadb.conf.d/$base"
+      fi
+    done
+  fi
+
+  # debian-start script
+  if [ -e "$legacy_mariadb_cfgdir/debian-start" ] && [ ! -e "$mariadb_cfgdir/debian-start" ]
+  then
+    mv "$legacy_mariadb_cfgdir/debian-start" "$mariadb_cfgdir/debian-start"
+    echo "Moved $legacy_mariadb_cfgdir/debian-start to $mariadb_cfgdir/debian-start"
+  fi
+fi
+
+#DEBHELPER#
diff --git a/debian/mariadb-plugin-connect.install b/debian/mariadb-plugin-connect.install
@@ -1,2 +1,2 @@
-etc/mysql/mariadb.conf.d/connect.cnf
+etc/mariadb/mariadb.conf.d/connect.cnf
 usr/lib/mysql/plugin/ha_connect.so
diff --git a/debian/mariadb-plugin-cracklib-password-check.install b/debian/mariadb-plugin-cracklib-password-check.install
@@ -1,2 +1,2 @@
-etc/mysql/mariadb.conf.d/cracklib_password_check.cnf
+etc/mariadb/mariadb.conf.d/cracklib_password_check.cnf
 usr/lib/mysql/plugin/cracklib_password_check.so
diff --git a/debian/mariadb-plugin-gssapi-server.install b/debian/mariadb-plugin-gssapi-server.install
@@ -1,2 +1,2 @@
-etc/mysql/mariadb.conf.d/auth_gssapi.cnf
+etc/mariadb/mariadb.conf.d/auth_gssapi.cnf
 usr/lib/mysql/plugin/auth_gssapi.so
diff --git a/debian/mariadb-plugin-hashicorp-key-management.install b/debian/mariadb-plugin-hashicorp-key-management.install
@@ -1,3 +1,3 @@
-etc/mysql/mariadb.conf.d/hashicorp_key_management.cnf
+etc/mariadb/mariadb.conf.d/hashicorp_key_management.cnf
 usr/lib/mysql/plugin/hashicorp_key_management.so
 usr/share/doc/mariadb-plugin-hashicorp-key-management/hashicorp_key_management.txt
diff --git a/debian/mariadb-plugin-mroonga.postinst b/debian/mariadb-plugin-mroonga.postinst
@@ -3,7 +3,7 @@
 set -e
 
 # Install Mroonga
-mariadb --defaults-file=/etc/mysql/debian.cnf < /usr/share/mariadb/mroonga/install.sql || true
+mariadb --defaults-file=/etc/mariadb/debian.cnf < /usr/share/mariadb/mroonga/install.sql || true
 # Always exit with success instead of leaving dpkg in a broken state
 
 

diff --git a/debian/mariadb-plugin-mroonga.prerm b/debian/mariadb-plugin-mroonga.prerm
@@ -3,7 +3,7 @@
 set -e
 
 # Uninstall Mroonga
-mariadb --defaults-file=/etc/mysql/debian.cnf < /usr/share/mariadb/mroonga/uninstall.sql || true
+mariadb --defaults-file=/etc/mariadb/debian.cnf < /usr/share/mariadb/mroonga/uninstall.sql || true
 # Always exit with success instead of leaving dpkg in a broken state
 
 

diff --git a/debian/mariadb-plugin-oqgraph.install b/debian/mariadb-plugin-oqgraph.install
@@ -1,2 +1,2 @@
-etc/mysql/mariadb.conf.d/oqgraph.cnf
+etc/mariadb/mariadb.conf.d/oqgraph.cnf
 usr/lib/mysql/plugin/ha_oqgraph.so
diff --git a/debian/mariadb-plugin-provider-bzip2.install b/debian/mariadb-plugin-provider-bzip2.install
@@ -1,2 +1,2 @@
-etc/mysql/mariadb.conf.d/provider_bzip2.cnf
+etc/mariadb/mariadb.conf.d/provider_bzip2.cnf
 usr/lib/mysql/plugin/provider_bzip2.so
diff --git a/debian/mariadb-plugin-provider-lz4.install b/debian/mariadb-plugin-provider-lz4.install
@@ -1,2 +1,2 @@
-etc/mysql/mariadb.conf.d/provider_lz4.cnf
+etc/mariadb/mariadb.conf.d/provider_lz4.cnf
 usr/lib/mysql/plugin/provider_lz4.so
diff --git a/debian/mariadb-plugin-provider-lzma.install b/debian/mariadb-plugin-provider-lzma.install
@@ -1,2 +1,2 @@
-etc/mysql/mariadb.conf.d/provider_lzma.cnf
+etc/mariadb/mariadb.conf.d/provider_lzma.cnf
 usr/lib/mysql/plugin/provider_lzma.so
diff --git a/debian/mariadb-plugin-provider-lzo.install b/debian/mariadb-plugin-provider-lzo.install
@@ -1,2 +1,2 @@
-etc/mysql/mariadb.conf.d/provider_lzo.cnf
+etc/mariadb/mariadb.conf.d/provider_lzo.cnf
 usr/lib/mysql/plugin/provider_lzo.so
diff --git a/debian/mariadb-plugin-provider-snappy.install b/debian/mariadb-plugin-provider-snappy.install
@@ -1,2 +1,2 @@
-etc/mysql/mariadb.conf.d/provider_snappy.cnf
+etc/mariadb/mariadb.conf.d/provider_snappy.cnf
 usr/lib/mysql/plugin/provider_snappy.so
diff --git a/debian/mariadb-plugin-rocksdb.install b/debian/mariadb-plugin-rocksdb.install
@@ -1,4 +1,4 @@
-etc/mysql/mariadb.conf.d/rocksdb.cnf
+etc/mariadb/mariadb.conf.d/rocksdb.cnf
 usr/bin/mariadb-ldb
 usr/bin/myrocks_hotbackup
 usr/bin/mysql_ldb

diff --git a/debian/mariadb-plugin-s3.install b/debian/mariadb-plugin-s3.install
@@ -1,4 +1,4 @@
-etc/mysql/mariadb.conf.d/s3.cnf
+etc/mariadb/mariadb.conf.d/s3.cnf
 usr/bin/aria_s3_copy
 usr/lib/mysql/plugin/ha_s3.so
 usr/share/man/man1/aria_s3_copy.1
diff --git a/debian/mariadb-plugin-spider.install b/debian/mariadb-plugin-spider.install
@@ -1,2 +1,2 @@
-etc/mysql/mariadb.conf.d/spider.cnf
+etc/mariadb/mariadb.conf.d/spider.cnf
 usr/lib/mysql/plugin/ha_spider.so
diff --git a/debian/mariadb-plugin-videx.install b/debian/mariadb-plugin-videx.install
@@ -1,2 +1,2 @@
-etc/mysql/mariadb.conf.d/videx.cnf
-usr/lib/mysql/plugin/ha_videx.so
+etc/mariadb/mariadb.conf.d/videx.cnf
+usr/lib/mysql/plugin/ha_videx.so
diff --git a/debian/mariadb-server-galera.install b/debian/mariadb-server-galera.install
@@ -1,5 +1,5 @@
-etc/mysql/mariadb.conf.d/wsrep_info.cnf
-debian/additions/mariadb.conf.d/60-galera.cnf etc/mysql/mariadb.conf.d
+etc/mariadb/mariadb.conf.d/wsrep_info.cnf
+debian/additions/mariadb.conf.d/60-galera.cnf etc/mariadb/mariadb.conf.d
 usr/bin/galera_new_cluster
 usr/bin/galera_recovery
 usr/bin/wsrep_sst_common
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		debian/additions/mariadb.cnf etc/mysql/
		debian/additions/mariadb.cnf etc/mariadb/