diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2017-10-02 09:28:13 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2017-10-02 09:28:13 +0300 |
| commit | aa192af43acd89b4c76274006232670d1802ab86 (patch) | |
| tree | cd41c09f72a1b65214f433cb03768e1a50d22c3a /debian/patches/mysqld_multi_confd.patch | |
| download | mariadb-10.1-aa192af43acd89b4c76274006232670d1802ab86.tar.gz | |
Imported mariadb 10.1.26-1debian/10.1.26-1debian
Diffstat (limited to 'debian/patches/mysqld_multi_confd.patch')
| -rw-r--r-- | debian/patches/mysqld_multi_confd.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/debian/patches/mysqld_multi_confd.patch b/debian/patches/mysqld_multi_confd.patch new file mode 100644 index 0000000..600a2f8 --- /dev/null +++ b/debian/patches/mysqld_multi_confd.patch @@ -0,0 +1,20 @@ +From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org> +Date: Thu, 10 Aug 2017 20:40:28 +0200 +Subject: mysqld_multi_confd + +--- + scripts/mysqld_multi.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh +index c6515a3..f50f0fe 100644 +--- a/scripts/mysqld_multi.sh ++++ b/scripts/mysqld_multi.sh +@@ -497,6 +497,7 @@ sub list_defaults_files + '@prefix@/my.cnf', + ($ENV{MYSQL_HOME} ? "$ENV{MYSQL_HOME}/my.cnf" : undef), + $opt{'extra-file'}, ++ </etc/mysql/conf.d/*.cnf>, + ($ENV{HOME} ? "$ENV{HOME}/.my.cnf" : undef)); + } + |