[mariadb/f19] Rebase to 5.5.33a

[Honza Horak]

commit 5325328c09d856406b9577294ea1141cf9dfddb8
Author: Honza Horák <hhorak at redhat.com>
Date:   Fri Oct 11 09:58:06 2013 +0200

    Rebase to 5.5.33a
    
    Conflicts:
    	mariadb.spec

 .gitignore           |    1 +
 mariadb-errno.patch  |   14 ++++----
 mariadb-tmpdir.patch |   87 --------------------------------------------------
 mariadb.spec         |   22 +++++++++---
 sources              |    2 +-
 5 files changed, 25 insertions(+), 101 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6656fad..b5a0d4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /mariadb-5.5.30.tar.gz
 /mariadb-5.5.31.tar.gz
 /mariadb-5.5.32.tar.gz
+/mariadb-5.5.33a.tar.gz
diff --git a/mariadb-errno.patch b/mariadb-errno.patch
index bcacf6c..8c1c10c 100644
--- a/mariadb-errno.patch
+++ b/mariadb-errno.patch
@@ -1,20 +1,20 @@
 "extern int errno" is just a really bad idea.
 
-diff -up mariadb-5.5.28a/include/my_sys.h.p1 mariadb-5.5.28a/include/my_sys.h
---- mariadb-5.5.28a/include/my_sys.h.p1	2012-12-17 16:06:12.942346553 +0100
-+++ mariadb-5.5.28a/include/my_sys.h	2012-12-17 16:06:51.085361555 +0100
-@@ -189,13 +189,8 @@ extern void my_large_free(uchar *ptr);
+diff -up mariadb-5.5.33a/include/my_sys.h.p1 mariadb-5.5.33a/include/my_sys.h
+--- mariadb-5.5.33a/include/my_sys.h.p1	2013-10-10 13:37:11.391507810 +0200
++++ mariadb-5.5.33a/include/my_sys.h	2013-10-10 13:37:57.395519715 +0200
+@@ -190,13 +190,7 @@ extern void my_large_free(uchar *ptr);
  #define my_safe_alloca(size, min_length) ((size <= min_length) ? my_alloca(size) : my_malloc(size,MYF(MY_FAE)))
  #define my_safe_afree(ptr, size, min_length) ((size <= min_length) ? my_afree(ptr) : my_free(ptr))
  
 -#ifndef errno				/* did we already get it? */
 -#ifdef HAVE_ERRNO_AS_DEFINE
- #include <errno.h>			/* errno is a define */
+-#include <errno.h>			/* errno is a define */
 -#else
 -extern int errno;			/* declare errno */
 -#endif
 -#endif					/* #ifndef errno */
-+
++#include <errno.h>                     /* errno is a define */
  extern char *home_dir;			/* Home directory for user */
+ extern MYSQL_PLUGIN_IMPORT char  *mysql_data_home;
  extern const char *my_progname;		/* program-name (printed in errors) */
- extern const char *my_progname_short;	/* like above but without directory */
diff --git a/mariadb.spec b/mariadb.spec
index 154b23d..600213b 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -2,8 +2,8 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name: mariadb
-Version: 5.5.32
-Release: 8%{?dist}
+Version: 5.5.33a
+Release: 1%{?dist}
 Epoch: 1
 
 Summary: A community developed branch of MySQL
@@ -60,9 +60,10 @@ Patch10: mariadb-file-contents.patch
 Patch11: mariadb-string-overflow.patch
 Patch12: mariadb-dh1024.patch
 Patch14: mariadb-basedir.patch
-Patch15: mariadb-tmpdir.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
@@ -248,7 +249,7 @@ MariaDB is a community developed branch of MySQL.
 %prep
 %setup -q -n mariadb-%{version}
 
-%patch1 -p1
+%patch1 -p1 -b .p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -261,9 +262,10 @@ MariaDB is a community developed branch of MySQL.
 %patch11 -p1
 %patch12 -p1
 %patch14 -p1
-%patch15 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 # workaround for upstream bug #56342
 rm -f mysql-test/t/ssl_8k_key-master.opt
@@ -338,7 +340,8 @@ cmake . -DBUILD_CONFIG=mysql_release \
 	-DWITH_READLINE=ON \
 	-DWITH_SSL=system \
 	-DWITH_ZLIB=system \
-	-DTMPDIR=/var/tmp \
+	-DWITH_JEMALLOC=no \
+	-DTMPDIR=%{_localstatedir}/tmp \
 	-DWITH_MYSQLD_LDFLAGS="-Wl,-z,relro,-z,now"
 
 make %{?_smp_mflags} VERBOSE=1
@@ -579,6 +582,7 @@ fi
 %{_bindir}/mysqlbinlog
 %{_bindir}/mysqlcheck
 %{_bindir}/mysqldump
+%{_bindir}/tokuftdump
 %{_bindir}/mysqlimport
 %{_bindir}/mysqlshow
 %{_bindir}/mysqlslap
@@ -672,6 +676,7 @@ fi
 %{_bindir}/resolveip
 
 %config(noreplace) %{_sysconfdir}/my.cnf.d/server.cnf
+%config(noreplace) %{_sysconfdir}/my.cnf.d/tokudb.cnf
 
 %{_libexecdir}/mysqld
 
@@ -763,6 +768,11 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Thu Oct 10 2013 Honza Horak <hhorak at redhat.com> 1:5.5.33a-1
+- Rebase to 5.5.33a
+  https://kb.askmonty.org/en/mariadb-5533-changelog/
+  https://kb.askmonty.org/en/mariadb-5533a-changelog/
+
 * Wed Aug 14 2013 Rex Dieter <rdieter at fedoraproject.org> 1:5.5.32-8
 - fix alternatives usage
 
diff --git a/sources b/sources
index 1e9f3ca..54bd63e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-565c2dce6a2fb027c9d0ffbae4934135  mariadb-5.5.32.tar.gz
+00449a034b88490f16bd679b800bb850  mariadb-5.5.33a.tar.gz