[mariadb/f21] Rebase to version 10.0.16 Resolves: #1187895

[Honza Horak]

commit 02a49c2913e8c1da986b560e60c1852e3a83e78f
Author: Jakub Dorňák <jdornak at redhat.com>
Date:   Tue Feb 3 11:00:02 2015 +0100

    Rebase to version 10.0.16
    Resolves: #1187895
    
    Conflicts:
    	mariadb-scripts.patch
    	mariadb.spec

 .gitignore           |    1 +
 mariadb-dh1024.patch |    8 ++++----
 mariadb.spec         |    8 ++++++--
 sources              |    2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8f84719..fc356c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /mariadb-10.0.13.tar.gz
 /mariadb-10.0.14.tar.gz
 /mariadb-10.0.15.tar.gz
+/mariadb-10.0.16.tar.gz
diff --git a/mariadb-dh1024.patch b/mariadb-dh1024.patch
index e1a2ee8..a887199 100644
--- a/mariadb-dh1024.patch
+++ b/mariadb-dh1024.patch
@@ -5,9 +5,9 @@ mode is on, but it doesn't seem worth the trouble.)
 The new parameter value was generated using "openssl dhparam -C 1024".
 
 
-diff -up mariadb-10.0.15/vio/viosslfactories.c.orig mariadb-10.0.15/vio/viosslfactories.c
---- mariadb-10.0.15/vio/viosslfactories.c.orig	2014-11-27 15:02:22.757315487 +0100
-+++ mariadb-10.0.15/vio/viosslfactories.c	2014-11-27 15:00:44.847144887 +0100
+diff -up mariadb-10.0.16/vio/viosslfactories.c.orig mariadb-10.0.16/vio/viosslfactories.c
+--- mariadb-10.0.16/vio/viosslfactories.c.orig	2015-01-25 16:21:38.000000000 +0100
++++ mariadb-10.0.16/vio/viosslfactories.c	2015-02-03 10:48:26.012560285 +0100
 @@ -20,27 +20,32 @@
  static my_bool     ssl_algorithms_added    = FALSE;
  static my_bool     ssl_error_strings_loaded= FALSE;
@@ -52,7 +52,7 @@ diff -up mariadb-10.0.15/vio/viosslfactories.c.orig mariadb-10.0.15/vio/viosslfa
      if (! dh->p || ! dh->g)
      {
        DH_free(dh);
-@@ -284,7 +289,7 @@ new_VioSSLFd(const char *key_file, const
+@@ -257,7 +262,7 @@ new_VioSSLFd(const char *key_file, const
    }
  
    /* DH stuff */
diff --git a/mariadb.spec b/mariadb.spec
index d7d296d..67438e3 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -114,11 +114,11 @@
 # Make long macros shorter
 %global sameevr   %{epoch}:%{version}-%{release}
 %global compatver 10.0
-%global bugfixver 15
+%global bugfixver 16
 
 Name:             mariadb
 Version:          %{compatver}.%{bugfixver}
-Release:          4%{?with_debug:.debug}%{?dist}
+Release:          1%{?with_debug:.debug}%{?dist}
 Epoch:            1
 
 Summary:          A community developed branch of MySQL
@@ -1202,6 +1202,10 @@ fi
 %endif
 
 %changelog
+* Tue Feb  3 2015 Jakub Dorňák <jdornak at redhat.com> - 1:10.0.16-9
+- Rebase to version 10.0.16
+  Resolves: #1187895
+
 * Tue Jan 06 2015 Honza Horak <hhorak at redhat.com> - 1:10.0.15-4
 - Disable failing tests connect.mrr, connect.updelx2 on ppc and s390
 
diff --git a/sources b/sources
index 1aea2ed..18a850f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-07e2ca1ad684c2dc5cb260717c4db41d  mariadb-10.0.15.tar.gz
+7b1a197ea5d4027833a3a2ed26fc4cae  mariadb-10.0.16.tar.gz