Rebase to 5.5.36

https://kb.askmonty.org/en/mariadb-5536-changelog/
2014-03-06 17:37:29 +01:00 · 2014-03-06 17:37:29 +01:00 · d213ff08cc
commit d213ff08cc
parent fff9c6f05a
3 changed files with 8 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,3 +6,4 @@
 /mariadb-5.5.33a.tar.gz
 /mariadb-5.5.34.tar.gz
 /mariadb-5.5.35.tar.gz
+/mariadb-5.5.36.tar.gz
--- a/mariadb.spec
+++ b/mariadb.spec
@ -6,8 +6,8 @@
 %bcond_with tokudb

 Name: mariadb
-Version: 5.5.35
-Release: 5%{?dist}
+Version: 5.5.36
+Release: 1%{?dist}
 Epoch: 1

 Summary: A community developed branch of MySQL
@ -808,6 +808,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*

 %changelog
+* Thu Mar 06 2014 Honza Horak <hhorak@redhat.com> - 1:5.5.36-1
+- Rebase to 5.5.36
+  https://kb.askmonty.org/en/mariadb-5536-changelog/
+
 * Tue Feb 25 2014 Honza Horak <hhorak@redhat.com> 1:5.5.35-5
 - Daemon helper scripts sanity changes and spec files clean-up

--- a/2
+++ b/2
@ -1 +1 @@
-c7183f96cfccbeb714c486d37f96051d  mariadb-5.5.35.tar.gz
+05f72957bedd8b1ea134c14173be9c25  mariadb-5.5.36.tar.gz