From b306798ee13a70b573bc43f054bbfa937958dc21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= <otto@debian.org>
Date: Thu, 3 Jan 2019 21:56:06 +0200
Subject: [PATCH] Drop the mysqld multi patches as they are no longer relevant

The author Jan Wagner confirmed the patches can be dropped as they are no
longer relevant with systemd. From now on the correct approach would be
to follow the method described in the MariaDB knowledgebase:
https://mariadb.com/kb/en/library/systemd/#interacting-with-multiple-mariadb-server-processes
---
 .../mysqld_multi.server_lsb-header.patch      | 37 -------------------
 debian/patches/mysqld_multi_confd.patch       | 18 ---------
 debian/patches/series                         |  2 -
 3 files changed, 57 deletions(-)
 delete mode 100644 debian/patches/mysqld_multi.server_lsb-header.patch
 delete mode 100644 debian/patches/mysqld_multi_confd.patch

diff --git a/debian/patches/mysqld_multi.server_lsb-header.patch b/debian/patches/mysqld_multi.server_lsb-header.patch
deleted file mode 100644
index 49606c51d..000000000
--- a/debian/patches/mysqld_multi.server_lsb-header.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mysqld_multi.server_lsb-header
-
----
- support-files/mysqld_multi.server.sh | 20 ++++++++++++++++++--
- 1 file changed, 18 insertions(+), 2 deletions(-)
-
---- a/support-files/mysqld_multi.server.sh
-+++ b/support-files/mysqld_multi.server.sh
-@@ -14,8 +14,24 @@
- # Version 1.0
- #
- 
--basedir=/usr/local/mysql
--bindir=/usr/local/mysql/bin
-+### BEGIN INIT INFO
-+# Provides:          mysqld_multi
-+# Required-Start:    $remote_fs $syslog
-+# Required-Stop:     $remote_fs $syslog
-+# Should-Start:      $network $named $time
-+# Should-Stop:       $network $named $time
-+# Default-Start:     2 3 4 5
-+# Default-Stop:      0 1 6
-+# Short-Description: Start and stop multiple mysql database server daemon instances
-+# Description:       Controls multiple MariaDB database server daemon instances
-+### END INIT INFO
-+
-+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-+NAME=mysqld_multi
-+DESC=mysqld_multi
-+
-+basedir=/usr
-+bindir=/usr/bin
- 
- if test -x $bindir/mysqld_multi
- then
diff --git a/debian/patches/mysqld_multi_confd.patch b/debian/patches/mysqld_multi_confd.patch
deleted file mode 100644
index f48533dd1..000000000
--- a/debian/patches/mysqld_multi_confd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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(+)
-
---- 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));
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index d8426b6fe..a4e914cda 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,6 @@
 disable-test-disks.patch
 extend_default_test_timeout_for_tokudb.patch
 innodb_simulate_comp_test_speedup.patch
-#mysqld_multi_confd.patch
-#mysqld_multi.server_lsb-header.patch
 mips-groonga-atomic.patch
 mips-connect-unaligned.patch
 mips-machine.patch
-- 
GitLab