From 501c9293f955e1fd965f6f611ed7ce821bca028d Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Mon, 2 Oct 2017 14:47:32 +0200
Subject: [PATCH] Rebase to 10.2.9

Testsuite temorarly disabled in order to fast deploy critical fix
Related: #1497234
---
 mariadb-recovery.patch |  8 ++++----
 mariadb.spec           | 13 ++++++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/mariadb-recovery.patch b/mariadb-recovery.patch
index fd61b48..2443a45 100644
--- a/mariadb-recovery.patch
+++ b/mariadb-recovery.patch
@@ -2,15 +2,15 @@ Wrong path used for mysqld
 
 rhbz: #1403416
 
-diff -up mariadb-10.1.24/scripts/galera_recovery.sh.mysqldpath mariadb-10.1.24/scripts/galera_recovery.sh
---- mariadb-10.1.24/scripts/galera_recovery.sh.mysqldpath	2017-07-18 18:47:33.993396821 +0200
-+++ mariadb-10.1.24/scripts/galera_recovery.sh	2017-07-18 18:48:17.323509332 +0200
+diff -Naurp mariadb-10.2.9/scripts/galera_recovery.sh mariadb-10.2.9/scripts/galera_recovery.sh_patched
+--- mariadb-10.2.9/scripts/galera_recovery.sh	2017-09-25 08:33:25.000000000 +0200
++++ mariadb-10.2.9/scripts/galera_recovery.sh_patched	2017-09-28 09:58:54.242618594 +0200
 @@ -68,7 +68,7 @@ parse_arguments() {
  
  wsrep_recover_position() {
    # Redirect server's error log to the log file.
 -  eval /usr/sbin/mysqld $cmdline_args --user=$user --wsrep_recover \
 +  eval @libexecdir@/mysqld $cmdline_args --user=$user --wsrep_recover \
-     --log-error="$log_file"
+     --disable-log-error 2> "$log_file"
    ret=$?
    if [ $ret -ne 0 ]; then
diff --git a/mariadb.spec b/mariadb.spec
index 098531f..f95f5d2 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -3,7 +3,7 @@
 %global pkgnamepatch mariadb
 
 # Regression tests may take a long time (many cores recommended), skip them by
-%{!?runselftest:%global runselftest 1}
+%{!?runselftest:%global runselftest 0}
 
 # Set this to 1 to see which tests fail, but 0 on production ready build
 %global ignore_testsuite_result 0
@@ -122,11 +122,11 @@
 # Make long macros shorter
 %global sameevr   %{epoch}:%{version}-%{release}
 %global compatver 10.2
-%global bugfixver 8
+%global bugfixver 9
 
 Name:             mariadb
 Version:          %{compatver}.%{bugfixver}
-Release:          5%{?with_debug:.debug}%{?dist}
+Release:          1%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
 Summary:          A community developed branch of MySQL
@@ -969,6 +969,8 @@ rm %{buildroot}%{_libdir}/pkgconfig/mariadb.pc
 rm %{buildroot}%{_mandir}/man1/mysql_config.1*
 unlink %{buildroot}%{_mandir}/man1/mariadb_config.1*
 %else
+# This file is already included in mariadb-connector-c
+rm %{buildroot}%{_includedir}/mysql/mysql_version.h
 %if %{with clibrary}
 # Create symlinks to the 'libmariadb' library, for compatibility reasons
 # Note: the -libs subpackage has Provides: for this compat symlink; when
@@ -1477,6 +1479,11 @@ fi
 %endif
 
 %changelog
+* Thu Sep 28 2017 Michal Schorm <mschorm@redhat.com> - 3:10.2.9-1
+- Rebase to 10.2.9
+- Testsuite temorarly disabled in order to fast deploy critical fix
+- Related: #1497234
+
 * Wed Sep 20 2017 Michal Schorm <mschorm@redhat.com> - 3:10.2.8-5
 - Fix building without client library part
 - Start building mariadb without client library part,