summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-01-24 14:16:20 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2020-01-24 14:16:20 +0100
commitceda5f724fd1ca1bcb6fb113af55179849c057d0 (patch)
treeb6d8305dd4fbfae5d8e05b2e6c67cfd65214dd7b /debian
parentade89fc8980a0b2763734815df7634a129c6d5dc (diff)
parentf2ccfcaca191513d12f50672ae4545f9738670f0 (diff)
downloadmariadb-git-ceda5f724fd1ca1bcb6fb113af55179849c057d0.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'debian')
-rw-r--r--debian/mariadb-server-10.3.install2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/mariadb-server-10.3.install b/debian/mariadb-server-10.3.install
index 9447446a6b5..eca7d572251 100644
--- a/debian/mariadb-server-10.3.install
+++ b/debian/mariadb-server-10.3.install
@@ -3,7 +3,9 @@ debian/additions/debian-start.inc.sh usr/share/mysql
debian/additions/echo_stderr usr/share/mysql
debian/additions/mysqld_safe_syslog.cnf etc/mysql/conf.d
etc/apparmor.d/usr.sbin.mysqld
+etc/security/user_map.conf
lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
+lib/*/security/pam_user_map.so
usr/bin/aria_chk
usr/bin/aria_dump_log
usr/bin/aria_ftdump