Update to MySQL 8.0.17

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 f5ac0bf2..cd3132de 100644
+index 17ea6443..1d38e3eb 100644
 --- a/cmake/install_layout.cmake
 +++ b/cmake/install_layout.cmake
-@@ -114,7 +114,7 @@ IF(UNIX)
+@@ -115,7 +115,7 @@ IF(UNIX)
      " Choose between ${VALID_INSTALL_LAYOUTS}" )
    ENDIF()
  
@@ -16,7 +16,7 @@ index f5ac0bf2..cd3132de 100644
      CACHE PATH "config directory (for my.cnf)")
    MARK_AS_ADVANCED(SYSCONFDIR)
  ENDIF()
-@@ -318,6 +318,7 @@ SET(INSTALL_SECURE_FILE_PRIVDIR_TARGZ ${secure_file_priv_path})
+@@ -319,6 +319,7 @@ SET(INSTALL_SECURE_FILE_PRIVDIR_TARGZ ${secure_file_priv_path})
  #
  SET(INSTALL_BINDIR_RPM                  "bin")
  SET(INSTALL_SBINDIR_RPM                 "sbin")
@@ -24,11 +24,11 @@ index f5ac0bf2..cd3132de 100644
  #
  IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
    SET(INSTALL_LIBDIR_RPM                "lib64")
-diff --git a/mysys_ssl/my_default.cc b/mysys_ssl/my_default.cc
-index 1317e362..cfa0feb7 100644
---- a/mysys_ssl/my_default.cc
-+++ b/mysys_ssl/my_default.cc
-@@ -1570,12 +1570,12 @@ static const char **init_default_directories(MEM_ROOT *alloc) {
+diff --git a/mysys/my_default.cc b/mysys/my_default.cc
+index d7f5016e..f8fe5d90 100644
+--- a/mysys/my_default.cc
++++ b/mysys/my_default.cc
+@@ -1565,12 +1565,12 @@ static const char **init_default_directories(MEM_ROOT *alloc) {
  
  #else
  
@@ -45,20 +45,11 @@ index 1317e362..cfa0feb7 100644
  
  #endif
 diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
-index c1202103..06a055b1 100644
+index bed32565..ca08ee7c 100644
 --- a/scripts/CMakeLists.txt
 +++ b/scripts/CMakeLists.txt
-@@ -315,7 +315,7 @@ ENDIF(UNIX)
- 
- SET(bindir ${prefix}/${INSTALL_BINDIR})
- SET(sbindir ${prefix}/${INSTALL_SBINDIR})
--SET(libexecdir ${prefix}/${INSTALL_SBINDIR})
-+SET(libexecdir ${prefix}/${INSTALL_LIBEXECDIR})
- SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR})
- IF(INSTALL_LAYOUT MATCHES "STANDALONE")
-   SET(localstatedir ${prefix}/data)
-@@ -324,9 +324,9 @@ ELSE()
- ENDIF()
+@@ -324,9 +324,9 @@ IF(UNIX)
+ ENDIF(UNIX)
  
  SET(prefix "${CMAKE_INSTALL_PREFIX}")
 -SET(sysconfdir ${prefix})
@@ -67,13 +58,13 @@ index c1202103..06a055b1 100644
 -SET(libexecdir ${prefix}/${INSTALL_SBINDIR})
 +SET(libexecdir ${prefix}/${INSTALL_LIBEXECDIR})
  SET(datadir ${prefix}/${INSTALL_MYSQLSHAREDIR})
- SET(pkgdatadir ${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 5ad36e7b..5dd032f2 100644
+index 8cd63ecc..21ad556c 100644
 --- a/scripts/mysqld_multi.sh
 +++ b/scripts/mysqld_multi.sh
-@@ -572,9 +572,7 @@ sub list_defaults_files
+@@ -586,9 +586,7 @@ sub list_defaults_files
  
    my %seen;  # Don't list the same file more than once
    return grep { defined $_ and not $seen{$_}++ and -f $_ and -r $_ }

community-mysql-s390-tsc.patch

@@ -2,7 +2,7 @@ Support s390/s390x in performance schema's cycle-counting functions.
 Filed upstream at http://bugs.mysql.com/bug.php?id=59953
 
 diff --git a/include/my_rdtsc.h b/include/my_rdtsc.h
-index 65f7df1..a28f470 100644
+index 65f7df19..a28f470c 100644
 --- a/include/my_rdtsc.h
 +++ b/include/my_rdtsc.h
 @@ -128,5 +128,6 @@ void my_timer_init(MY_TIMER_INFO *mti);
@@ -13,11 +13,11 @@ index 65f7df1..a28f470 100644
  
  #endif
 diff --git a/mysys/my_rdtsc.cc b/mysys/my_rdtsc.cc
-index ec8e855..c3408b1 100644
+index 54d19691..f18c182f 100644
 --- a/mysys/my_rdtsc.cc
 +++ b/mysys/my_rdtsc.cc
 @@ -204,6 +204,13 @@ ulonglong my_timer_cycles(void) {
-     __asm __volatile__("mrs %[rt],cntvct_el0" : [rt] "=r"(result));
+     __asm __volatile__("mrs %[rt],cntvct_el0" : [ rt ] "=r"(result));
      return result;
    }
 +#elif defined(__GNUC__) && defined(__s390__)

community-mysql.spec

@@ -66,8 +66,8 @@
 %global sameevr   %{?epoch:%{epoch}:}%{version}-%{release}
 
 Name:             community-mysql
-Version:          8.0.16
-Release:          3%{?with_debug:.debug}%{?dist}
+Version:          8.0.17
+Release:          1%{?with_debug:.debug}%{?dist}
 Summary:          MySQL client programs and shared libraries
 URL:              http://www.mysql.com
 
@@ -123,6 +123,7 @@ BuildRequires:    bison
 %ifnarch aarch64 %{arm} s390 s390x
 BuildRequires:    numactl-devel
 %endif
+BuildRequires:    openssl
 BuildRequires:    openssl-devel
 %if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires:    perl-interpreter
@@ -308,6 +309,7 @@ Requires:         %{name}-common%{?_isa} = %{sameevr}
 Requires:         %{name}-server%{?_isa} = %{sameevr}
 Requires:         gzip
 Requires:         lz4
+Requires:         openssl
 Requires:         perl(Digest::file)
 Requires:         perl(Digest::MD5)
 Requires:         perl(Env)
@@ -364,6 +366,9 @@ add_test () {
 
 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
+
 # These tests fail on armv7hl; last check 8.0.16
 %ifarch %arm aarch64
 add_test gis.st_latitude
@@ -784,6 +789,9 @@ fi
 %endif
 
 %changelog
+* Wed Jul 31 2019 Lars Tangvald <lars.tangvald@oracle.com> - 8.0.17-1
+- Update to MySQL 8.0.17
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.16-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (mysql-boost-8.0.16.tar.gz) = 4de08d74637d1fef4f570148e66c8ddf2b59d1c0a49d715ca632da7f572645b65ec5f7c115aaf0bd179b0a9f1ba2bc40357c371f170a674118159d99b2c49516
+SHA512 (mysql-boost-8.0.17.tar.gz) = a278ee263670cb1f79d67c4b87c4b88632569c3b20a4297a6e77d550155db20902f22992ea851cf59ea523bb97d5e08707e3457f71a678e9f1ac2fa4ca5b7a2d