From 7834706bc2b61a61611073010e213870dc32a345 Mon Sep 17 00:00:00 2001 From: Lars Tangvald Date: Wed, 29 Apr 2020 15:02:17 +0200 Subject: [PATCH] Update to MySQL 8.0.20 --- community-mysql-2020.patch | 103 ------------------------------------- community-mysql.spec | 12 ++--- sources | 2 +- 3 files changed, 6 insertions(+), 111 deletions(-) delete mode 100644 community-mysql-2020.patch diff --git a/community-mysql-2020.patch b/community-mysql-2020.patch deleted file mode 100644 index 96f3819..0000000 --- a/community-mysql-2020.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff --git a/mysql-test/r/events_bugs.result b/mysql-test/r/events_bugs.result -index 56821679efe..b05c76a7586 100644 ---- a/mysql-test/r/events_bugs.result -+++ b/mysql-test/r/events_bugs.result -@@ -42,11 +42,11 @@ Warnings: - Note 1588 Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation. - show events; - Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation --create event e_55 on schedule at 20200101000000 starts 10000101000000 do drop table t; -+create event e_55 on schedule at 20380101000000 starts 10000101000000 do drop table t; - ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'starts 10000101000000 do drop table t' at line 1 --create event e_55 on schedule at 20200101000000 ends 10000101000000 do drop table t; -+create event e_55 on schedule at 20380101000000 ends 10000101000000 do drop table t; - ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ends 10000101000000 do drop table t' at line 1 --create event e_55 on schedule at 20200101000000 starts 10000101000000 ends 10000101000000 do drop table t; -+create event e_55 on schedule at 20380101000000 starts 10000101000000 ends 10000101000000 do drop table t; - ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'starts 10000101000000 ends 10000101000000 do drop table t' at line 1 - create event e_55 on schedule every 10 hour starts 10000101000000 do drop table t; - ERROR HY000: Incorrect STARTS value: '10000101000000' -@@ -411,16 +411,16 @@ SHOW EVENTS; - Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation - events_test e1 root@localhost +02:00 ONE TIME 2000-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 latin1 latin1_swedish_ci utf8mb4_0900_ai_ci - SET TIME_ZONE= '-03:00'; --ALTER EVENT e1 ON SCHEDULE EVERY 1 DAY ENDS '2030-01-03 00:00:00' -+ALTER EVENT e1 ON SCHEDULE EVERY 1 DAY ENDS '2038-01-03 00:00:00' - ON COMPLETION PRESERVE DISABLE; - SHOW EVENTS; - Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation --events_test e1 root@localhost -03:00 RECURRING NULL 1 DAY 2005-12-31 20:58:59 2030-01-03 00:00:00 DISABLED 1 latin1 latin1_swedish_ci utf8mb4_0900_ai_ci -+events_test e1 root@localhost -03:00 RECURRING NULL 1 DAY 2005-12-31 20:58:59 2038-01-03 00:00:00 DISABLED 1 latin1 latin1_swedish_ci utf8mb4_0900_ai_ci - SET TIME_ZONE= '+04:00'; - ALTER EVENT e1 DO SELECT 2; - SHOW EVENTS; - Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation --events_test e1 root@localhost -03:00 RECURRING NULL 1 DAY 2005-12-31 20:58:59 2030-01-03 00:00:00 DISABLED 1 latin1 latin1_swedish_ci utf8mb4_0900_ai_ci -+events_test e1 root@localhost -03:00 RECURRING NULL 1 DAY 2005-12-31 20:58:59 2038-01-03 00:00:00 DISABLED 1 latin1 latin1_swedish_ci utf8mb4_0900_ai_ci - DROP EVENT e1; - SET TIME_ZONE='+05:00'; - CREATE EVENT e1 ON SCHEDULE EVERY 1 DAY STARTS '2006-01-01 00:00:00' DO -@@ -647,7 +647,7 @@ SET GLOBAL READ_ONLY = 1; - # Connection: u1_con (mysqltest_u1@localhost/events_test). - # - --CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1; -+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1; - ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement - - ALTER EVENT e1 COMMENT 'comment'; -@@ -660,7 +660,7 @@ ERROR HY000: The MySQL server is running with the --read-only option so it canno - # Connection: root_con (root@localhost/events_test). - # - --CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1; -+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1; - - ALTER EVENT e1 COMMENT 'comment'; - -diff --git a/mysql-test/t/events_bugs.test b/mysql-test/t/events_bugs.test -index b35e8627852..8a4de2d4d55 100644 ---- a/mysql-test/t/events_bugs.test -+++ b/mysql-test/t/events_bugs.test -@@ -216,11 +216,11 @@ create event e_55 on schedule at 20000101000000 do drop table t; - show events; - - --error ER_PARSE_ERROR --create event e_55 on schedule at 20200101000000 starts 10000101000000 do drop table t; -+create event e_55 on schedule at 20380101000000 starts 10000101000000 do drop table t; - --error ER_PARSE_ERROR --create event e_55 on schedule at 20200101000000 ends 10000101000000 do drop table t; -+create event e_55 on schedule at 20380101000000 ends 10000101000000 do drop table t; - --error ER_PARSE_ERROR --create event e_55 on schedule at 20200101000000 starts 10000101000000 ends 10000101000000 do drop table t; -+create event e_55 on schedule at 20380101000000 starts 10000101000000 ends 10000101000000 do drop table t; - --error ER_WRONG_VALUE - create event e_55 on schedule every 10 hour starts 10000101000000 do drop table t; - -@@ -722,7 +722,7 @@ SHOW EVENTS; - - # This will update event time zone. - SET TIME_ZONE= '-03:00'; --ALTER EVENT e1 ON SCHEDULE EVERY 1 DAY ENDS '2030-01-03 00:00:00' -+ALTER EVENT e1 ON SCHEDULE EVERY 1 DAY ENDS '2038-01-03 00:00:00' - ON COMPLETION PRESERVE DISABLE; - SHOW EVENTS; - -@@ -1033,7 +1033,7 @@ SET GLOBAL READ_ONLY = 1; - --echo - - --error ER_OPTION_PREVENTS_STATEMENT --CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1; -+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1; - - --echo - -@@ -1057,7 +1057,7 @@ DROP EVENT e1; - - --echo - --CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1; -+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1; - - --echo - diff --git a/community-mysql.spec b/community-mysql.spec index f58fd0a..edc5585 100644 --- a/community-mysql.spec +++ b/community-mysql.spec @@ -66,8 +66,8 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: community-mysql -Version: 8.0.19 -Release: 3%{?with_debug:.debug}%{?dist} +Version: 8.0.20 +Release: 1%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com @@ -105,7 +105,6 @@ Patch51: %{pkgnamepatch}-chain-certs.patch Patch52: %{pkgnamepatch}-sharedir.patch Patch55: %{pkgnamepatch}-rpath.patch Patch75: %{pkgnamepatch}-arm32-timer.patch -Patch76: %{pkgnamepatch}-2020.patch # Patches taken from boost 1.59 Patch115: boost-1.58.0-pool.patch @@ -374,7 +373,6 @@ the MySQL sources. %patch52 -p1 %patch55 -p1 %patch75 -p1 -%patch76 -p1 # Patch Boost pushd boost/boost_1_??_0 @@ -393,11 +391,8 @@ touch %{skiplist} add_test innodb.redo_log_archive_04 failed since 8.0.17 add_test clone.remote_dml_no_binlog failed since 8.0.17 -add_test x.message_protobuf_nested due to protobuf 3.11 -add_test x.message_compressed_payload due to protobuf 3.11 add_test auth_sec.keyring_file_data_qa sporadic since 8.0.19 add_test collations.chinese sporadic since 8.0.19 -add_test main.events_1 everywhere always since F32 mass rebuild # These tests fail on armv7hl; last check 8.0.16 %ifarch %arm aarch64 @@ -855,6 +850,9 @@ fi %endif %changelog +* Sun Apr 26 2020 Lars Tangvald - 8.0.20-1 +- Update to MySQL 8.0.20 + * Wed Apr 01 2020 Jitka Plesnikova - 8.0.19-3 - Specify all perl dependencies diff --git a/sources b/sources index 5111f6e..34d177d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-boost-8.0.19.tar.gz) = 5ffc03f005ab2585694902e926b6cb2b10059b2b030549eccd3949f9c3b2f02626d02529f940dec003f2d69683856fd1c720ff12f89dfbdc48befaf24a9c4d01 +SHA512 (mysql-boost-8.0.20.tar.gz) = 7a962e9ddec7069008c5ab6ac2801515e2661ca2875afc6141541c03e2f941f4255b3c0d806a4df2fd2f2f1d12323aeb1e456c1d364777a18ccebefad7b22a99