[mariadb/el6] Rebase to 5.5.34

[Honza Horak]

commit 37e66de69585f7e2bda945fa4227e594295711f0
Author: Honza Horák <hhorak at redhat.com>
Date:   Fri Nov 22 08:55:22 2013 +0100

    Rebase to 5.5.34
    
    Conflicts:
    	mariadb.spec

 .gitignore                  |    1 +
 mariadb-cmakehostname.patch |   14 --------------
 mariadb-file-contents.patch |   10 +++++-----
 mariadb.spec                |    9 +++++----
 sources                     |    2 +-
 5 files changed, 12 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eac70fa..0a280e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /mariadb-5.5.31.tar.gz
 /mariadb-5.5.32.tar.gz
 /mariadb-5.5.33a.tar.gz
+/mariadb-5.5.34.tar.gz
diff --git a/mariadb-file-contents.patch b/mariadb-file-contents.patch
index f96640f..8ad8c73 100644
--- a/mariadb-file-contents.patch
+++ b/mariadb-file-contents.patch
@@ -6,9 +6,9 @@ to know about this.
 Recommendation they change is at http://bugs.mysql.com/bug.php?id=61425
 
 
-diff -up mariadb-5.5.28a/mysql-test/t/file_contents.test.p19 mariadb-5.5.28a/mysql-test/t/file_contents.test
---- mariadb-5.5.28a/mysql-test/t/file_contents.test.p19	2012-11-28 16:49:38.000000000 +0100
-+++ mariadb-5.5.28a/mysql-test/t/file_contents.test	2012-12-17 17:44:26.802139136 +0100
+diff -up mariadb-5.5.34/mysql-test/t/file_contents.test.p10 mariadb-5.5.34/mysql-test/t/file_contents.test
+--- mariadb-5.5.34/mysql-test/t/file_contents.test.p10	2013-11-20 13:28:56.000000000 +0100
++++ mariadb-5.5.34/mysql-test/t/file_contents.test	2013-11-22 08:50:30.244702013 +0100
 @@ -32,6 +32,15 @@ if ($dir_bin eq '/usr/') {
      # RedHat/Debian: version number in directory name
      $dir_docs = glob "$dir_docs/mariadb-server-*";
@@ -23,5 +23,5 @@ diff -up mariadb-5.5.28a/mysql-test/t/file_contents.test.p19 mariadb-5.5.28a/mys
 +       $dir_docs = "/usr/lib/mysql";
 +    }
    }
- } else {
-   # tar.gz package, Windows, or developer work (in BZR)
+   # Slackware
+   $dir_docs = glob "$dir_bin/doc/mariadb-[0-9]*" unless -d $dir_docs;
diff --git a/mariadb.spec b/mariadb.spec
index 8a48342..6d78cc2 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -6,8 +6,8 @@
 %bcond_with tokudb
 
 Name: mariadb
-Version: 5.5.33a
-Release: 6%{?dist}
+Version: 5.5.34
+Release: 1%{?dist}
 
 Summary: A community developed branch of MySQL
 Group: Applications/Databases
@@ -50,7 +50,6 @@ Patch12: mariadb-dh1024.patch
 Patch14: mariadb-basedir.patch
 Patch17: mariadb-covscan-signexpr.patch
 Patch18: mariadb-covscan-stroverflow.patch
-Patch20: mariadb-cmakehostname.patch
 
 BuildRequires: perl, readline-devel, openssl-devel
 BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
@@ -250,7 +249,6 @@ MariaDB is a community developed branch of MySQL.
 %patch14 -p1
 %patch17 -p1
 %patch18 -p1
-%patch20 -p1
 
 # workaround for upstream bug #56342
 rm -f mysql-test/t/ssl_8k_key-master.opt
@@ -742,6 +740,9 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Mon Nov 25 2013 Honza Horak <hhorak at redhat.com> 1:5.5.34-1
+- Rebase to 5.5.34
+
 * Wed Nov 20 2013 Honza Horak <hhorak at redhat.com> 1:5.5.33a-6
 - Allow main.mysql_client_test_nonblock test
 
diff --git a/sources b/sources
index 54bd63e..0958b05 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-00449a034b88490f16bd679b800bb850  mariadb-5.5.33a.tar.gz
+4f2f3da7687c64f589ce1e0fc6e3cfc9  mariadb-5.5.34.tar.gz