Hi Otto, Am 19.02.2015 um 17:31 schrieb Otto Kekäläinen: > Would you care to provide a patch that can be applied on MariaDB 10.0.16?
The patch I attached to the bug applied without problems. The patch against latest mariadb-10.0 is attached. > source at http://anonscm.debian.org/cgit/pkg-mysql/mariadb-10.0.git > (and github mirror for pull requests, if you prefer them: > https://github.com/ottok/mariadb-10.0) I also opened a RP (#6). Many thanks, Jan. -- Never write mail to <w...@spamfalle.info>, you have been warned! -----BEGIN GEEK CODE BLOCK----- Version: 3.12 GIT d-- s+: a C+++ UL++++ P+ L+++ E--- W+++ N+++ o++ K++ w--- O M V- PS PE Y++ PGP++ t-- 5 X R tv- b+ DI D+ G++ e++ h---- r+++ y++++ ------END GEEK CODE BLOCK------
From 221008e91be04a4693cef555b2d62890ae0086e0 Mon Sep 17 00:00:00 2001
From: Jan Wagner <w...@cyconet.org>
Date: Thu, 19 Feb 2015 17:59:21 +0100
Subject: [PATCH] Adding mysqld_multi_confd.patch, makes mysqld_multi reading
conf.d (Closes: #778761)
---
debian/patches/mysqld_multi_confd.patch | 10 ++++++++++
debian/patches/series | 1 +
2 files changed, 11 insertions(+)
create mode 100644 debian/patches/mysqld_multi_confd.patch
diff --git a/debian/patches/mysqld_multi_confd.patch b/debian/patches/mysqld_multi_confd.patch
new file mode 100644
index 0000000..30dca92
--- /dev/null
+++ b/debian/patches/mysqld_multi_confd.patch
@@ -0,0 +1,10 @@
+--- a/scripts/mysqld_multi.sh
++++ b/scripts/mysqld_multi.sh
+@@ -504,6 +504,7 @@
+ '@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));
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 24d634b..969689c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ mroonga-disable-switch.patch
new_valid_certs.patch
new_valid_certs_test_fix.patch
reproducible-builds-fix-connect.patch
+mysqld_multi_confd.patch
signature.asc
Description: OpenPGP digital signature
