From c11af443b215852235beb8c3154b89c84bb7a8a7 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Wed, 6 Nov 2019 15:15:33 +0100
Subject: [PATCH] Rebase to 10.3.19

Drop patch for mysqld_safe, fixed by upstream.
---
 mariadb-logrotate.patch   | 20 ++++++++------------
 mariadb-mysqld_safe.patch | 17 -----------------
 mariadb.spec              |  8 ++++----
 sources                   |  2 +-
 4 files changed, 13 insertions(+), 34 deletions(-)
 delete mode 100644 mariadb-mysqld_safe.patch

diff --git a/mariadb-logrotate.patch b/mariadb-logrotate.patch
index fd58c42..6af9466 100644
--- a/mariadb-logrotate.patch
+++ b/mariadb-logrotate.patch
@@ -26,16 +26,13 @@ Update 6/2018
   beeing able to send the SIGHUP to the process and read the mysqld pid file, which root can.
 * Submited as PR: https://github.com/MariaDB/server/pull/807
 
---- mariadb-10.3.7/support-files/mysql-log-rotate.sh	2018-05-23 22:38:46.000000000 +0200
-+++ mariadb-10.3.7/support-files/mysql-log-rotate.sh_patched	2018-06-27 12:11:23.705719826 +0200
-@@ -1,25 +1,12 @@
- # This logname can be set in /etc/my.cnf
- # by setting the variable "err-log"
--# in the [safe_mysqld] section as follows:
-+# in the [mysqld] section as follows:
+--- mariadb-10.3.19/support-files/mysql-log-rotate.sh	2019-11-03 17:03:27.000000000 +0100
++++ mariadb-10.3.19/support-files/mysql-log-rotate.sh_patched	2019-11-06 15:07:54.205379672 +0100
+@@ -3,23 +3,10 @@
+ # in the [mysqld] section as follows:
  #
--# [safe_mysqld]
--# err-log=@localstatedir@/mysqld.log
+ # [mysqld]
+-# log-error=@localstatedir@/mysqld.log
 -#
 -# If the root user has a password you have to create a
 -# /root/.my.cnf configuration file with the following
@@ -49,15 +46,14 @@ Update 6/2018
 -#
 -# ATTENTION: This /root/.my.cnf should be readable ONLY
 -# for root !
-+# [mysqld]
-+# log_error=@LOG_LOCATION@
++# log-error=@LOG_LOCATION@
  
 -@localstatedir@/mysqld.log {
 -        # create 600 mysql mysql
 +@LOG_LOCATION@ {
 +        create 600 mysql mysql
          notifempty
- 	daily
+         daily
          rotate 3
 @@ -27,11 +14,9 @@
          compress
diff --git a/mariadb-mysqld_safe.patch b/mariadb-mysqld_safe.patch
deleted file mode 100644
index cda0d3e..0000000
--- a/mariadb-mysqld_safe.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix for:
-/usr/bin/mysqld_safe: line 933: return: can only `return' from a function or sourced script
-
-Upstream PR:
-https://github.com/MariaDB/server/pull/1238
-
---- mariadb-10.3.12/scripts/mysqld_safe.sh	2019-01-04 16:28:49.000000000 +0100
-+++ mariadb-10.3.12/scripts/mysqld_safe.sh_patched	2019-03-21 11:34:59.499309336 +0100
-@@ -929,7 +929,7 @@ do
-   cmd="$cmd "`shell_quote_string "$i"`
- done
- cmd="$cmd $args"
--[ $dry_run -eq 1 ] && return
-+[ $dry_run -eq 1 ] && exit
- 
- # Avoid 'nohup: ignoring input' warning
- test -n "$NOHUP_NICENESS" && cmd="$cmd < /dev/null"
diff --git a/mariadb.spec b/mariadb.spec
index b5edf2e..b801050 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -152,7 +152,7 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          10.3.18
+Version:          10.3.19
 Release:          1%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
@@ -199,8 +199,6 @@ Patch9:           %{pkgnamepatch}-ownsetup.patch
 Patch10:          %{pkgnamepatch}-ssl-cipher-tests.patch
 #   Patch11: Use PCDIR CMake option, if configured
 Patch11:          %{pkgnamepatch}-pcdir.patch
-#   Patch12: Fix mysqld_safe --dry-run
-Patch12:          %{pkgnamepatch}-mysqld_safe.patch
 #   Patch13: Fix Spider code on armv7hl; https://jira.mariadb.org/browse/MDEV-18737
 Patch13:          %{pkgnamepatch}-spider_on_armv7hl.patch
 #   Patch14: Remove the '-Werror' flag so the debug build won't crash on random warnings
@@ -701,7 +699,6 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \;
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
 %patch13 -p1
 %patch14 -p1
 
@@ -1579,6 +1576,9 @@ fi
 %endif
 
 %changelog
+* Wed Nov 06 2019 Michal Schorm <mschorm@redhat.com> - 10.3.19-1
+- Rebase to 10.3.19
+
 * Thu Oct 31 2019 Carl George <carl@george.computer> - 3:10.3.18-1
 - Rebase to 10.3.18
 
diff --git a/sources b/sources
index 0f51d89..4c53ef3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mariadb-10.3.18.tar.gz) = 817253d18f20c74f9ec8030678fd50a28b1726fd59153023a3a5e9b3f79e1f44d79feb24ae9ed72d8c1c04017110c932aba7be0610fb06245590c7f5610db242
+SHA512 (mariadb-10.3.19.tar.gz) = ab6e57c4b1d0f00c4ba24818e4461473eee9d281c44d46ec202ee21b7d1af0ea51904c0908d72fa2a0a2acd1cb8b4989e657841820c8d7ceb97e192cdc49e2ee