The package rpms/community-mysql.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/community-mysql.git/commit/?id=52....
Change:
+%ifarch s390 s390x armv7hl
Thanks.
Full change:
============
commit 525141d79d0aa1d9b1f7e392070b854e06de4726
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Fri Nov 1 12:36:05 2019 +0100
Add missing dependency
Disable linking with GOLD on Armv7hl because of
https://bugs.mysql.com/bug.php?id=96698
diff --git a/community-mysql.spec b/community-mysql.spec
index 43ab5ea..0573b83 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -120,6 +120,7 @@ BuildRequires: lz4
BuildRequires: lz4-devel
BuildRequires: mecab-devel
BuildRequires: bison
+BuildRequires: libzstd-devel
%ifnarch aarch64 %{arm} s390 s390x
BuildRequires: numactl-devel
%endif
@@ -442,7 +443,7 @@ cmake .. \
%ifnarch aarch64 %{arm} s390 s390x
-DWITH_NUMA=ON \
%endif
-%ifarch s390 s390x
+%ifarch s390 s390x armv7hl
-DUSE_LD_GOLD=OFF \
%endif
-DWITH_ROUTER=OFF \
@@ -459,6 +460,8 @@ cmake .. \
-DCMAKE_C_LINK_FLAGS="%{build_ldflags}" \
-DCMAKE_CXX_LINK_FLAGS"%{build_ldflags}"
+# Note: linking with GOLD disabled on Armv7hl because of
https://bugs.mysql.com/bug.php?id=96698
+
cmake .. -LAH
make %{?_smp_mflags} VERBOSE=1
diff --git a/sources b/sources
index 320900b..555f703 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mysql-boost-8.0.17.tar.gz) =
a278ee263670cb1f79d67c4b87c4b88632569c3b20a4297a6e77d550155db20902f22992ea851cf59ea523bb97d5e08707e3457f71a678e9f1ac2fa4ca5b7a2d
+SHA512 (mysql-boost-8.0.18.tar.gz) =
180091ad3e74e2afa28ecb914850e6b4e8c92b8981f32b161f53381b92120d87dbd2c2fc073feb2543bb71702bac7368e9fb992821cfd3e3ca888019423b89f5
commit 9be4f7f6c4cfd01a2436178985a1f000ad641a54
Author: Lars Tangvald <lars.tangvald(a)oracle.com>
Date: Mon Oct 14 11:04:55 2019 +0200
Update to MySQL 8.0.18
diff --git a/community-mysql-arm32-timer.patch b/community-mysql-arm32-timer.patch
index 4e5302c..44fc048 100644
--- a/community-mysql-arm32-timer.patch
+++ b/community-mysql-arm32-timer.patch
@@ -1,6 +1,8 @@
---- mysql-8.0.4-rc/mysql-test/include/mtr_warnings.sql~ 2018-01-18 16:52:52.000000000
+0100
-+++ mysql-8.0.4-rc/mysql-test/include/mtr_warnings.sql 2018-03-08 20:14:48.537507245
+0100
-@@ -311,6 +311,11 @@
+diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql
+index c62deb3d..3ae57613 100644
+--- a/mysql-test/include/mtr_warnings.sql
++++ b/mysql-test/include/mtr_warnings.sql
+@@ -265,6 +265,11 @@ INSERT INTO global_suppressions VALUES
*/
("The SSL library function CRYPTO_set_mem_functions failed"),
@@ -9,6 +11,6 @@
+ */
+ ("The CYCLE timer is not available. WAIT events in the performance_schema will not
be timed."),
+
- ("THE_LAST_SUPPRESSION")||
+ ("THE_LAST_SUPPRESSION");
diff --git a/community-mysql-paths.patch b/community-mysql-paths.patch
index 383847f..8b1d9a7 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 17ea6443..1d38e3eb 100644
+index 94d9ecf5..69058c22 100644
--- a/cmake/install_layout.cmake
+++ b/cmake/install_layout.cmake
-@@ -115,7 +115,7 @@ IF(UNIX)
+@@ -109,7 +109,7 @@ IF(UNIX)
" Choose between ${VALID_INSTALL_LAYOUTS}" )
ENDIF()
@@ -16,16 +16,16 @@ index 17ea6443..1d38e3eb 100644
CACHE PATH "config directory (for my.cnf)")
MARK_AS_ADVANCED(SYSCONFDIR)
ENDIF()
-@@ -319,6 +319,7 @@ SET(INSTALL_SECURE_FILE_PRIVDIR_TARGZ ${secure_file_priv_path})
+@@ -271,6 +271,7 @@ SET(INSTALL_SECURE_FILE_PRIVDIR_TARGZ ${secure_file_priv_path})
#
SET(INSTALL_BINDIR_RPM "bin")
SET(INSTALL_SBINDIR_RPM "sbin")
+SET(INSTALL_SYSCONFDIR_RPM "/etc")
#
- IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
- SET(INSTALL_LIBDIR_RPM "lib64")
+ 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 d7f5016e..f8fe5d90 100644
+index a8f6132a..3b448ef3 100644
--- a/mysys/my_default.cc
+++ b/mysys/my_default.cc
@@ -1565,12 +1565,12 @@ static const char **init_default_directories(MEM_ROOT *alloc) {
@@ -45,10 +45,10 @@ index d7f5016e..f8fe5d90 100644
#endif
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
-index bed32565..ca08ee7c 100644
+index c64bfb52..1b2a76cf 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
-@@ -324,9 +324,9 @@ IF(UNIX)
+@@ -288,9 +288,9 @@ IF(UNIX)
ENDIF(UNIX)
SET(prefix "${CMAKE_INSTALL_PREFIX}")
diff --git a/community-mysql-rpath.patch b/community-mysql-rpath.patch
index 00cafa6..16d5bc4 100644
--- a/community-mysql-rpath.patch
+++ b/community-mysql-rpath.patch
@@ -4,12 +4,13 @@ secure-execution mode in
http://man7.org/linux/man-pages/man8/ld.so.8.html).
Related: #1628814
-diff -up mysql-8.0.12/sql/CMakeLists.txt.patchrpath mysql-8.0.12/sql/CMakeLists.txt
---- mysql-8.0.12/sql/CMakeLists.txt.patchrpath 2018-09-14 13:59:02.884021458 +0200
-+++ mysql-8.0.12/sql/CMakeLists.txt 2018-09-14 14:01:10.897983621 +0200
-@@ -711,6 +711,8 @@ ENDIF()
- MYSQL_ADD_EXECUTABLE(mysqld
- ${MYSQLD_SOURCE} DESTINATION ${INSTALL_SBINDIR} COMPONENT Server)
+diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
+index 3f179a7a..209b3eb2 100644
+--- a/sql/CMakeLists.txt
++++ b/sql/CMakeLists.txt
+@@ -918,6 +918,8 @@ IF(UNIX_INSTALL_RPATH_ORIGIN_PRIV_LIBDIR)
+ ADD_INSTALL_RPATH_FOR_PROTOBUF(mysqld)
+ ENDIF()
+SET_TARGET_PROPERTIES(mysqld PROPERTIES INSTALL_RPATH "${RPATH_LIBDIR}")
+
diff --git a/community-mysql-scripts.patch b/community-mysql-scripts.patch
index 122c05a..0211d30 100644
--- a/community-mysql-scripts.patch
+++ b/community-mysql-scripts.patch
@@ -1,8 +1,9 @@
-diff -rup mysql-5.7.8.orig/scripts/CMakeLists.txt mysql-5.7.8/scripts/CMakeLists.txt
---- mysql-5.7.8.orig/scripts/CMakeLists.txt 2015-07-20 14:25:08.000000000 +0200
-+++ mysql-5.7.8/scripts/CMakeLists.txt 2015-09-24 10:47:01.733914088 +0200
-@@ -483,6 +483,32 @@ ELSE()
- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index c64bfb52..4da9e699 100644
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -523,6 +523,32 @@ ELSE()
+ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
)
ENDIF()
+
diff --git a/community-mysql-sharedir.patch b/community-mysql-sharedir.patch
index 72fe369..fa0dc72 100644
--- a/community-mysql-sharedir.patch
+++ b/community-mysql-sharedir.patch
@@ -1,8 +1,8 @@
diff --git a/mysql-test/CMakeLists.txt b/mysql-test/CMakeLists.txt
-index 1eb22c37..e200d4eb 100644
+index f77bd022..a3a3bd9f 100644
--- a/mysql-test/CMakeLists.txt
+++ b/mysql-test/CMakeLists.txt
-@@ -56,6 +56,9 @@ INSTALL(
+@@ -57,6 +57,9 @@ IF(INSTALL_MYSQLTESTDIR)
ENDIF()
@@ -13,10 +13,10 @@ index 1eb22c37..e200d4eb 100644
# Enable running mtr from build directory
FIND_PROGRAM(PERL_EXECUTABLE perl
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
-index 05a504da..9cdc2cda 100755
+index b82611fd..7fc5987e 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
-@@ -1626,7 +1626,7 @@ sub command_line_setup {
+@@ -1656,7 +1656,7 @@ sub command_line_setup {
my $path_share = $path_language;
@share_locations =
diff --git a/community-mysql.spec b/community-mysql.spec
index 434e4ee..43ab5ea 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.17
-Release: 2%{?with_debug:.debug}%{?dist}
+Version: 8.0.18
+Release: 1%{?with_debug:.debug}%{?dist}
Summary: MySQL client programs and shared libraries
URL:
http://www.mysql.com
@@ -798,6 +798,9 @@ fi
%endif
%changelog
+* Mon Oct 14 2019 Lars Tangvald <lars.tangvald(a)oracle.com> - 8.0.18-1
+- Update to MySQL 8.0.18
+
* Mon Aug 19 2019 Michal Schorm <mschorm(a)redhat.com> - 8.0.17-2
- Use RELRO hardening on all binaries