From 26fa8b35cd84934b21305bd0e0aecaf9ef3b74c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Honza=20Hor=C3=A1k?= <hhorak@redhat.com>
Date: Fri, 22 Nov 2013 08:55:22 +0100
Subject: [PATCH] Rebase to 5.5.34

---
 .gitignore                  |  1 +
 mariadb-cmakehostname.patch | 14 --------------
 mariadb-file-contents.patch | 10 +++++-----
 mariadb.spec                |  9 +++++----
 sources                     |  2 +-
 5 files changed, 12 insertions(+), 24 deletions(-)
 delete mode 100644 mariadb-cmakehostname.patch

diff --git a/.gitignore b/.gitignore
index b5a0d4f..3f42815 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,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-cmakehostname.patch b/mariadb-cmakehostname.patch
deleted file mode 100644
index e3fba15..0000000
--- a/mariadb-cmakehostname.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream bug report: https://mariadb.atlassian.net/browse/MDEV-5124
-
-diff -up mariadb-5.5.33a/storage/tokudb/ft-index/cmake_modules/TokuSetupCTest.cmake.cmakehostname mariadb-5.5.33a/storage/tokudb/ft-index/cmake_modules/TokuSetupCTest.cmake
---- mariadb-5.5.33a/storage/tokudb/ft-index/cmake_modules/TokuSetupCTest.cmake.cmakehostname	2013-10-10 16:21:18.904236776 +0200
-+++ mariadb-5.5.33a/storage/tokudb/ft-index/cmake_modules/TokuSetupCTest.cmake	2013-10-10 16:21:29.718243555 +0200
-@@ -60,7 +60,7 @@ macro(hostname out)
-     COMMAND hostname
-     OUTPUT_VARIABLE fullhostname
-     OUTPUT_STRIP_TRAILING_WHITESPACE)
--  string(REGEX REPLACE "\\.tokutek\\.com$" "" ${out} ${fullhostname})
-+  string(REGEX REPLACE "\\.tokutek\\.com$" "" ${out} "${fullhostname}")
- endmacro(hostname)
- 
- ## gather machine info
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 af96139..3f2cd48 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -6,8 +6,8 @@
 %bcond_with tokudb
 
 Name: mariadb
-Version: 5.5.33a
-Release: 4%{?dist}
+Version: 5.5.34
+Release: 1%{?dist}
 Epoch: 1
 
 Summary: A community developed branch of MySQL
@@ -68,7 +68,6 @@ Patch14: mariadb-basedir.patch
 Patch17: mariadb-covscan-signexpr.patch
 Patch18: mariadb-covscan-stroverflow.patch
 Patch19: mariadb-config.patch
-Patch20: mariadb-cmakehostname.patch
 
 BuildRequires: perl, readline-devel, openssl-devel
 BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
@@ -272,7 +271,6 @@ MariaDB is a community developed branch of MySQL.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
-%patch20 -p1
 
 # workaround for upstream bug #56342
 rm -f mysql-test/t/ssl_8k_key-master.opt
@@ -801,6 +799,9 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Fri Nov 22 2013 Honza Horak <hhorak@redhat.com> 1:5.5.34-1
+- Rebase to 5.5.34
+
 * Mon Nov  4 2013 Honza Horak <hhorak@redhat.com> 1:5.5.33a-4
 - Fix spec file to be ready for backport by Oden Eriksson
   Resolves: #1026404
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