From 5df5e512dc4f5298a9d4329341dc62e4d0932394 Mon Sep 17 00:00:00 2001 From: Honza Horák Date: Oct 11 2013 07:58:06 +0000 Subject: Rebase to 5.5.33a --- 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 is a define */ +-#include /* errno is a define */ -#else -extern int errno; /* declare errno */ -#endif -#endif /* #ifndef errno */ -+ ++#include /* 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-tmpdir.patch b/mariadb-tmpdir.patch deleted file mode 100644 index debb1b7..0000000 --- a/mariadb-tmpdir.patch +++ /dev/null @@ -1,87 +0,0 @@ -Directory /tmp is now on tmpfs, which can cause problems with limitted space -or replication. It's documented here: -http://dev.mysql.com/doc/refman/5.5/en/server-options.html#option_mysqld_tmpdir - -"If the MySQL server is acting as a replication slave, you should not set --tmpdir -to point to a directory on a memory-based file system or to a directory that is -cleared when the server host restarts." - -RHBZ#962087 -Upstream bug report: https://mariadb.atlassian.net/browse/MDEV-4165 -MySQL bug report: http://bugs.mysql.com/bug.php?id=68338 - -diff -up mariadb-5.5.31/CMakeLists.txt.tmpdir mariadb-5.5.31/CMakeLists.txt ---- mariadb-5.5.31/CMakeLists.txt.tmpdir 2013-05-22 00:09:51.000000000 +0200 -+++ mariadb-5.5.31/CMakeLists.txt 2013-05-24 13:28:47.830720926 +0200 -@@ -246,6 +246,9 @@ IF(INSTALL_SYSCONFDIR) - SET(DEFAULT_SYSCONFDIR "${INSTALL_SYSCONFDIR}") - ENDIF() - -+IF(TMPDIR) -+ SET(DEFAULT_TMPDIR "${TMPDIR}") -+ENDIF() - - # Run platform tests - INCLUDE(configure.cmake) -diff -up mariadb-5.5.31/config.h.cmake.tmpdir mariadb-5.5.31/config.h.cmake ---- mariadb-5.5.31/config.h.cmake.tmpdir 2013-05-22 00:09:48.000000000 +0200 -+++ mariadb-5.5.31/config.h.cmake 2013-05-24 13:27:38.828722133 +0200 -@@ -618,6 +618,7 @@ - #cmakedefine DEFAULT_CHARSET_HOME "@DEFAULT_CHARSET_HOME@" - #cmakedefine PLUGINDIR "@PLUGINDIR@" - #cmakedefine DEFAULT_SYSCONFDIR "@DEFAULT_SYSCONFDIR@" -+#cmakedefine DEFAULT_TMPDIR "@DEFAULT_TMPDIR@" - - #cmakedefine SO_EXT "@CMAKE_SHARED_MODULE_SUFFIX@" - -diff -up mariadb-5.5.31/include/my_global.h.tmpdir mariadb-5.5.31/include/my_global.h ---- mariadb-5.5.31/include/my_global.h.tmpdir 2013-05-22 00:09:48.000000000 +0200 -+++ mariadb-5.5.31/include/my_global.h 2013-05-24 13:27:38.829722133 +0200 -@@ -1513,4 +1513,11 @@ static inline double rint(double x) - - #endif /* EMBEDDED_LIBRARY */ - -+/* -+ Define default tmpdir if not already set. -+*/ -+#if !defined(DEFAULT_TMPDIR) -+#define DEFAULT_TMPDIR P_tmpdir -+#endif -+ - #endif /* my_global_h */ -diff -up mariadb-5.5.31/libmysqld/lib_sql.cc.tmpdir mariadb-5.5.31/libmysqld/lib_sql.cc ---- mariadb-5.5.31/libmysqld/lib_sql.cc.tmpdir 2013-05-22 00:09:48.000000000 +0200 -+++ mariadb-5.5.31/libmysqld/lib_sql.cc 2013-05-24 13:27:38.830722133 +0200 -@@ -559,7 +559,7 @@ int init_embedded_server(int argc, char - opt_mysql_tmpdir=getenv("TMP"); - #endif - if (!opt_mysql_tmpdir || !opt_mysql_tmpdir[0]) -- opt_mysql_tmpdir=(char*) P_tmpdir; /* purecov: inspected */ -+ opt_mysql_tmpdir=(char*) DEFAULT_TMPDIR; /* purecov: inspected */ - - init_ssl(); - umask(((~my_umask) & 0666)); -diff -up mariadb-5.5.31/mysys/mf_tempdir.c.tmpdir mariadb-5.5.31/mysys/mf_tempdir.c ---- mariadb-5.5.31/mysys/mf_tempdir.c.tmpdir 2013-05-22 00:09:51.000000000 +0200 -+++ mariadb-5.5.31/mysys/mf_tempdir.c 2013-05-24 13:27:38.831722133 +0200 -@@ -43,7 +43,7 @@ my_bool init_tmpdir(MY_TMPDIR *tmpdir, c - pathlist=getenv("TMP"); - #endif - if (!pathlist || !pathlist[0]) -- pathlist=(char*) P_tmpdir; -+ pathlist=(char*) DEFAULT_TMPDIR; - } - do - { -diff -up mariadb-5.5.31/mysys/mf_tempfile.c.tmpdir mariadb-5.5.31/mysys/mf_tempfile.c ---- mariadb-5.5.31/mysys/mf_tempfile.c.tmpdir 2013-05-22 00:09:51.000000000 +0200 -+++ mariadb-5.5.31/mysys/mf_tempfile.c 2013-05-24 13:27:38.832722133 +0200 -@@ -111,7 +111,7 @@ File create_temp_file(char *to, const ch - sizeof(prefix_buff)-7),"XXXXXX") - - prefix_buff); - if (!dir && ! (dir =getenv("TMPDIR"))) -- dir=P_tmpdir; -+ dir=DEFAULT_TMPDIR; - if (strlen(dir)+ pfx_len > FN_REFLEN-2) - { - errno=my_errno= ENAMETOOLONG; diff --git a/mariadb.spec b/mariadb.spec index 4b7158b..e2d9e17 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -2,8 +2,8 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: mariadb -Version: 5.5.32 -Release: 12%{?dist} +Version: 5.5.33a +Release: 1%{?dist} Epoch: 1 Summary: A community developed branch of MySQL @@ -61,10 +61,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 @@ -250,7 +250,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 @@ -263,10 +263,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 @@ -341,6 +341,7 @@ cmake . -DBUILD_CONFIG=mysql_release \ -DWITH_READLINE=ON \ -DWITH_SSL=system \ -DWITH_ZLIB=system \ + -DWITH_JEMALLOC=no \ -DTMPDIR=%{_localstatedir}/tmp \ -DWITH_MYSQLD_LDFLAGS="-Wl,-z,relro,-z,now" @@ -601,6 +602,7 @@ fi %{_bindir}/mysqlbinlog %{_bindir}/mysqlcheck %{_bindir}/mysqldump +%{_bindir}/tokuftdump %{_bindir}/mysqlimport %{_bindir}/mysqlshow %{_bindir}/mysqlslap @@ -694,6 +696,7 @@ fi %{_bindir}/resolveip %config(noreplace) %{_sysconfdir}/my.cnf.d/server.cnf +%config(noreplace) %{_sysconfdir}/my.cnf.d/tokudb.cnf %{_libexecdir}/mysqld @@ -788,6 +791,11 @@ fi %{_mandir}/man1/mysql_client_test.1* %changelog +* Thu Oct 10 2013 Honza Horak 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/ + * Mon Sep 2 2013 Honza Horak - 1:5.5.32-12 - Re-organize my.cnf to include only generic settings Resolves: #1003115 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