From 1d68b73eb0dff302d0540e860213839efe8fdbf7 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 25 Nov 2021 02:51:28 +0100 Subject: [PATCH] - updated to 5.7.35-38 --- drop-sysctl_h.patch | 134 ++++++++++++++++-------------------- mysql-bug-91914.patch | 12 ---- mysql-chain-certs.patch | 8 +-- mysql-cmake.patch | 16 ++--- mysql-dubious-exports.patch | 58 ++++++++-------- mysql-opt.patch | 57 ++++++--------- mysql-protobuf.patch | 6 +- mysql-sphinx.patch | 15 ++-- mysql-versioning.patch | 6 +- mysql.spec | 72 ++++++++++++------- 10 files changed, 181 insertions(+), 203 deletions(-) delete mode 100644 mysql-bug-91914.patch diff --git a/drop-sysctl_h.patch b/drop-sysctl_h.patch index 8921b7e..ea8d413 100644 --- a/drop-sysctl_h.patch +++ b/drop-sysctl_h.patch @@ -1,7 +1,20 @@ -diff -ur percona-server-5.7.28-31.orig/extra/libevent/CMakeLists.txt percona-server-5.7.28-31/extra/libevent/CMakeLists.txt ---- percona-server-5.7.28-31.orig/extra/libevent/CMakeLists.txt 2019-12-17 21:48:18.087000000 +0100 -+++ percona-server-5.7.28-31/extra/libevent/CMakeLists.txt 2019-12-17 21:54:31.973000000 +0100 -@@ -301,7 +301,6 @@ +diff -ur percona-server-5.7.35-38.orig/extra/libevent/libevent-2.1.11-stable/arc4random.c percona-server-5.7.35-38/extra/libevent/libevent-2.1.11-stable/arc4random.c +--- percona-server-5.7.35-38.orig/extra/libevent/libevent-2.1.11-stable/arc4random.c 2021-11-25 02:40:14.583485712 +0100 ++++ percona-server-5.7.35-38/extra/libevent/libevent-2.1.11-stable/arc4random.c 2021-11-25 02:42:18.732780086 +0100 +@@ -60,9 +60,6 @@ + #include + #include + #include +-#ifdef EVENT__HAVE_SYS_SYSCTL_H +-#include +-#endif + #endif + #include + #include +diff -ur percona-server-5.7.35-38.orig/extra/libevent/libevent-2.1.11-stable/CMakeLists.txt percona-server-5.7.35-38/extra/libevent/libevent-2.1.11-stable/CMakeLists.txt +--- percona-server-5.7.35-38.orig/extra/libevent/libevent-2.1.11-stable/CMakeLists.txt 2021-11-25 02:40:14.582485710 +0100 ++++ percona-server-5.7.35-38/extra/libevent/libevent-2.1.11-stable/CMakeLists.txt 2021-11-25 02:43:37.682967284 +0100 +@@ -436,7 +436,6 @@ CHECK_INCLUDE_FILE(netinet/tcp.h EVENT__HAVE_NETINET_TCP_H) CHECK_INCLUDE_FILE(sys/wait.h EVENT__HAVE_SYS_WAIT_H) CHECK_INCLUDE_FILE(sys/resource.h EVENT__HAVE_SYS_RESOURCE_H) @@ -9,46 +22,33 @@ diff -ur percona-server-5.7.28-31.orig/extra/libevent/CMakeLists.txt percona-ser CHECK_INCLUDE_FILE(sys/timerfd.h EVENT__HAVE_SYS_TIMERFD_H) CHECK_INCLUDE_FILE(errno.h EVENT__HAVE_ERRNO_H) -@@ -421,10 +420,6 @@ - endif() +@@ -580,10 +579,6 @@ + CHECK_SYMBOL_EXISTS("__FUNCTION__" "" EVENT__HAVE___FUNCTION__) CHECK_SYMBOL_EXISTS(TAILQ_FOREACH sys/queue.h EVENT__HAVE_TAILQFOREACH) --CHECK_SYMBOL_EXISTS(CTL_KERN sys/sysctl.h EVENT__HAVE_DECL_CTL_KERN) --CHECK_SYMBOL_EXISTS(KERN_ARND sys/sysctl.h EVENT__HAVE_DECL_KERN_ARND) --CHECK_SYMBOL_EXISTS(KERN_RANDOM sys/sysctl.h EVENT__HAVE_DECL_KERN_RANDOM) --CHECK_SYMBOL_EXISTS(RANDOM_UUID sys/sysctl.h EVENT__HAVE_DECL_RANDOM_UUID) +-CHECK_CONST_EXISTS(CTL_KERN sys/sysctl.h EVENT__HAVE_DECL_CTL_KERN) +-CHECK_CONST_EXISTS(KERN_ARND sys/sysctl.h EVENT__HAVE_DECL_KERN_ARND) +-CHECK_CONST_EXISTS(KERN_RANDOM sys/sysctl.h EVENT__HAVE_DECL_KERN_RANDOM) +-CHECK_CONST_EXISTS(RANDOM_UUID sys/sysctl.h EVENT__HAVE_DECL_RANDOM_UUID) CHECK_SYMBOL_EXISTS(F_SETFD fcntl.h EVENT__HAVE_SETFD) CHECK_TYPE_SIZE(fd_mask EVENT__HAVE_FD_MASK) -diff -ur percona-server-5.7.28-31.orig/extra/libevent/arc4random.c percona-server-5.7.28-31/extra/libevent/arc4random.c ---- percona-server-5.7.28-31.orig/extra/libevent/arc4random.c 2019-12-17 21:48:18.100000000 +0100 -+++ percona-server-5.7.28-31/extra/libevent/arc4random.c 2019-12-17 21:52:02.967000000 +0100 -@@ -59,9 +59,6 @@ - #include - #include - #include --#ifdef EVENT__HAVE_SYS_SYSCTL_H --#include --#endif - #endif - #include - #include -diff -ur percona-server-5.7.28-31.orig/extra/libevent/event-config.h.cmake percona-server-5.7.28-31/extra/libevent/event-config.h.cmake ---- percona-server-5.7.28-31.orig/extra/libevent/event-config.h.cmake 2019-12-17 21:48:18.108000000 +0100 -+++ percona-server-5.7.28-31/extra/libevent/event-config.h.cmake 2019-12-17 21:51:46.329000000 +0100 -@@ -355,9 +355,6 @@ +diff -ur percona-server-5.7.35-38.orig/extra/libevent/libevent-2.1.11-stable/event-config.h.cmake percona-server-5.7.35-38/extra/libevent/libevent-2.1.11-stable/event-config.h.cmake +--- percona-server-5.7.35-38.orig/extra/libevent/libevent-2.1.11-stable/event-config.h.cmake 2021-11-25 02:40:14.584485715 +0100 ++++ percona-server-5.7.35-38/extra/libevent/libevent-2.1.11-stable/event-config.h.cmake 2021-11-25 02:43:55.547009642 +0100 +@@ -367,9 +367,6 @@ /* Define to 1 if you have the header file. */ - #cmakedefine EVENT__HAVE_SYS_STAT_H + #cmakedefine EVENT__HAVE_SYS_STAT_H 1 -/* Define to 1 if you have the header file. */ --#cmakedefine EVENT__HAVE_SYS_SYSCTL_H +-#cmakedefine EVENT__HAVE_SYS_SYSCTL_H 1 - /* Define to 1 if you have the header file. */ - #cmakedefine EVENT__HAVE_SYS_TIMERFD_H */ + #cmakedefine EVENT__HAVE_SYS_TIMERFD_H 1 -diff -ur percona-server-5.7.28-31.orig/mysys/my_gethwaddr.c percona-server-5.7.28-31/mysys/my_gethwaddr.c ---- percona-server-5.7.28-31.orig/mysys/my_gethwaddr.c 2019-12-17 21:48:35.390000000 +0100 -+++ percona-server-5.7.28-31/mysys/my_gethwaddr.c 2019-12-17 21:52:16.332000000 +0100 +diff -ur percona-server-5.7.35-38.orig/mysys/my_gethwaddr.c percona-server-5.7.35-38/mysys/my_gethwaddr.c +--- percona-server-5.7.35-38.orig/mysys/my_gethwaddr.c 2021-11-25 02:40:16.802490974 +0100 ++++ percona-server-5.7.35-38/mysys/my_gethwaddr.c 2021-11-25 02:41:02.815600077 +0100 @@ -37,7 +37,6 @@ #ifdef __FreeBSD__ @@ -57,21 +57,9 @@ diff -ur percona-server-5.7.28-31.orig/mysys/my_gethwaddr.c percona-server-5.7.2 #include #include #include -diff -ur percona-server-5.7.28-31.orig/storage/rocksdb/third_party/zstd/programs/util.h percona-server-5.7.28-31/storage/rocksdb/third_party/zstd/programs/util.h ---- percona-server-5.7.28-31.orig/storage/rocksdb/third_party/zstd/programs/util.h 2019-12-17 21:48:46.381000000 +0100 -+++ percona-server-5.7.28-31/storage/rocksdb/third_party/zstd/programs/util.h 2019-12-17 21:52:21.624000000 +0100 -@@ -565,8 +565,6 @@ - - #elif defined(__APPLE__) - --#include -- - /* Use apple-provided syscall - * see: man 3 sysctl */ - UTIL_STATIC int UTIL_countPhysicalCores(void) -diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake percona-server-5.7.28-31/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake ---- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake 2019-12-17 21:48:46.448000000 +0100 -+++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake 2019-12-17 21:52:26.013000000 +0100 +diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake percona-server-5.7.35-38/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake +--- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake 2021-11-25 02:40:20.529499811 +0100 ++++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake 2021-11-25 02:41:02.824600099 +0100 @@ -39,7 +39,6 @@ check_include_files(sys/resource.h HAVE_SYS_RESOURCE_H) check_include_files(sys/statvfs.h HAVE_SYS_STATVFS_H) @@ -80,22 +68,22 @@ diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/cmake_modules/To check_include_files(sys/syslimits.h HAVE_SYS_SYSLIMITS_H) check_include_files(sys/time.h HAVE_SYS_TIME_H) check_include_files(unistd.h HAVE_UNISTD_H) -diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/portability/portability.cc percona-server-5.7.28-31/storage/tokudb/PerconaFT/portability/portability.cc ---- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/portability/portability.cc 2019-12-17 21:48:46.875000000 +0100 -+++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/portability/portability.cc 2019-12-17 21:52:31.280000000 +0100 +diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/portability/portability.cc percona-server-5.7.35-38/storage/tokudb/PerconaFT/portability/portability.cc +--- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/portability/portability.cc 2021-11-25 02:40:20.665500134 +0100 ++++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/portability/portability.cc 2021-11-25 02:46:09.913328241 +0100 @@ -60,9 +60,6 @@ #if defined(HAVE_SYS_SYSCALL_H) # include #endif --#if defined(HAVE_SYS_SYSCTL_H) +-#if defined(HAVE_SYS_SYSCTL_H) && !defined(_SC_PHYS_PAGES) -# include -#endif #if defined(HAVE_PTHREAD_NP_H) # include #endif -diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in ---- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in 2019-12-17 21:48:47.681000000 +0100 -+++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in 2019-12-17 21:52:35.576000000 +0100 +diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in +--- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in 2021-11-25 02:40:21.001500930 +0100 ++++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in 2021-11-25 02:42:31.834811153 +0100 @@ -231,9 +231,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H @@ -106,9 +94,9 @@ diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4 /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TIME_H -diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure ---- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure 2019-12-17 21:48:47.683000000 +0100 -+++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure 2019-12-17 21:53:41.227000000 +0100 +diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure +--- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure 2021-11-25 02:40:21.017500968 +0100 ++++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure 2021-11-25 02:42:31.837811159 +0100 @@ -16181,7 +16181,7 @@ @@ -134,9 +122,9 @@ diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4 int main(void) { -diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac ---- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac 2019-12-17 21:48:47.684000000 +0100 -+++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac 2019-12-17 21:52:47.585000000 +0100 +diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac +--- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac 2021-11-25 02:40:21.017500968 +0100 ++++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac 2021-11-25 02:42:31.837811159 +0100 @@ -476,7 +476,7 @@ [AC_MSG_ERROR([Required header file(s) are missing.])]) @@ -146,9 +134,9 @@ diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4 [], [], [ #ifdef HAVE_SYS_PARAM_H # include -diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4 percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4 ---- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4 2019-12-17 21:48:47.579000000 +0100 -+++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4 2019-12-17 21:53:59.770000000 +0100 +diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4 percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4 +--- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4 2021-11-25 02:40:20.936500776 +0100 ++++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4 2021-11-25 02:42:31.838811162 +0100 @@ -36,7 +36,6 @@ #ifdef HAVE_SYS_PARAM_H # include @@ -157,9 +145,9 @@ diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4 int main(void) { -diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4 percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4 ---- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4 2019-12-17 21:48:47.579000000 +0100 -+++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4 2019-12-17 21:54:05.009000000 +0100 +diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4 percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4 +--- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4 2021-11-25 02:40:20.936500776 +0100 ++++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4 2021-11-25 02:42:31.838811162 +0100 @@ -38,7 +38,6 @@ #ifdef HAVE_SYS_PARAM_H # include @@ -168,9 +156,9 @@ diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4 int main(void) { -diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h ---- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h 2019-12-17 21:48:47.584000000 +0100 -+++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h 2019-12-17 21:53:53.793000000 +0100 +diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h +--- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h 2021-11-25 02:40:20.948500805 +0100 ++++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h 2021-11-25 02:42:31.838811162 +0100 @@ -22,9 +22,6 @@ # ifdef HAVE_SYS_PARAM_H # include @@ -181,9 +169,9 @@ diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4 #endif -diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h ---- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h 2019-12-17 21:48:47.584000000 +0100 -+++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h 2019-12-17 21:53:47.514000000 +0100 +diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h +--- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h 2021-11-25 02:40:20.948500805 +0100 ++++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h 2021-11-25 02:42:31.838811162 +0100 @@ -31,9 +31,6 @@ # ifdef HAVE_SYS_PARAM_H # include diff --git a/mysql-bug-91914.patch b/mysql-bug-91914.patch deleted file mode 100644 index ba588ce..0000000 --- a/mysql-bug-91914.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/regex/CMakeLists.txt b/regex/CMakeLists.txt ---- a/regex/CMakeLists.txt 2018-06-08 09:56:29.000000000 +0000 -+++ b/regex/CMakeLists.txt 2018-08-05 03:30:10.838781267 +0000 -@@ -15,6 +15,8 @@ - - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) - -+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) -+ - MY_CHECK_C_COMPILER_FLAG("-Wstringop-truncation" HAVE_STRINGOP_TRUNCATION) - IF(HAVE_STRINGOP_TRUNCATION) - ADD_COMPILE_FLAGS( diff --git a/mysql-chain-certs.patch b/mysql-chain-certs.patch index 0a99238..36c1cd3 100644 --- a/mysql-chain-certs.patch +++ b/mysql-chain-certs.patch @@ -1,7 +1,7 @@ -diff -ur percona-server-5.7.28-31.orig/vio/viosslfactories.c percona-server-5.7.28-31/vio/viosslfactories.c ---- percona-server-5.7.28-31.orig/vio/viosslfactories.c 2019-12-16 23:44:00.665000000 +0100 -+++ percona-server-5.7.28-31/vio/viosslfactories.c 2019-12-16 23:46:07.804000000 +0100 -@@ -199,7 +199,7 @@ +diff -ur percona-server-5.7.35-38.orig/vio/viosslfactories.c percona-server-5.7.35-38/vio/viosslfactories.c +--- percona-server-5.7.35-38.orig/vio/viosslfactories.c 2021-11-24 19:48:22.417746172 +0100 ++++ percona-server-5.7.35-38/vio/viosslfactories.c 2021-11-24 19:48:50.473812651 +0100 +@@ -200,7 +200,7 @@ key_file= cert_file; if (cert_file && diff --git a/mysql-cmake.patch b/mysql-cmake.patch index 9d439ee..b26722a 100644 --- a/mysql-cmake.patch +++ b/mysql-cmake.patch @@ -1,7 +1,7 @@ -diff -ur percona-server-5.7.28-31.orig/cmake/readline.cmake percona-server-5.7.28-31/cmake/readline.cmake ---- percona-server-5.7.28-31.orig/cmake/readline.cmake 2019-12-16 23:52:33.110000000 +0100 -+++ percona-server-5.7.28-31/cmake/readline.cmake 2019-12-16 23:53:01.681000000 +0100 -@@ -119,23 +119,23 @@ +diff -ur percona-server-5.7.35-38.orig/cmake/readline.cmake percona-server-5.7.35-38/cmake/readline.cmake +--- percona-server-5.7.35-38.orig/cmake/readline.cmake 2021-11-24 19:49:56.851969940 +0100 ++++ percona-server-5.7.35-38/cmake/readline.cmake 2021-11-24 19:50:52.286101293 +0100 +@@ -110,23 +110,23 @@ MACRO (FIND_SYSTEM_EDITLINE) FIND_PATH(FOUND_EDITLINE_READLINE @@ -29,8 +29,8 @@ diff -ur percona-server-5.7.28-31.orig/cmake/readline.cmake percona-server-5.7.2 ) MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY) -@@ -148,7 +148,7 @@ - SET(CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY}) +@@ -141,7 +141,7 @@ + LIST(APPEND CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY}) CHECK_CXX_SOURCE_COMPILES(" #include - #include @@ -38,7 +38,7 @@ diff -ur percona-server-5.7.28-31.orig/cmake/readline.cmake percona-server-5.7.2 int main(int argc, char **argv) { HIST_ENTRY entry; -@@ -158,14 +158,13 @@ +@@ -151,14 +151,13 @@ CHECK_CXX_SOURCE_COMPILES(" #include @@ -56,5 +56,5 @@ diff -ur percona-server-5.7.28-31.orig/cmake/readline.cmake percona-server-5.7.2 + rl_completion_matches(0,0); + return res ? 0 : 1; }" - EDITLINE_HAVE_COMPLETION_INT) + XLINE_HAVE_COMPLETION_INT) diff --git a/mysql-dubious-exports.patch b/mysql-dubious-exports.patch index 30a240c..a928927 100644 --- a/mysql-dubious-exports.patch +++ b/mysql-dubious-exports.patch @@ -1,6 +1,6 @@ -diff -ur percona-server-5.7.28-31.orig/include/m_string.h percona-server-5.7.28-31/include/m_string.h ---- percona-server-5.7.28-31.orig/include/m_string.h 2019-12-16 23:51:39.761000000 +0100 -+++ percona-server-5.7.28-31/include/m_string.h 2019-12-16 23:52:03.126000000 +0100 +diff -ur percona-server-5.7.35-38.orig/include/m_string.h percona-server-5.7.35-38/include/m_string.h +--- percona-server-5.7.35-38.orig/include/m_string.h 2021-11-24 19:49:05.797848959 +0100 ++++ percona-server-5.7.35-38/include/m_string.h 2021-11-24 19:49:38.519926500 +0100 @@ -193,6 +193,7 @@ extern size_t strnlen(const char *s, size_t n); #endif @@ -9,9 +9,32 @@ diff -ur percona-server-5.7.28-31.orig/include/m_string.h percona-server-5.7.28- extern int is_prefix(const char *, const char *); /* Conversion routines */ -diff -ur percona-server-5.7.28-31.orig/include/my_sys.h percona-server-5.7.28-31/include/my_sys.h ---- percona-server-5.7.28-31.orig/include/my_sys.h 2019-12-16 23:51:39.762000000 +0100 -+++ percona-server-5.7.28-31/include/my_sys.h 2019-12-16 23:52:03.125000000 +0100 +diff -ur percona-server-5.7.35-38.orig/include/mysql_com.h percona-server-5.7.35-38/include/mysql_com.h +--- percona-server-5.7.35-38.orig/include/mysql_com.h 2021-11-24 19:49:05.801848968 +0100 ++++ percona-server-5.7.35-38/include/mysql_com.h 2021-11-24 19:49:38.553926581 +0100 +@@ -522,6 +522,7 @@ + void net_end(NET *net); + void net_clear(NET *net, my_bool check_buffer); + void net_claim_memory_ownership(NET *net); ++#define net_realloc mysql_net_realloc /* namespace sanity */ + my_bool net_realloc(NET *net, size_t length); + my_bool net_flush(NET *net); + my_bool my_net_write(NET *net,const unsigned char *packet, size_t len); +diff -ur percona-server-5.7.35-38.orig/include/mysql.h.pp percona-server-5.7.35-38/include/mysql.h.pp +--- percona-server-5.7.35-38.orig/include/mysql.h.pp 2021-11-24 19:49:05.799848964 +0100 ++++ percona-server-5.7.35-38/include/mysql.h.pp 2021-11-24 19:49:38.552926579 +0100 +@@ -128,7 +128,7 @@ + void net_end(NET *net); + void net_clear(NET *net, my_bool check_buffer); + void net_claim_memory_ownership(NET *net); +-my_bool net_realloc(NET *net, size_t length); ++my_bool mysql_net_realloc(NET *net, size_t length); + my_bool net_flush(NET *net); + my_bool my_net_write(NET *net,const unsigned char *packet, size_t len); + my_bool net_write_command(NET *net,unsigned char command, +diff -ur percona-server-5.7.35-38.orig/include/my_sys.h percona-server-5.7.35-38/include/my_sys.h +--- percona-server-5.7.35-38.orig/include/my_sys.h 2021-11-24 19:49:05.798848961 +0100 ++++ percona-server-5.7.35-38/include/my_sys.h 2021-11-24 19:49:38.552926579 +0100 @@ -261,6 +261,7 @@ /* charsets */ @@ -30,26 +53,3 @@ diff -ur percona-server-5.7.28-31.orig/include/my_sys.h percona-server-5.7.28-31 extern CHARSET_INFO *get_charset(uint cs_number, myf flags); extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags); extern CHARSET_INFO *my_collation_get_by_name(MY_CHARSET_LOADER *loader, -diff -ur percona-server-5.7.28-31.orig/include/mysql.h.pp percona-server-5.7.28-31/include/mysql.h.pp ---- percona-server-5.7.28-31.orig/include/mysql.h.pp 2019-12-16 23:51:39.762000000 +0100 -+++ percona-server-5.7.28-31/include/mysql.h.pp 2019-12-16 23:52:03.125000000 +0100 -@@ -128,7 +128,7 @@ - void net_end(NET *net); - void net_clear(NET *net, my_bool check_buffer); - void net_claim_memory_ownership(NET *net); --my_bool net_realloc(NET *net, size_t length); -+my_bool mysql_net_realloc(NET *net, size_t length); - my_bool net_flush(NET *net); - my_bool my_net_write(NET *net,const unsigned char *packet, size_t len); - my_bool net_write_command(NET *net,unsigned char command, -diff -ur percona-server-5.7.28-31.orig/include/mysql_com.h percona-server-5.7.28-31/include/mysql_com.h ---- percona-server-5.7.28-31.orig/include/mysql_com.h 2019-12-16 23:51:39.763000000 +0100 -+++ percona-server-5.7.28-31/include/mysql_com.h 2019-12-16 23:52:03.126000000 +0100 -@@ -522,6 +522,7 @@ - void net_end(NET *net); - void net_clear(NET *net, my_bool check_buffer); - void net_claim_memory_ownership(NET *net); -+#define net_realloc mysql_net_realloc /* namespace sanity */ - my_bool net_realloc(NET *net, size_t length); - my_bool net_flush(NET *net); - my_bool my_net_write(NET *net,const unsigned char *packet, size_t len); diff --git a/mysql-opt.patch b/mysql-opt.patch index c24063f..766dda8 100644 --- a/mysql-opt.patch +++ b/mysql-opt.patch @@ -1,6 +1,6 @@ -diff -ur percona-server-5.7.28-31.orig/cmake/build_configurations/compiler_options.cmake percona-server-5.7.28-31/cmake/build_configurations/compiler_options.cmake ---- percona-server-5.7.28-31.orig/cmake/build_configurations/compiler_options.cmake 2019-12-16 22:33:24.884000000 +0100 -+++ percona-server-5.7.28-31/cmake/build_configurations/compiler_options.cmake 2019-12-16 22:34:14.208000000 +0100 +diff -ur percona-server-5.7.35-38.orig/cmake/build_configurations/compiler_options.cmake percona-server-5.7.35-38/cmake/build_configurations/compiler_options.cmake +--- percona-server-5.7.35-38.orig/cmake/build_configurations/compiler_options.cmake 2021-11-24 18:56:51.570445147 +0100 ++++ percona-server-5.7.35-38/cmake/build_configurations/compiler_options.cmake 2021-11-24 19:35:58.389983145 +0100 @@ -32,17 +32,17 @@ SET(64BIT 1) ENDIF() @@ -24,39 +24,22 @@ diff -ur percona-server-5.7.28-31.orig/cmake/build_configurations/compiler_optio ENDIF() ENDIF() -@@ -68,8 +68,8 @@ - IF(C_NO_EXPENSIVE_OPTIMIZATIONS) - SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -fno-expensive-optimizations") - ENDIF() -- SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}") -- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}") -+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}") -+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}") - ENDIF() - IF(CMAKE_COMPILER_IS_GNUCXX) - SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") -@@ -102,8 +102,8 @@ - # Default Clang flags - IF(CMAKE_C_COMPILER_ID MATCHES "Clang") - SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") -- SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}") -- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}") -+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}") -+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}") - ENDIF() - IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") -@@ -153,10 +153,10 @@ +@@ -166,13 +166,13 @@ + ENDIF() SET(COMMON_C_FLAGS "-g ${SUNPRO_FLAGS}") - SET(COMMON_CXX_FLAGS "-g0 ${SUNPRO_FLAGS}") -- SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=c++03") -- SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}") -+ SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=c++11") -+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}") - SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}") -- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_C_FLAGS}") -+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-xO3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}") - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_CXX_FLAGS}") - ENDIF() - ENDIF() +- SET(COMMON_CXX_FLAGS "-g0 ${SUNPRO_FLAGS} -std=c++03") ++ SET(COMMON_CXX_FLAGS "-g0 ${SUNPRO_FLAGS} -std=c++11") + # For SunPro, append our own flags rather than prepending below. + # We need -g0 and the misc -x flags above to reduce the size of binaries. +- STRING_APPEND(CMAKE_C_FLAGS_DEBUG " ${COMMON_C_FLAGS}") +- STRING_APPEND(CMAKE_CXX_FLAGS_DEBUG " ${COMMON_CXX_FLAGS}") +- STRING_APPEND(CMAKE_C_FLAGS_RELWITHDEBINFO " -xO3 ${COMMON_C_FLAGS}") +- STRING_APPEND(CMAKE_CXX_FLAGS_RELWITHDEBINFO " -xO3 ${COMMON_CXX_FLAGS}") ++ STRING_APPEND(CMAKE_C_FLAGS_DEBUG " ${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}") ++ STRING_APPEND(CMAKE_CXX_FLAGS_DEBUG " ${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}") ++ STRING_APPEND(CMAKE_C_FLAGS_RELWITHDEBINFO " -O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}") ++ STRING_APPEND(CMAKE_CXX_FLAGS_RELWITHDEBINFO " -O3 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}") + STRING_APPEND(CMAKE_C_FLAGS_RELEASE " -xO3 ${COMMON_C_FLAGS}") + STRING_APPEND(CMAKE_CXX_FLAGS_RELEASE " -xO3 ${COMMON_CXX_FLAGS}") + STRING_APPEND(CMAKE_C_FLAGS_MINSIZEREL " -xO3 ${COMMON_C_FLAGS}") diff --git a/mysql-protobuf.patch b/mysql-protobuf.patch index 6a6749b..6e85914 100644 --- a/mysql-protobuf.patch +++ b/mysql-protobuf.patch @@ -1,6 +1,6 @@ -diff -ur percona-server-5.7.28-31.orig/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h percona-server-5.7.28-31/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h ---- percona-server-5.7.28-31.orig/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h 2019-12-16 23:53:27.212000000 +0100 -+++ percona-server-5.7.28-31/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h 2019-12-16 23:53:54.059000000 +0100 +diff -ur percona-server-5.7.35-38.orig/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h percona-server-5.7.35-38/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h +--- percona-server-5.7.35-38.orig/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h 2021-11-24 19:41:59.748839411 +0100 ++++ percona-server-5.7.35-38/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h 2021-11-24 19:43:50.561101985 +0100 @@ -36,7 +36,9 @@ #include #include diff --git a/mysql-sphinx.patch b/mysql-sphinx.patch index dac55bd..26517e4 100644 --- a/mysql-sphinx.patch +++ b/mysql-sphinx.patch @@ -1,6 +1,7 @@ ---- mysql-5.1.49/storage/sphinx/Makefile.am~ 2009-02-13 23:26:46.000000000 +0200 -+++ mysql-5.1.49/storage/sphinx/Makefile.am 2010-07-24 16:35:57.568716704 +0300 -@@ -31,7 +31,7 @@ +diff -ur percona-server-5.7.35-38.orig/storage/sphinx/Makefile.am percona-server-5.7.35-38/storage/sphinx/Makefile.am +--- percona-server-5.7.35-38.orig/storage/sphinx/Makefile.am 2016-07-19 12:42:18.000000000 +0200 ++++ percona-server-5.7.35-38/storage/sphinx/Makefile.am 2021-11-24 19:47:02.552556917 +0100 +@@ -31,19 +31,19 @@ LDADD = DEFS= @DEFS@ \ @@ -9,9 +10,6 @@ noinst_HEADERS = ha_sphinx.h ---- mysql-5.1.49/storage/sphinx/Makefile.am~ 2010-07-24 16:37:48.000000000 +0300 -+++ mysql-5.1.49/storage/sphinx/Makefile.am 2010-07-24 17:00:56.161565823 +0300 -@@ -38,7 +38,7 @@ EXTRA_LTLIBRARIES = ha_sphinx.la pkgplugin_LTLIBRARIES = @plugin_sphinx_shared_target@ sphinx.la @@ -20,11 +18,6 @@ ha_sphinx_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_sphinx_la_SOURCES = ha_sphinx.cc ---- mysql-5.1.49/storage/sphinx/Makefile.am~ 2010-07-24 19:14:55.000000000 +0300 -+++ mysql-5.1.49/storage/sphinx/Makefile.am 2010-07-25 03:47:56.660771099 +0300 -@@ -43,7 +43,7 @@ - ha_sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_sphinx_la_SOURCES = ha_sphinx.cc -sphinx_la_LDFLAGS = -module +sphinx_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir) diff --git a/mysql-versioning.patch b/mysql-versioning.patch index 076fad0..7847a70 100644 --- a/mysql-versioning.patch +++ b/mysql-versioning.patch @@ -1,6 +1,6 @@ -diff -ur percona-server-5.7.28-31.orig/libmysql/libmysql.map percona-server-5.7.28-31/libmysql/libmysql.map ---- percona-server-5.7.28-31.orig/libmysql/libmysql.map 2019-12-16 22:38:32.587000000 +0100 -+++ percona-server-5.7.28-31/libmysql/libmysql.map 2019-12-16 23:41:16.223000000 +0100 +diff -ur percona-server-5.7.35-38.orig/libmysql/libmysql.map percona-server-5.7.35-38/libmysql/libmysql.map +--- percona-server-5.7.35-38.orig/libmysql/libmysql.map 2021-11-24 19:40:24.831614501 +0100 ++++ percona-server-5.7.35-38/libmysql/libmysql.map 2021-11-24 19:41:42.172797763 +0100 @@ -145,6 +145,7 @@ mysql_net_realloc; # PHP's mysqli.so requires this (via the ER() macro) diff --git a/mysql.spec b/mysql.spec index b587131..e519572 100644 --- a/mysql.spec +++ b/mysql.spec @@ -30,12 +30,13 @@ %bcond_with systemtap # systemtap/dtrace probes %bcond_without tcpd # libwrap (tcp_wrappers) support %bcond_with sphinx # Sphinx storage engine support -%bcond_without tokudb # TokuDB +%bcond_with tokudb # TokuDB %bcond_without rocksdb # RocksDB # mysql needs boost 1.59.0 and doesn't support newer/older boost versions %bcond_with system_boost # Use system boost package %bcond_with tests # FIXME: don't run correctly %bcond_with ndb # NDB is now a separate product, this here is broken, so disable it +%bcond_without coredumper # coredumper support # tokudb is only supported on x86_64 %ifnarch %{x8664} @@ -44,8 +45,7 @@ %endif %define rel 1 -%define percona_rel 32 -%include /usr/lib/rpm/macros.perl +%define percona_rel 38 Summary: MySQL: a very fast and reliable SQL database engine Summary(de.UTF-8): MySQL: ist eine SQL-Datenbank Summary(fr.UTF-8): MySQL: un serveur SQL rapide et fiable @@ -55,12 +55,12 @@ Summary(ru.UTF-8): MySQL - быстрый SQL-сервер Summary(uk.UTF-8): MySQL - швидкий SQL-сервер Summary(zh_CN.UTF-8): MySQL数据库服务器 Name: mysql -Version: 5.7.29 +Version: 5.7.35 Release: %{percona_rel}.%{rel} License: GPL + MySQL FLOSS Exception Group: Applications/Databases Source0: https://www.percona.com/downloads/Percona-Server-5.7/LATEST/source/tarball/percona-server-%{version}-%{percona_rel}.tar.gz -# Source0-md5: 94d1ed60a6ca2cd47e8f86c067dcca50 +# Source0-md5: 61359c10adbfef3f5d2d8284a0d5031a Source100: http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz # Source100-md5: 5cac34f3d78a9d612ca4301abfcbd666 %if %{without system_boost} @@ -82,12 +82,13 @@ Source13: %{name}-client.conf Source14: my.cnf Patch0: mysql-opt.patch Patch1: mysql-versioning.patch -Patch2: mysql-sphinx.patch -Patch3: mysql-chain-certs.patch -Patch4: mysql-dubious-exports.patch -Patch5: mysql-cmake.patch -Patch6: mysql-protobuf.patch -Patch7: drop-sysctl_h.patch +Patch2: mysql-protobuf.patch +Patch3: build.patch +Patch17: mysql-sphinx.patch +Patch18: mysql-5.7-sphinx.patch +Patch19: mysql-chain-certs.patch +Patch20: mysql-dubious-exports.patch +Patch24: mysql-cmake.patch URL: https://www.percona.com/software/mysql-database/percona-server BuildRequires: bison >= 1.875 BuildRequires: cmake >= 2.8.2 @@ -98,6 +99,7 @@ BuildRequires: automake %{?with_system_boost:BuildRequires: boost-devel = 1.59.0} BuildRequires: libhsclient-devel %{?with_tcpd:BuildRequires: libwrap-devel} +BuildRequires: lz4-devel >= 1:1.9.3 BuildRequires: mecab-devel BuildRequires: ncurses-devel >= 4.2 %{?with_ssl:BuildRequires: openssl-devel >= 0.9.7d} @@ -106,6 +108,7 @@ BuildRequires: pam-devel BuildRequires: perl-devel >= 1:5.6.1 BuildRequires: protobuf-devel BuildRequires: python-modules +BuildRequires: rpcsvc-proto BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: rpmbuild(macros) >= 1.597 BuildRequires: sed >= 4.0 @@ -494,16 +497,17 @@ sed -i -e 's#perconaserverclient#mysqlclient#g' libmysql/libmysql.{ver.in,map} s %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %if %{with sphinx} # http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51 -mv sphinx-*/mysqlse storage/sphinx -%patch2 -p1 +%{__mv} sphinx-*/mysqlse storage/sphinx +%patch17 -p1 +%patch18 -p1 %endif -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 +%patch19 -p1 +%patch20 -p1 +%patch24 -p1 # to get these files rebuild [ -f sql/sql_yacc.cc ] && %{__rm} sql/sql_yacc.cc @@ -555,22 +559,41 @@ CPPFLAGS="%{rpmcppflags}" \ -DWITH_SCALABILITY_METRICS=ON \ -DWITH_SSL=%{?with_ssl:system}%{!?with_ssl:no} \ -DWITH_UNIT_TESTS=%{?with_tests:ON}%{!?with_tests:OFF} \ + -DWITH_COREDUMPER=%{?with_coredumper:ON}%{!?with_coredumper:OFF} \ %{!?with_tokudb:-DWITHOUT_TOKUDB=ON} \ %{!?with_rocksdb:-DWITHOUT_ROCKSDB=ON} \ %if %{without system_boost} %{!?with_system_boost:-DWITH_BOOST="$(pwd)/$(ls -1d ../boost_*)"} \ %endif - -DWITH_ZLIB=system \ - -DWITH_READLINE=system \ - -DWITH_LZ4=system \ -DWITH_LIBEVENT=system \ - -DWITH_PROTOBUF=system \ + -DWITH_LZ4=system \ -DWITH_MECAB=system \ + -DWITH_PROTOBUF=system \ + -DWITH_READLINE=system \ + -DWITH_ZLIB=system \ -DTMPDIR=/var/tmp %{__make} -%{?with_tests:%{__make} test} +%if %{with tests} +%{__make} test + +cd mysql-test + +MTR_BINDIR=$(pwd)/../build/ \ +%{__perl} ./mysql-test-run.pl \ + --force \ + --retry=0 \ + --ssl \ + --suite-timeout=720 \ + --testcase-timeout=30 \ + --mysqld=--binlog-format=mixed \ + --force-restart \ + --shutdown-timeout=60 \ + --max-test-fail=0 \ + --big-test \ + --skip-test-list=unstable-tests +%endif %install rm -rf $RPM_BUILD_ROOT @@ -668,6 +691,7 @@ mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysqlcheck # not needed %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin/libdaemon_example.* %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin/daemon_example.ini +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin/udf_example.so # not an .info file %{__rm} $RPM_BUILD_ROOT%{_infodir}/mysql.info @@ -760,6 +784,8 @@ fi %attr(755,root,root) %{_libdir}/%{name}/plugin/auth_test_plugin.so %attr(755,root,root) %{_libdir}/%{name}/plugin/authentication_ldap_sasl_client.so %attr(755,root,root) %{_libdir}/%{name}/plugin/connection_control.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/data_masking.ini +%attr(755,root,root) %{_libdir}/%{name}/plugin/data_masking.so %attr(755,root,root) %{_libdir}/%{name}/plugin/dialog.so %attr(755,root,root) %{_libdir}/%{name}/plugin/group_replication.so %attr(755,root,root) %{_libdir}/%{name}/plugin/keyring_file.so -- 2.46.0