[mariadb/f18] Update to 5.5.31 and apply other changes from master
Honza Horak
hhorak at fedoraproject.org
Mon May 27 10:18:53 UTC 2013
commit 81bce5d85afde653a7b36965fcdfefad85c1e08b
Author: Honza Horák <hhorak at redhat.com>
Date: Mon May 27 12:18:14 2013 +0200
Update to 5.5.31 and apply other changes from master
.gitignore | 1 +
libmysql.version | 95 +++++++++++++++++++++++++++++++++++
mariadb-basedir.patch | 15 ++++++
mariadb-buffer.patch | 24 ---------
mariadb-tmpdir.patch | 87 ++++++++++++++++++++++++++++++++
mariadb.spec | 133 ++++++++++++++++++++++++-------------------------
sources | 2 +-
7 files changed, 265 insertions(+), 92 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2fd101e..18dcf25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/mariadb-5.5.28a.tar.gz
/mariadb-5.5.29.tar.gz
+/mariadb-5.5.31.tar.gz
diff --git a/libmysql.version b/libmysql.version
index d547b5d..d0e329c 100644
--- a/libmysql.version
+++ b/libmysql.version
@@ -146,3 +146,98 @@ libmysqlclient_18 {
# PHP's mysqli.so requires this (via the ER() macro)
mysql_client_errors;
};
+
+# symbols specific for mariadb
+libmysqlclient_18_mariadb {
+ global:
+ # symbols related to non-blocking operations
+ # documented here: https://kb.askmonty.org/en/non-blocking-api-reference/
+ mysql_get_socket;
+ mysql_get_timeout_value;
+ mysql_get_timeout_value_ms;
+ mysql_real_connect_start;
+ mysql_real_connect_cont;
+ mysql_real_query_start;
+ mysql_real_query_cont;
+ mysql_fetch_row_start;
+ mysql_fetch_row_cont;
+ mysql_set_character_set_start;
+ mysql_set_character_set_cont;
+ mysql_select_db_start;
+ mysql_select_db_cont;
+ mysql_send_query_start;
+ mysql_send_query_cont;
+ mysql_store_result_start;
+ mysql_store_result_cont;
+ mysql_free_result_start;
+ mysql_free_result_cont;
+ mysql_close_start;
+ mysql_close_cont;
+ mysql_change_user_start;
+ mysql_change_user_cont;
+ mysql_query_start;
+ mysql_query_cont;
+ mysql_shutdown_start;
+ mysql_shutdown_cont;
+ mysql_dump_debug_info_start;
+ mysql_dump_debug_info_cont;
+ mysql_refresh_start;
+ mysql_refresh_cont;
+ mysql_kill_start;
+ mysql_kill_cont;
+ mysql_set_server_option_start;
+ mysql_set_server_option_cont;
+ mysql_ping_start;
+ mysql_ping_cont;
+ mysql_stat_start;
+ mysql_stat_cont;
+ mysql_list_dbs_start;
+ mysql_list_dbs_cont;
+ mysql_list_tables_start;
+ mysql_list_tables_cont;
+ mysql_list_processes_start;
+ mysql_list_processes_cont;
+ mysql_list_fields_start;
+ mysql_list_fields_cont;
+ mysql_read_query_result_start;
+ mysql_read_query_result_cont;
+ mysql_stmt_prepare_start;
+ mysql_stmt_prepare_cont;
+ mysql_stmt_execute_start;
+ mysql_stmt_execute_cont;
+ mysql_stmt_fetch_start;
+ mysql_stmt_fetch_cont;
+ mysql_stmt_store_result_start;
+ mysql_stmt_store_result_cont;
+ mysql_stmt_close_start;
+ mysql_stmt_close_cont;
+ mysql_stmt_reset_start;
+ mysql_stmt_reset_cont;
+ mysql_stmt_free_result_start;
+ mysql_stmt_free_result_cont;
+ mysql_stmt_send_long_data_start;
+ mysql_stmt_send_long_data_cont;
+ mysql_commit_start;
+ mysql_commit_cont;
+ mysql_rollback_start;
+ mysql_rollback_cont;
+ mysql_autocommit_start;
+ mysql_autocommit_cont;
+ mysql_next_result_start;
+ mysql_next_result_cont;
+ mysql_stmt_next_result_start;
+ mysql_stmt_next_result_cont;
+ # dynamic columns API
+ # documented here: https://kb.askmonty.org/en/dynamic-columns-api/
+ # currently only documentation for mariadb-10.0.x available, but
+ # upstream promissed adding 5.5.x version as well
+ dynamic_column_create;
+ dynamic_column_create_many;
+ dynamic_column_update;
+ dynamic_column_update_many;
+ dynamic_column_delete;
+ dynamic_column_exists;
+ dynamic_column_list;
+ dynamic_column_get;
+ dynamic_column_prepare_decimal;
+};
diff --git a/mariadb-basedir.patch b/mariadb-basedir.patch
new file mode 100644
index 0000000..f5a5ebf
--- /dev/null
+++ b/mariadb-basedir.patch
@@ -0,0 +1,15 @@
+Don't guess basedir in mysql_config; we place it under _libdir because
+of multilib conflicts, so use rather configured @prefix@ path directly.
+
+diff -up mariadb-5.5.29/scripts/mysql_config.sh.basedir mariadb-5.5.29/scripts/mysql_config.sh
+--- mariadb-5.5.29/scripts/mysql_config.sh.basedir 2013-02-28 09:39:26.628440114 +0100
++++ mariadb-5.5.29/scripts/mysql_config.sh 2013-02-28 09:39:40.613439729 +0100
+@@ -76,7 +76,7 @@ get_full_path ()
+
+ me=`get_full_path $0`
+
+-basedir=`echo $me | sed -e 's;/bin/mysql_config;;'`
++basedir='@prefix@'
+
+ ldata='@localstatedir@'
+ execdir='@libexecdir@'
diff --git a/mariadb-tmpdir.patch b/mariadb-tmpdir.patch
new file mode 100644
index 0000000..debb1b7
--- /dev/null
+++ b/mariadb-tmpdir.patch
@@ -0,0 +1,87 @@
+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 09e5c03..c8c9a40 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1,6 +1,6 @@
Name: mariadb
-Version: 5.5.29
-Release: 4%{?dist}
+Version: 5.5.31
+Release: 1%{?dist}
Summary: A community developed branch of MySQL
Group: Applications/Databases
@@ -11,12 +11,6 @@ URL: http://mariadb.org
# Some code related to test-suite is under LGPLv2
License: GPLv2 with exceptions and LGPLv2 and BSD
-# The last known mysql release
-%global last_mysql_evr %{version}-%{release}
-
-# Should mariadb obsolete mysql?
-%{!?obsoletemysql:%global obsoletemysql 0}
-
# Regression tests take a long time, you can skip 'em with this
%{!?runselftest:%global runselftest 1}
@@ -52,7 +46,8 @@ Patch10: mariadb-file-contents.patch
Patch11: mariadb-string-overflow.patch
Patch12: mariadb-dh1024.patch
Patch13: mariadb-man-plugin.patch
-Patch14: mariadb-buffer.patch
+Patch14: mariadb-basedir.patch
+Patch15: mariadb-tmpdir.patch
BuildRequires: perl, readline-devel, openssl-devel
BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
@@ -61,7 +56,7 @@ BuildRequires: systemd-units, systemtap-sdt-devel
BuildRequires: time procps
# perl modules needed to run regression tests
BuildRequires: perl(Socket), perl(Time::HiRes)
-BuildRequires: perl(Data::Dumper), perl(Test::More)
+BuildRequires: perl(Data::Dumper), perl(Test::More), perl(Env)
Requires: real-%{name}-libs%{?_isa} = %{version}-%{release}
Requires: grep, fileutils, bash
@@ -75,11 +70,7 @@ Provides: mysql = %{version}-%{release}
Provides: mysql%{?_isa} = %{version}-%{release}
Provides: real-%{name} = %{version}-%{release}
Provides: real-%{name}%{?_isa} = %{version}-%{release}
-%if 0%obsoletemysql
-Obsoletes: mysql < %{last_mysql_evr}
-%else
Conflicts: real-mysql
-%endif
# mysql-cluster used to be built from this SRPM, but no more
Obsoletes: mysql-cluster < 5.1.44
@@ -107,11 +98,7 @@ Provides: mysql-libs = %{version}-%{release}
Provides: mysql-libs%{?_isa} = %{version}-%{release}
Provides: real-%{name}-libs = %{version}-%{release}
Provides: real-%{name}-libs%{?_isa} = %{version}-%{release}
-%if 0%obsoletemysql
-Obsoletes: mysql-libs < %{last_mysql_evr}
-%else
Conflicts: real-mysql-libs
-%endif
%description libs
The mariadb-libs package provides the essential shared libraries for any
@@ -144,11 +131,7 @@ Provides: mysql-server = %{version}-%{release}
Provides: mysql-server%{?_isa} = %{version}-%{release}
Provides: real-%{name}-server = %{version}-%{release}
Provides: real-%{name}-server%{?_isa} = %{version}-%{release}
-%if 0%obsoletemysql
-Obsoletes: mysql-server < %{last_mysql_evr}
-%else
Conflicts: real-mysql-server
-%endif
%description server
MariaDB is a multi-user, multi-threaded SQL database server. It is a
@@ -169,11 +152,7 @@ Provides: mysql-devel = %{version}-%{release}
Provides: mysql-devel%{?_isa} = %{version}-%{release}
Provides: real-%{name}-devel = %{version}-%{release}
Provides: real-%{name}-devel%{?_isa} = %{version}-%{release}
-%if 0%obsoletemysql
-Obsoletes: mysql-devel < %{last_mysql_evr}
-%else
Conflicts: real-mysql-devel
-%endif
%description devel
MariaDB is a multi-user, multi-threaded SQL database server. This
@@ -190,11 +169,7 @@ Provides: mysql-embedded = %{version}-%{release}
Provides: mysql-embedded%{?_isa} = %{version}-%{release}
Provides: real-%{name}-embedded = %{version}-%{release}
Provides: real-%{name}-embedded%{?_isa} = %{version}-%{release}
-%if 0%obsoletemysql
-Obsoletes: mysql-embedded < %{last_mysql_evr}
-%else
Conflicts: real-mysql-embedded
-%endif
%description embedded
MariaDB is a multi-user, multi-threaded SQL database server. This
@@ -212,11 +187,7 @@ Provides: mysql-embedded-devel = %{version}-%{release}
Provides: mysql-embedded-devel%{?_isa} = %{version}-%{release}
Provides: real-%{name}-embedded-devel = %{version}-%{release}
Provides: real-%{name}-embedded-devel%{?_isa} = %{version}-%{release}
-%if 0%obsoletemysql
-Obsoletes: mysql-embedded-devel < %{last_mysql_evr}
-%else
Conflicts: real-mysql-embedded-devel
-%endif
%description embedded-devel
MariaDB is a multi-user, multi-threaded SQL database server. This
@@ -234,11 +205,7 @@ Provides: mysql-bench = %{version}-%{release}
Provides: mysql-bench%{?_isa} = %{version}-%{release}
Provides: real-%{name}-bench = %{version}-%{release}
Provides: real-%{name}-bench%{?_isa} = %{version}-%{release}
-%if 0%obsoletemysql
-Obsoletes: mysql-bench < %{last_mysql_evr}
-%else
Conflicts: real-mysql-bench
-%endif
%description bench
MariaDB is a multi-user, multi-threaded SQL database server. This
@@ -250,6 +217,7 @@ MariaDB is a community developed branch of MySQL.
Summary: The test suite distributed with MariaD
Group: Applications/Databases
+Requires: perl(Data::Dumper), perl(Test::More), perl(Env)
Requires: real-%{name}%{?_isa} = %{version}-%{release}
Requires: real-%{name}-libs%{?_isa} = %{version}-%{release}
Requires: real-%{name}-server%{?_isa} = %{version}-%{release}
@@ -258,11 +226,7 @@ Provides: mysql-test = %{version}-%{release}
Provides: mysql-test%{?_isa} = %{version}-%{release}
Provides: real-%{name}-test = %{version}-%{release}
Provides: real-%{name}-test%{?_isa} = %{version}-%{release}
-%if 0%obsoletemysql
-Obsoletes: mysql-test < %{last_mysql_evr}
-%else
Conflicts: real-mysql-test
-%endif
%description test
MariaDB is a multi-user, multi-threaded SQL database server. This
@@ -287,12 +251,13 @@ MariaDB is a community developed branch of MySQL.
%patch12 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
# workaround for upstream bug #56342
rm -f mysql-test/t/ssl_8k_key-master.opt
# upstream has fallen down badly on symbol versioning, do it ourselves
-cp %{SOURCE8} libmysql/libmysql.version
+cp -p %{SOURCE8} libmysql/libmysql.version
# generate a list of tests that fail, but are not disabled by upstream
cat %{SOURCE14} > mysql-test/rh-skipped-tests.list
@@ -301,15 +266,12 @@ cat %{SOURCE14} > mysql-test/rh-skipped-tests.list
cat %{SOURCE15} >> mysql-test/rh-skipped-tests.list
%endif
# disable some tests failing on ppc and s390
-%ifarch ppc ppc64 s390 s390x
+%ifarch ppc ppc64 ppc64p7 s390 s390x
echo "main.gis-precise : rhbz#906367" >> mysql-test/rh-skipped-tests.list
%endif
-%ifarch ppc s390
-echo "main.myisampack : rhbz#906367" >> mysql-test/rh-skipped-tests.list
-%endif
# install mysql_plugin
-cp %{SOURCE16} man/
+cp -p %{SOURCE16} man/
%build
@@ -363,6 +325,7 @@ cmake . -DBUILD_CONFIG=mysql_release \
-DWITH_READLINE=ON \
-DWITH_SSL=system \
-DWITH_ZLIB=system \
+ -DTMPDIR=/var/tmp \
-DWITH_MYSQLD_LDFLAGS="-Wl,-z,relro,-z,now"
make %{?_smp_mflags} VERBOSE=1
@@ -372,7 +335,7 @@ make %{?_smp_mflags} VERBOSE=1
# is expected by scripts
for e in innobase xtradb ; do
for f in pars0grm.c pars0grm.y pars0lex.l lexyy.c ; do
- cp "storage/$e/pars/$f" "storage/$e/$f"
+ cp -p "storage/$e/pars/$f" "storage/$e/$f"
done
done
@@ -380,7 +343,7 @@ done
%if %runselftest
# hack to let 32- and 64-bit tests run concurrently on same build machine
case `uname -m` in
- ppc64 | s390x | x86_64 | sparc64 )
+ ppc64 | ppc64p7 | s390x | x86_64 | sparc64 )
MTR_BUILD_THREAD=7
;;
*)
@@ -404,9 +367,6 @@ done
cd mysql-test
perl ./mysql-test-run.pl --force --retry=0 --ssl \
--skip-test-list=rh-skipped-tests.list \
-%ifarch ppc ppc64
- --nowarnings \
-%endif
--suite-timeout=720 --testcase-timeout=30
# cmake build scripts will install the var cruft if left alone :-(
rm -rf var
@@ -422,9 +382,11 @@ find $RPM_BUILD_ROOT -print | sed "s|^$RPM_BUILD_ROOT||" | sort > ROOTFILES
# multilib header hacks
# we only apply this to known Red Hat multilib arches, per bug #181335
case `uname -i` in
- i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
- mv $RPM_BUILD_ROOT/usr/include/mysql/my_config.h $RPM_BUILD_ROOT/usr/include/mysql/my_config_`uname -i`.h
- install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/mysql/
+ i386 | x86_64 | ppc | ppc64 | ppc64p7 | s390 | s390x | sparc | sparc64 )
+ mv $RPM_BUILD_ROOT%{_includedir}/mysql/my_config.h $RPM_BUILD_ROOT%{_includedir}/mysql/my_config_`uname -i`.h
+ mv $RPM_BUILD_ROOT%{_includedir}/mysql/private/config.h $RPM_BUILD_ROOT%{_includedir}/mysql/private/my_config_`uname -i`.h
+ install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/mysql/
+ install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/mysql/private/config.h
;;
*)
;;
@@ -436,13 +398,13 @@ esac
# libmysqlclient_r anymore either.
sed -e 's/-lprobes_mysql//' -e 's/-lmysqlclient_r/-lmysqlclient/' \
${RPM_BUILD_ROOT}%{_bindir}/mysql_config >mysql_config.tmp
-cp -f mysql_config.tmp ${RPM_BUILD_ROOT}%{_bindir}/mysql_config
+cp -p -f mysql_config.tmp ${RPM_BUILD_ROOT}%{_bindir}/mysql_config
chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/mysql_config
# install INFO_SRC, INFO_BIN into libdir (upstream thinks these are doc files,
# but that's pretty wacko --- see also mariadb-file-contents.patch)
-install -m 644 Docs/INFO_SRC ${RPM_BUILD_ROOT}%{_libdir}/mysql/
-install -m 644 Docs/INFO_BIN ${RPM_BUILD_ROOT}%{_libdir}/mysql/
+mv ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/INFO_SRC ${RPM_BUILD_ROOT}%{_libdir}/mysql/
+mv ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/INFO_BIN ${RPM_BUILD_ROOT}%{_libdir}/mysql/
mkdir -p $RPM_BUILD_ROOT/var/log
touch $RPM_BUILD_ROOT/var/log/mysqld.log
@@ -451,16 +413,16 @@ mkdir -p $RPM_BUILD_ROOT/var/run/mysqld
install -m 0755 -d $RPM_BUILD_ROOT/var/lib/mysql
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/my.cnf
+install -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/my.cnf
# install systemd unit files and scripts for handling server startup
mkdir -p ${RPM_BUILD_ROOT}%{_unitdir}
-install -m 644 %{SOURCE11} ${RPM_BUILD_ROOT}%{_unitdir}/
-install -m 755 %{SOURCE12} ${RPM_BUILD_ROOT}%{_libexecdir}/
-install -m 755 %{SOURCE13} ${RPM_BUILD_ROOT}%{_libexecdir}/
+install -p -m 644 %{SOURCE11} ${RPM_BUILD_ROOT}%{_unitdir}/
+install -p -m 755 %{SOURCE12} ${RPM_BUILD_ROOT}%{_libexecdir}/
+install -p -m 755 %{SOURCE13} ${RPM_BUILD_ROOT}%{_libexecdir}/
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d
-install -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/%{name}.conf
+install -p -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/%{name}.conf
# Fix funny permissions that cmake build scripts apply to config files
chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/mysql/config.*.ini
@@ -497,6 +459,7 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql.server
rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysqld_multi.server
rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-stress-test.pl.1*
rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-test-run.pl.1*
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/mytop
# put logrotate script where it needs to be
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
@@ -507,8 +470,8 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/mysql" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
# copy additional docs into build tree so %%doc will find them
-cp %{SOURCE6} README.mysql-docs
-cp %{SOURCE7} README.mysql-license
+cp -p %{SOURCE6} README.mysql-docs
+cp -p %{SOURCE7} README.mysql-license
# install the list of skipped tests to be available for user runs
install -m 0644 mysql-test/rh-skipped-tests.list ${RPM_BUILD_ROOT}%{_datadir}/mysql-test
@@ -608,7 +571,6 @@ fi
%{_bindir}/mysqlshow
%{_bindir}/mysqlslap
%{_bindir}/my_print_defaults
-%{_bindir}/mytop
%{_bindir}/aria_chk
%{_bindir}/aria_dump_log
%{_bindir}/aria_ftdump
@@ -788,6 +750,43 @@ fi
%{_mandir}/man1/mysql_client_test.1*
%changelog
+* Fri May 24 2013 Honza Horak <hhorak at redhat.com> 5.5.31-1
+- Rebase to 5.5.31
+ https://kb.askmonty.org/en/mariadb-5531-changelog/
+- Preserve time-stamps in case of installed files
+- Use /var/tmp instead of /tmp, since the later is using tmpfs,
+ which can cause problems
+ Resolves: #962087
+- Fix test suite requirements
+
+* Sun May 5 2013 Honza Horak <hhorak at redhat.com> 5.5.30-2
+- Remove mytop utility, which is packaged separately
+- Resolve multilib conflicts in mysql/private/config.h
+
+* Fri Mar 22 2013 Honza Horak <hhorak at redhat.com> 5.5.30-1
+- Rebase to 5.5.30
+ https://kb.askmonty.org/en/mariadb-5530-changelog/
+
+* Wed Mar 13 2013 Honza Horak <hhorak at redhat.com> 5.5.29-9
+- Let mariadb-embedded-devel conflict with MySQL-embedded-devel
+- Adjust mariadb-sortbuffer.patch to correspond with upstream patch
+
+* Mon Mar 4 2013 Honza Horak <hhorak at redhat.com> 5.5.29-8
+- Mask expected warnings about setrlimit in test suite
+
+* Thu Feb 28 2013 Honza Horak <hhorak at redhat.com> 5.5.29-7
+- Use configured prefix value instead of guessing basedir
+ in mysql_config
+Resolves: #916189
+- Export dynamic columns and non-blocking API functions documented
+ by upstream
+
+* Wed Feb 27 2013 Honza Horak <hhorak at redhat.com> 5.5.29-6
+- Fix sort_buffer_length option type
+
+* Wed Feb 13 2013 Honza Horak <hhorak at redhat.com> 5.5.29-5
+- Suppress warnings in tests and skip tests also on ppc64p7
+
* Tue Feb 12 2013 Honza Horak <hhorak at redhat.com> 5.5.29-4
- Suppress warning in tests on ppc
- Enable fixed index_merge_myisam test case
diff --git a/sources b/sources
index 87b951f..0b3b78a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-643cca7f07f7b00ca3ae1515e6f245d6 mariadb-5.5.29.tar.gz
+3fe756bc76f0e7a3af2757e48ce0f3f4 mariadb-5.5.31.tar.gz
More information about the scm-commits
mailing list