diff --git a/all-mysql-8.0.18-add-protobuf-support.patch b/all-mysql-8.0.18-add-protobuf-support.patch deleted file mode 100644 index 7afd49e98e4c9592d58df1f416c745baf498b3dd..0000000000000000000000000000000000000000 --- a/all-mysql-8.0.18-add-protobuf-support.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nur a/plugin/x/client/mysqlxclient/xmessage.h b/plugin/x/client/mysqlxclient/xmessage.h ---- a/plugin/x/client/mysqlxclient/xmessage.h 2019-09-20 16:30:51.000000000 +0800 -+++ b/plugin/x/client/mysqlxclient/xmessage.h 2020-06-03 10:50:50.605147957 +0800 -@@ -36,7 +36,6 @@ - #include - #include - #include --#include - - #ifdef USE_MYSQLX_FULL_PROTO - -diff -Nur a/plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h b/plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h ---- a/plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h 2019-09-20 16:30:51.000000000 +0800 -+++ b/plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h 2020-06-03 10:51:54.566083039 +0800 -@@ -38,7 +38,6 @@ - #include - #include - #include --#include - - #ifdef USE_MYSQLX_FULL_PROTO - #include "plugin/x/generated/protobuf/mysqlx.pb.h" diff --git a/boost-1.57.0-mpl-print.patch b/boost-1.57.0-mpl-print.patch index 92073d611ca8a49b71b38f9043b566d25d617919..2f46669915c6c9e3c71396aabd6aa4ae77fbee1f 100644 --- a/boost-1.57.0-mpl-print.patch +++ b/boost-1.57.0-mpl-print.patch @@ -1,6 +1,6 @@ -diff -up a/boost/boost_1_70_0/boost/mpl/print.hpp b/boost/boost_1_70_0/boost/mpl/print.hpp ---- a/boost/boost_1_70_0/boost/mpl/print.hpp 2014-07-09 23:12:31.000000000 +0200 -+++ b/boost/boost_1_70_0/boost/mpl/print.hpp 2015-01-20 12:44:59.621400948 +0100 +diff -up a/boost/boost_1_72_0/boost/mpl/print.hpp b/boost/boost_1_72_0/boost/mpl/print.hpp +--- a/boost/boost_1_72_0/boost/mpl/print.hpp 2014-07-09 23:12:31.000000000 +0200 ++++ b/boost/boost_1_72_0/boost/mpl/print.hpp 2015-01-20 12:44:59.621400948 +0100 @@ -52,16 +52,15 @@ struct print enum { n = sizeof(T) + -1 }; #elif defined(__MWERKS__) diff --git a/boost-1.58.0-pool.patch b/boost-1.58.0-pool.patch index b8817953103a7135ec304ca642d59a2c7ccb1f2b..52ffd11d0b3b775ae5fc64b614e6727c4069c54e 100644 --- a/boost-1.58.0-pool.patch +++ b/boost-1.58.0-pool.patch @@ -1,7 +1,7 @@ -Index: boost/boost_1_70_0/boost/pool/pool.hpp +Index: boost/boost_1_72_0/boost/pool/pool.hpp =================================================================== ---- a/boost/boost_1_70_0/boost/pool/pool.hpp (revision 78317) -+++ b/boost/boost_1_70_0/boost/pool/pool.hpp (revision 78326) +--- a/boost/boost_1_72_0/boost/pool/pool.hpp (revision 78317) ++++ b/boost/boost_1_72_0/boost/pool/pool.hpp (revision 78326) @@ -27,4 +27,6 @@ #include diff --git a/community-mysql-paths.patch b/community-mysql-paths.patch index 8b1d9a749c7d70700a8854dffb4b3a7c99d9fd22..d5978b6e9e2e04d103f33b3b983a5c0d821eac65 100644 --- a/community-mysql-paths.patch +++ b/community-mysql-paths.patch @@ -4,10 +4,10 @@ Software Collections. Removing these hard-coded paths should fix it. Upstream report: https://mariadb.atlassian.net/browse/MDEV-6485 diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake -index 94d9ecf5..69058c22 100644 +index 9f7945d8..6734cdfd 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake -@@ -109,7 +109,7 @@ IF(UNIX) +@@ -105,7 +105,7 @@ IF(UNIX) " Choose between ${VALID_INSTALL_LAYOUTS}" ) ENDIF() @@ -16,7 +16,7 @@ index 94d9ecf5..69058c22 100644 CACHE PATH "config directory (for my.cnf)") MARK_AS_ADVANCED(SYSCONFDIR) ENDIF() -@@ -271,6 +271,7 @@ SET(INSTALL_SECURE_FILE_PRIVDIR_TARGZ ${secure_file_priv_path}) +@@ -189,6 +189,7 @@ SET(INSTALL_SECURE_FILE_PRIVDIR_TARGZ ${secure_file_priv_path}) # SET(INSTALL_BINDIR_RPM "bin") SET(INSTALL_SBINDIR_RPM "sbin") @@ -25,10 +25,10 @@ index 94d9ecf5..69058c22 100644 IF(CMAKE_SYSTEM_PROCESSOR IN_LIST KNOWN_64BIT_ARCHITECTURES) SET(INSTALL_LIBDIR_RPM "lib64/mysql") diff --git a/mysys/my_default.cc b/mysys/my_default.cc -index a8f6132a..3b448ef3 100644 +index 290f1666..8403425f 100644 --- a/mysys/my_default.cc +++ b/mysys/my_default.cc -@@ -1565,12 +1565,12 @@ static const char **init_default_directories(MEM_ROOT *alloc) { +@@ -1570,12 +1570,12 @@ static const char **init_default_directories(MEM_ROOT *alloc) { #else @@ -45,7 +45,7 @@ index a8f6132a..3b448ef3 100644 #endif diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index c64bfb52..1b2a76cf 100644 +index 4149a764..b091d5e2 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -288,9 +288,9 @@ IF(UNIX) @@ -60,10 +60,10 @@ index c64bfb52..1b2a76cf 100644 SET(datadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) SET(libsubdir ${INSTALL_LIBDIR}) SET(pkgincludedir ${prefix}/${INSTALL_INCLUDEDIR}) -diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh -index 8cd63ecc..21ad556c 100644 ---- a/scripts/mysqld_multi.sh -+++ b/scripts/mysqld_multi.sh +diff --git a/scripts/mysqld_multi.pl.in b/scripts/mysqld_multi.pl.in +index 84dd4d7c..50397ddd 100644 +--- a/scripts/mysqld_multi.pl.in ++++ b/scripts/mysqld_multi.pl.in @@ -586,9 +586,7 @@ sub list_defaults_files my %seen; # Don't list the same file more than once diff --git a/community-mysql-scripts.patch b/community-mysql-scripts.patch index 0211d30a112dbe5ef105d7c178e102a34792cbc4..7c0a9f0dde89f6585aeeeb542c86e5b666095a13 100644 --- a/community-mysql-scripts.patch +++ b/community-mysql-scripts.patch @@ -1,8 +1,8 @@ diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index c64bfb52..4da9e699 100644 +index 8217bb76..4149a764 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt -@@ -523,6 +523,32 @@ ELSE() +@@ -513,4 +513,30 @@ ELSE() PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) ENDIF() @@ -33,5 +33,3 @@ index c64bfb52..4da9e699 100644 + ENDIF() + ENDFOREACH() ENDIF() - - # Install libgcc as mylibgcc.a diff --git a/mysql-boost-8.0.18.tar.gz b/mysql-boost-8.0.21.tar.gz similarity index 69% rename from mysql-boost-8.0.18.tar.gz rename to mysql-boost-8.0.21.tar.gz index 154b7b5f3cfa3694973d8a06438d81cc89be0d07..f4d8942d00c9818db82cff311f4eaaa8612a801e 100644 Binary files a/mysql-boost-8.0.18.tar.gz and b/mysql-boost-8.0.21.tar.gz differ diff --git a/mysql.spec b/mysql.spec index 268d8e66bfa08cf999e45ed97e9299d0dbaa0352..24f0c78cfdf64e8426ee3c28d353560f710d5d22 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,7 +1,7 @@ #%{!?runselftest:%global runselftest 0} Name: mysql -Version: 8.0.18 -Release: 2 +Version: 8.0.21 +Release: 1 Summary: The package provides MySQL programs and shared libraries License: GPLv2 with exceptions and LGPLv2 and BSD URL: http://www.mysql.com @@ -28,7 +28,6 @@ Patch0005: community-mysql-sharedir.patch Patch0006: community-mysql-rpath.patch Patch0007: boost-1.58.0-pool.patch Patch0008: boost-1.57.0-mpl-print.patch -Patch9001: all-mysql-8.0.18-add-protobuf-support.patch BuildRequires: cmake gcc-c++ libaio-devel libedit-devel libevent-devel libicu-devel BuildRequires: lz4-devel mecab-devel bison libzstd-devel openssl openssl-devel BuildRequires: perl-interpreter perl-generators rpcgen libtirpc-devel lz4 @@ -123,7 +122,7 @@ Requires: mysql-server = %{version}-%{release} gzip lz4 openssl perl( Requires: perl(Digest::MD5) perl(Env) perl(Exporter) perl(Fcntl) perl(File::Temp) Requires: perl(Data::Dumper) perl(Getopt::Long) perl(IPC::Open3) perl(JSON) Requires: perl(LWP::Simple) perl(Memoize) perl(Socket) perl(Sys::Hostname) -Requires: perl(Test::More) perl(Time::HiRes) +Requires: perl(Test::More) perl(Time::HiRes) perl(FindBin) Conflicts: mariadb-test Provides: mysql-test = %{version}-%{release} %description test @@ -144,6 +143,9 @@ add_test () { touch platform-specific-tests.list 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 auth_sec.keyring_file_data_qa sporadic since 8.0.19 +add_test collations.chinese sporadic since 8.0.19 +add_test main.mysql_load_data_local_dir local infile on %ifarch %arm aarch64 add_test gis.st_latitude add_test gis.st_longitude @@ -151,6 +153,8 @@ add_test perfschema.func_file_io missing hw on arm32 add_test perfschema.func_mutex missing hw on arm32 add_test perfschema.global_read_lock missing hw on arm32 add_test perfschema.setup_objects missing hw on arm32 +add_test clone.remote_error_basic max_allowed_packet is 0 +add_test innodb.create_tablespace %endif cd - cp %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE6} %{SOURCE7} \ @@ -187,7 +191,7 @@ cmake .. \ %endif -DCMAKE_CXX_LINK_FLAGS"%{build_ldflags}" cmake .. -LAH -%make_build VERBOSE=1 +%make_build cd - %install @@ -283,6 +287,8 @@ fi %{_datadir}/mysql/charsets %files errmsg +%{_datadir}/mysql/messages_to_error_log.txt +%{_datadir}/mysql/messages_to_clients.txt %{_datadir}/mysql/{errmsg-utf8.txt,english} %lang(bg) %{_datadir}/mysql/bulgarian %lang(cs) %{_datadir}/mysql/czech @@ -344,6 +350,7 @@ fi %files test %{_bindir}/{mysql_client_test,mysqltest,mysqltest_safe_process,mysqlxtest} +%{_bindir}/{mysqld_safe,comp_err} %attr(-,mysql,mysql) %{_datadir}/mysql-test %files help @@ -360,6 +367,9 @@ fi %exclude %{_mandir}/man1/{mysqld_multi.1*,mysqld_safe.1*,comp_err.1*} %changelog +* Mon Sep 14 2020 maminjie - 8.0.21-1 +- upgrade to 8.0.21 + * Mon Jun 1 2020 Jeffery.Gao - 8.0.18-2 - Package upgrade.