[mariadb/f21] Rebase to version 10.0.17

[Honza Horak]

commit 89aec4d216bf47af181389f0b6cba1e4f193272c
Author: Honza Horak <hhorak at redhat.com>
Date:   Wed Mar 4 13:18:32 2015 +0100

    Rebase to version 10.0.17
    
    Conflicts:
    	mariadb.spec

 .gitignore                  |   1 +
 mariadb-expired-certs.patch | 784 --------------------------------------------
 mariadb.spec                |   9 +-
 sources                     |   2 +-
 4 files changed, 7 insertions(+), 789 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fc356c5..27c91ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /mariadb-10.0.14.tar.gz
 /mariadb-10.0.15.tar.gz
 /mariadb-10.0.16.tar.gz
+/mariadb-10.0.17.tar.gz
diff --git a/mariadb.spec b/mariadb.spec
index 3bc3a5d..5e49e32 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 16
+%global bugfixver 17
 
 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
@@ -160,7 +160,6 @@ Patch5:           %{pkgnamepatch}-file-contents.patch
 Patch6:           %{pkgnamepatch}-dh1024.patch
 Patch7:           %{pkgnamepatch}-scripts.patch
 Patch8:           %{pkgnamepatch}-install-db-sharedir.patch
-Patch10:          %{pkgnamepatch}-expired-certs.patch
 
 # Patches specific for this mysql package
 Patch30:          %{pkgnamepatch}-errno.patch
@@ -499,7 +498,6 @@ MariaDB is a community developed branch of MySQL.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch10 -p1
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
@@ -1189,6 +1187,9 @@ fi
 %endif
 
 %changelog
+* Wed Mar 04 2015 Honza Horak <hhorak at redhat.com> - 1:10.0.17-1
+- Rebase to version 10.0.17
+
 * Wed Feb 18 2015 Matej Muzila <mmuzila at redhat.com> - 1:10.0.16-3
 - Enable tokudb
 
diff --git a/sources b/sources
index 18a850f..85d30fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7b1a197ea5d4027833a3a2ed26fc4cae  mariadb-10.0.16.tar.gz
+3101d1e79c1b04699cde10780f959625  mariadb-10.0.17.tar.gz