From 022dacaa71023d60449e70d2cd3bb73cb5c857c9 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Tue, 17 Jun 2014 15:48:06 +0200 Subject: [PATCH] Update to MySQL 5.6.19, for various fixes described at https://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-19.html - outfile_loaddata resolved on all archs - Solaris files not installed, no need to remove - Simplify multilib install - Use install's -D option some places - Add explicit conflict with mariadb-galera-server --- .gitignore | 1 + community-mysql-rhbz1059545.patch | 17 ------------- community-mysql.spec | 41 +++++++++++++++++-------------- sources | 2 +- 4 files changed, 24 insertions(+), 37 deletions(-) delete mode 100644 community-mysql-rhbz1059545.patch diff --git a/.gitignore b/.gitignore index f7c6743..02af558 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /mysql-5.6.15.tar.gz /mysql-5.6.16.tar.gz /mysql-5.6.17.tar.gz +/mysql-5.6.19.tar.gz diff --git a/community-mysql-rhbz1059545.patch b/community-mysql-rhbz1059545.patch deleted file mode 100644 index ece8ef1..0000000 --- a/community-mysql-rhbz1059545.patch +++ /dev/null @@ -1,17 +0,0 @@ -Unsifficient limit check aims to security issue. - -MariaDB upstream fix: http://bazaar.launchpad.net/~maria-captains/maria/5.5/revision/2502.565.64 -RHBZ#1059545 - -diff -up mysql-5.6.15/client/mysql.cc.bz1059545 mysql-5.6.15/client/mysql.cc ---- mysql-5.6.15/client/mysql.cc.bz1059545 2014-01-30 18:09:47.209588217 +0100 -+++ mysql-5.6.15/client/mysql.cc 2014-01-30 18:09:59.016581192 +0100 -@@ -1315,7 +1315,7 @@ int main(int argc,char *argv[]) - - put_info("Welcome to the MySQL monitor. Commands end with ; or \\g.", - INFO_INFO); -- sprintf((char*) glob_buffer.ptr(), -+ my_snprintf((char*) glob_buffer.ptr(), glob_buffer.alloced_length(), - "Your MySQL connection id is %lu\nServer version: %s\n", - mysql_thread_id(&mysql), server_version_string(&mysql)); - put_info((char*) glob_buffer.ptr(),INFO_INFO); diff --git a/community-mysql.spec b/community-mysql.spec index b06dff6..b771873 100644 --- a/community-mysql.spec +++ b/community-mysql.spec @@ -15,8 +15,8 @@ %global skiplist platform-specific-tests.list Name: community-mysql -Version: 5.6.17 -Release: 3%{?dist} +Version: 5.6.19 +Release: 1%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases URL: http://www.mysql.com @@ -145,6 +145,7 @@ Requires: perl(DBD::mysql) Provides: mysql-server = %{version}-%{release} Provides: mysql-server%{?_isa} = %{version}-%{release} Conflicts: mariadb-server +Conflicts: mariadb-galera-server %description server MySQL is a multi-user, multi-threaded SQL database server. MySQL is a @@ -261,7 +262,6 @@ add_test 'perfschema.setup_objects : rh 741325' # Archs with collation issues, bugs.mysql.com/46895 %ifarch %{arm} aarch64 ppc %{power64} s390 s390x -add_test 'main.outfile_loaddata : 46895' add_test 'innodb.innodb_ctype_ldml : 46895' add_test 'main.ctype_ldml : 46895' %endif @@ -336,15 +336,12 @@ pushd build make DESTDIR=%{buildroot} install # multilib header support -%ifarch aarch64 %{ix86} x86_64 ppc %{power64} %{sparc} s390 s390x -mv %{buildroot}%{_includedir}/mysql/my_config.h %{buildroot}%{_includedir}/mysql/my_config_$(uname -i).h -install -p -m 644 %{SOURCE5} %{buildroot}%{_includedir}/mysql/ -mv %{buildroot}%{_bindir}/mysql_config %{buildroot}%{_bindir}/mysql_config-%{__isa_bits} -install -p -m 0755 %{SOURCE4} %{buildroot}%{_bindir}/mysql_config -%endif - +unamei=$(uname -i) %ifarch %{arm} -mv %{buildroot}%{_includedir}/mysql/my_config.h %{buildroot}%{_includedir}/mysql/my_config_arm.h +unamei=arm +%endif +%ifarch %{arm} aarch64 %{ix86} x86_64 ppc %{power64} %{sparc} s390 s390x +mv %{buildroot}%{_includedir}/mysql/my_config.h %{buildroot}%{_includedir}/mysql/my_config_$unamei.h install -p -m 644 %{SOURCE5} %{buildroot}%{_includedir}/mysql/ mv %{buildroot}%{_bindir}/mysql_config %{buildroot}%{_bindir}/mysql_config-%{__isa_bits} install -p -m 0755 %{SOURCE4} %{buildroot}%{_bindir}/mysql_config @@ -365,13 +362,11 @@ install -D -p -m 0644 %{SOURCE3} %{buildroot}/etc/my.cnf mkdir %{buildroot}%{_sysconfdir}/my.cnf.d # install systemd unit files and scripts for handling server startup -mkdir -p %{buildroot}%{_unitdir} -install -p -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/ +install -D -p -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/%{basename:%SOURCE11} install -p -m 755 %{SOURCE12} %{buildroot}%{_libexecdir}/ install -p -m 755 %{SOURCE13} %{buildroot}%{_libexecdir}/ -mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d -install -p -m 0644 %{SOURCE10} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf +install -D -p -m 0644 %{SOURCE10} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf # mysql-test includes one executable that doesn't belong under /usr/share, # so move it and provide a symlink @@ -386,7 +381,6 @@ rm -f %{buildroot}%{_datadir}/%{name}/binary-configure rm -f %{buildroot}%{_datadir}/%{name}/magic rm -f %{buildroot}%{_datadir}/%{name}/mysql.server rm -f %{buildroot}%{_datadir}/%{name}/mysqld_multi.server -rm -rf %{buildroot}%{_datadir}/%{name}/solaris rm -f %{buildroot}%{_mandir}/man1/comp_err.1* rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1* rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1* @@ -614,9 +608,9 @@ popd %{_datadir}/%{name}/mysql_system_tables_data.sql %{_datadir}/%{name}/mysql_test_data_timezone.sql %{_datadir}/%{name}/my-*.cnf -%{_unitdir}/mysqld.service -%{_libexecdir}/mysqld-prepare-db-dir -%{_libexecdir}/mysqld-wait-ready +%{_unitdir}/%{basename:%SOURCE11} +%{_libexecdir}/%{basename:%SOURCE12} +%{_libexecdir}/%{basename:%SOURCE13} %{_prefix}/lib/tmpfiles.d/%{name}.conf %attr(0755,mysql,mysql) %dir /var/run/mysqld @@ -657,6 +651,15 @@ popd %{_mandir}/man1/mysql_client_test.1* %changelog +* Wed Jun 11 2014 Bjorn Munch - 5.6.19-1 +- Update to MySQL 5.6.19, for various fixes described at + https://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-19.html +- outfile_loaddata resolved on all archs +- Solaris files not installed, no need to remove +- Simplify multilib install +- Use install's -D option some places +- Add explicit conflict with mariadb-galera-server + * Sat Jun 07 2014 Fedora Release Engineering - 5.6.17-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 6b13418..660dc7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -82114fa7c13fa3ca897b34666577d9f4 mysql-5.6.17.tar.gz +a663c5b3c710043c74f97902a1ed62c0 mysql-5.6.19.tar.gz