From ef8535fd0d225199193857fce9d931beb655bb9f Mon Sep 17 00:00:00 2001 From: "Norvald H. Ryeng" Date: Mon, 3 Apr 2017 10:03:43 +0200 Subject: [PATCH] Update to MySQL 5.7.18 --- community-mysql-events2-2017.patch | 36 ------------------------------ community-mysql.spec | 13 ++++++----- 2 files changed, 8 insertions(+), 41 deletions(-) delete mode 100644 community-mysql-events2-2017.patch diff --git a/community-mysql-events2-2017.patch b/community-mysql-events2-2017.patch deleted file mode 100644 index 2dc1187..0000000 --- a/community-mysql-events2-2017.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit cdad2b3a25506e7814c9eece71f575ac54249058 -Author: Horst Hunger -Date: Tue Jan 3 09:06:19 2017 +0100 - - Bug#25335897: Modified the year of the date value from 2017 to 2037 in first event. - -diff --git a/mysql-test/r/events_2.result b/mysql-test/r/events_2.result -index 66ec00d..31a501d 100644 ---- a/mysql-test/r/events_2.result -+++ b/mysql-test/r/events_2.result -@@ -1,10 +1,10 @@ - drop database if exists events_test; - create database events_test; - use events_test; --create event e_26 on schedule at '2017-01-01 00:00:00' disable do set @a = 5; -+create event e_26 on schedule at '2037-01-01 00:00:00' disable do set @a = 5; - select db, name, body, definer, convert_tz(execute_at, 'UTC', 'SYSTEM'), on_completion from mysql.event; - db name body definer convert_tz(execute_at, 'UTC', 'SYSTEM') on_completion --events_test e_26 set @a = 5 root@localhost 2017-01-01 00:00:00 DROP -+events_test e_26 set @a = 5 root@localhost 2037-01-01 00:00:00 DROP - drop event e_26; - create event e_26 on schedule at NULL disable do set @a = 5; - ERROR HY000: Incorrect AT value: 'NULL' -diff --git a/mysql-test/t/events_2.test b/mysql-test/t/events_2.test -index 3d60965..d90ec10 100644 ---- a/mysql-test/t/events_2.test -+++ b/mysql-test/t/events_2.test -@@ -13,7 +13,7 @@ use events_test; - # mysql.event intact checking end - # - --create event e_26 on schedule at '2017-01-01 00:00:00' disable do set @a = 5; -+create event e_26 on schedule at '2037-01-01 00:00:00' disable do set @a = 5; - select db, name, body, definer, convert_tz(execute_at, 'UTC', 'SYSTEM'), on_completion from mysql.event; - drop event e_26; - --error ER_WRONG_VALUE diff --git a/community-mysql.spec b/community-mysql.spec index 79b83e8..f68156e 100644 --- a/community-mysql.spec +++ b/community-mysql.spec @@ -79,8 +79,8 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: community-mysql -Version: 5.7.17 -Release: 4%{?with_debug:.debug}%{?dist} +Version: 5.7.18 +Release: 1%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases URL: http://www.mysql.com @@ -120,7 +120,6 @@ Patch6: %{pkgnamepatch}-paths.patch # Patches specific for this mysql package Patch51: %{pkgnamepatch}-chain-certs.patch Patch52: %{pkgnamepatch}-sharedir.patch -Patch53: %{pkgnamepatch}-events2-2017.patch Patch70: %{pkgnamepatch}-5.7.9-major.patch # Patches taken from boost 1.59 @@ -399,7 +398,6 @@ the MySQL sources. %patch6 -p1 %patch51 -p1 %patch52 -p1 -%patch53 -p1 %if %{with_shared_lib_major_hack} %patch70 -p1 %endif @@ -915,7 +913,6 @@ fi %{_datadir}/%{pkg_name}/mysql_system_tables.sql %{_datadir}/%{pkg_name}/mysql_system_tables_data.sql %{_datadir}/%{pkg_name}/mysql_test_data_timezone.sql -%{_datadir}/%{pkg_name}/my-*.cnf %{_datadir}/%{pkg_name}/uninstall_rewriter.sql %{daemondir}/%{daemon_name}* @@ -970,6 +967,12 @@ fi %endif %changelog +* Mon Apr 03 2017 Norvald H. Ryeng - 5.7.18-1 +- Update to MySQL 5.7.18, for various fixes described at + https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-18.html +- Remove patch for test fix now upstream +- Sample my-*.cnf is gone + * Wed Feb 15 2017 Michal Schorm - 5.7.17-4 - Fix of broken cross mysql-mariadb dependecies - Fix of community-mysql server-client dependecy