From 577c71be6596081209ef1324b76fb0e668c8ae42 Mon Sep 17 00:00:00 2001
From: Honza Horak <hhorak@redhat.com>
Date: Thu, 30 Jan 2014 17:53:19 +0100
Subject: [PATCH] Rebase to 5.5.35

https://kb.askmonty.org/en/mariadb-5535-changelog/
Also fixes: CVE-2014-0001, CVE-2014-0412, CVE-2014-0437, CVE-2013-5908, CVE-2014-0420, CVE-2014-0393, CVE-2013-5891, CVE-2014-0386, CVE-2014-0401, CVE-2014-0402

Resolves: #1054043
Resolves: #1059546
---
 .gitignore   |  1 +
 mariadb.spec | 13 +++++++++++--
 sources      |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3f42815..774f811 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /mariadb-5.5.32.tar.gz
 /mariadb-5.5.33a.tar.gz
 /mariadb-5.5.34.tar.gz
+/mariadb-5.5.35.tar.gz
diff --git a/mariadb.spec b/mariadb.spec
index ebc07af..1ef67ef 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -6,8 +6,8 @@
 %bcond_with tokudb
 
 Name: mariadb
-Version: 5.5.34
-Release: 9%{?dist}
+Version: 5.5.35
+Release: 1%{?dist}
 Epoch: 1
 
 Summary: A community developed branch of MySQL
@@ -803,6 +803,15 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Thu Jan 30 2014 Honza Horak <hhorak@redhat.com> 5.5.35-1
+- Rebase to 5.5.35
+  https://kb.askmonty.org/en/mariadb-5535-changelog/
+  Also fixes: CVE-2014-0001, CVE-2014-0412, CVE-2014-0437, CVE-2013-5908,
+  CVE-2014-0420, CVE-2014-0393, CVE-2013-5891, CVE-2014-0386, CVE-2014-0401,
+  CVE-2014-0402
+  Resolves: #1054043
+  Resolves: #1059546
+
 * Tue Jan 14 2014 Honza Horak <hhorak@redhat.com> - 1:5.5.34-9
 - Adopt compatible system versioning
   Related: #1045013
diff --git a/sources b/sources
index 0958b05..85f03e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f2f3da7687c64f589ce1e0fc6e3cfc9  mariadb-5.5.34.tar.gz
+c7183f96cfccbeb714c486d37f96051d  mariadb-5.5.35.tar.gz