- updated to 5.7.28-31

diff --git a/drop-sysctl_h.patch b/drop-sysctl_h.patch
new file mode 100644 (file)
index 0000000..8921b7e
--- /dev/null
+++ b/drop-sysctl_h.patch
@@ -0,0 +1,196 @@
+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 @@
+ 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)
+-CHECK_INCLUDE_FILE(sys/sysctl.h EVENT__HAVE_SYS_SYSCTL_H)
+ 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()
+ 
+ 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_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 <unistd.h>
+ #include <sys/param.h>
+ #include <sys/time.h>
+-#ifdef EVENT__HAVE_SYS_SYSCTL_H
+-#include <sys/sysctl.h>
+-#endif
+ #endif
+ #include <limits.h>
+ #include <stdlib.h>
+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 @@
+ /* Define to 1 if you have the <sys/stat.h> header file. */
+ #cmakedefine EVENT__HAVE_SYS_STAT_H
+ 
+-/* Define to 1 if you have the <sys/sysctl.h> header file. */
+-#cmakedefine EVENT__HAVE_SYS_SYSCTL_H
+-
+ /* Define to 1 if you have the <sys/timerfd.h> header file. */
+ #cmakedefine EVENT__HAVE_SYS_TIMERFD_H */
+ 
+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
+@@ -37,7 +37,6 @@
+ #ifdef __FreeBSD__
+ 
+ #include <net/ethernet.h>
+-#include <sys/sysctl.h>
+ #include <net/route.h>
+ #include <net/if.h>
+ #include <net/if_dl.h>
+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 <sys/sysctl.h>
+-
+ /* 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
+@@ -39,7 +39,6 @@
+ check_include_files(sys/resource.h HAVE_SYS_RESOURCE_H)
+ check_include_files(sys/statvfs.h HAVE_SYS_STATVFS_H)
+ check_include_files(sys/syscall.h HAVE_SYS_SYSCALL_H)
+-check_include_files(sys/sysctl.h HAVE_SYS_SYSCTL_H)
+ 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
+@@ -60,9 +60,6 @@
+ #if defined(HAVE_SYS_SYSCALL_H)
+ # include <sys/syscall.h>
+ #endif
+-#if defined(HAVE_SYS_SYSCTL_H)
+-# include <sys/sysctl.h>
+-#endif
+ #if defined(HAVE_PTHREAD_NP_H)
+ # include <pthread_np.h>
+ #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
+@@ -231,9 +231,6 @@
+ /* Define to 1 if you have the <sys/stat.h> header file. */
+ #undef HAVE_SYS_STAT_H
+ 
+-/* Define to 1 if you have the <sys/sysctl.h> header file. */
+-#undef HAVE_SYS_SYSCTL_H
+-
+ /* Define to 1 if you have the <sys/time.h> 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
+@@ -16181,7 +16181,7 @@
+ 
+ 
+ 
+-for ac_header in sys/param.h sys/sysctl.h byteswap.h
++for ac_header in sys/param.h byteswap.h
+ do
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+@@ -19545,7 +19545,6 @@
+ #ifdef HAVE_SYS_PARAM_H
+ #     include <sys/param.h>
+ #endif
+-#include <sys/sysctl.h>
+ int
+ main(void)
+ {
+@@ -19723,7 +19722,6 @@
+ #ifdef HAVE_SYS_PARAM_H
+ #     include <sys/param.h>
+ #endif
+-#include <sys/sysctl.h>
+ 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
+@@ -476,7 +476,7 @@
+       [AC_MSG_ERROR([Required header file(s) are missing.])])
+ 
+ # If any of these headers are missing, things should still work correctly:
+-AC_CHECK_HEADERS([sys/param.h sys/sysctl.h byteswap.h],
++AC_CHECK_HEADERS([sys/param.h byteswap.h],
+       [], [], [
+ #ifdef HAVE_SYS_PARAM_H
+ #     include <sys/param.h>
+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
+@@ -36,7 +36,6 @@
+ #ifdef HAVE_SYS_PARAM_H
+ #     include <sys/param.h>
+ #endif
+-#include <sys/sysctl.h>
+ 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
+@@ -38,7 +38,6 @@
+ #ifdef HAVE_SYS_PARAM_H
+ #     include <sys/param.h>
+ #endif
+-#include <sys/sysctl.h>
+ 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
+@@ -22,9 +22,6 @@
+ #     ifdef HAVE_SYS_PARAM_H
+ #             include <sys/param.h>
+ #     endif
+-#     ifdef HAVE_SYS_SYSCTL_H
+-#             include <sys/sysctl.h>
+-#     endif
+ #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
+@@ -31,9 +31,6 @@
+ #     ifdef HAVE_SYS_PARAM_H
+ #             include <sys/param.h>
+ #     endif
+-#     ifdef HAVE_SYS_SYSCTL_H
+-#             include <sys/sysctl.h>
+-#     endif
+ 
+ #elif defined(HAVE_PHYSMEM_SYSINFO)
+ #     include <sys/sysinfo.h>

diff --git a/mysql-chain-certs.patch b/mysql-chain-certs.patch
index 3914311ba2c0891d206de00e9ca2507c003e8902..0a99238330c357d28d002a79907a68b60a557d1c 100644 (file)
--- a/mysql-chain-certs.patch
+++ b/mysql-chain-certs.patch
@@ -1,19 +1,7 @@
-Fix things so that chains of certificates work in the server and client
-certificate files.
-
-This only really works for OpenSSL-based builds, as yassl is unable to read
-multiple certificates from a file.  The patch below to yassl/src/ssl.cpp
-doesn't fix that, but just arranges that the viosslfactories.c patch won't
-have any ill effects in a yassl build.  Since we don't use yassl in Red Hat/
-Fedora builds, I'm not feeling motivated to try to fix yassl for this.
-
-See RH bug #598656.  Filed upstream at http://bugs.mysql.com/bug.php?id=54158
-
-
-diff -Naur mysql-5.1.47.orig/vio/viosslfactories.c mysql-5.1.47/vio/viosslfactories.c
---- mysql-5.1.47.orig/vio/viosslfactories.c    2010-05-06 11:28:07.000000000 -0400
-+++ mysql-5.1.47/vio/viosslfactories.c 2010-05-26 23:23:46.000000000 -0400
-@@ -106,7 +106,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 @@
      key_file= cert_file;
  
    if (cert_file &&
@@ -22,20 +10,3 @@ diff -Naur mysql-5.1.47.orig/vio/viosslfactories.c mysql-5.1.47/vio/viosslfactor
    {
      *error= SSL_INITERR_CERT;
      DBUG_PRINT("error",("%s from file '%s'", sslGetErrString(*error), cert_file));
-diff -Naur mysql-5.1.47.orig/extra/yassl/src/ssl.cpp mysql-5.1.47/extra/yassl/src/ssl.cpp
---- mysql-5.1.47.orig/extra/yassl/src/ssl.cpp  2010-05-06 11:24:26.000000000 -0400
-+++ mysql-5.1.47/extra/yassl/src/ssl.cpp       2010-05-26 23:29:13.000000000 -0400
-@@ -1606,10 +1606,10 @@
-     }
- 
- 
--    int SSL_CTX_use_certificate_chain_file(SSL_CTX*, const char*)
-+    int SSL_CTX_use_certificate_chain_file(SSL_CTX* ctx, const char* file)
-     {
--        // TDOD:
--        return SSL_SUCCESS;
-+        // For the moment, treat like use_certificate_file
-+        return read_file(ctx, file, SSL_FILETYPE_PEM, Cert);
-     }
- 
- 

diff --git a/mysql-cmake.patch b/mysql-cmake.patch
index 7b7ae1c2100e24e5d81f3a164bf7ed8f352c8c60..9d439ee5f1eacf5252da2e7f3428d2c762a88594 100644 (file)
--- a/mysql-cmake.patch
+++ b/mysql-cmake.patch
@@ -1,6 +1,7 @@
---- Percona-Server-5.6.15-rel63.0/cmake/readline.cmake.orig    2013-12-18 10:52:13.000000000 +0100
-+++ Percona-Server-5.6.15-rel63.0/cmake/readline.cmake 2014-02-09 06:17:56.079619159 +0100
-@@ -131,23 +131,23 @@
+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 @@
  
  MACRO (FIND_SYSTEM_EDITLINE)
    FIND_PATH(FOUND_EDITLINE_READLINE
@@ -28,7 +29,7 @@
    )
    MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY)
  
-@@ -160,7 +160,7 @@
+@@ -148,7 +148,7 @@
      SET(CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})
      CHECK_CXX_SOURCE_COMPILES("
      #include <stdio.h>
@@ -37,7 +38,7 @@
      int main(int argc, char **argv)
      {
         HIST_ENTRY entry;
-@@ -170,14 +170,13 @@
+@@ -158,14 +158,13 @@
  
      CHECK_CXX_SOURCE_COMPILES("
      #include <stdio.h>
@@ -55,5 +56,5 @@
 +      rl_completion_matches(0,0);
 +      return res ? 0 : 1;
      }"
-     EDITLINE_HAVE_COMPLETION)
+     EDITLINE_HAVE_COMPLETION_INT)
  

diff --git a/mysql-dubious-exports.patch b/mysql-dubious-exports.patch
index 076167c7650609abbdb01bdd879902c28579fc35..30a240c7b82657f25ab900866ef40bb360e31266 100644 (file)
--- a/mysql-dubious-exports.patch
+++ b/mysql-dubious-exports.patch
@@ -1,12 +1,18 @@
-Prefix mysql_ to the real names of several symbols that have to be exported
-from libmysqlclient because mysql-connector-odbc and/or PHP depend on them.
-This limits the intrusion on application namespace.
-
-
-diff -Naur mysql-5.5.8.orig/include/my_sys.h mysql-5.5.8/include/my_sys.h
---- mysql-5.5.8.orig/include/my_sys.h  2010-12-03 12:58:24.000000000 -0500
-+++ mysql-5.5.8/include/my_sys.h       2010-12-27 14:27:23.956926896 -0500
-@@ -227,6 +227,7 @@
+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
+@@ -193,6 +193,7 @@
+ extern size_t strnlen(const char *s, size_t n);
+ #endif
+ 
++#define is_prefix mysql_is_prefix             /* namespace sanity */
+ 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
+@@ -261,6 +261,7 @@
  
  /* charsets */
  #define MY_ALL_CHARSETS_SIZE 2048
@@ -14,7 +20,7 @@ diff -Naur mysql-5.5.8.orig/include/my_sys.h mysql-5.5.8/include/my_sys.h
  extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *default_charset_info;
  extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *all_charsets[MY_ALL_CHARSETS_SIZE];
  extern CHARSET_INFO compiled_charsets[];
-@@ -914,6 +915,9 @@
+@@ -999,6 +1000,9 @@
  extern uint get_collation_number(const char *name);
  extern const char *get_charset_name(uint cs_number);
  
@@ -23,9 +29,10 @@ diff -Naur mysql-5.5.8.orig/include/my_sys.h mysql-5.5.8/include/my_sys.h
 +
  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 *get_charset_by_csname(const char *cs_name,
---- percona-server-5.7.12-5/include/mysql.h.pp~        2016-06-01 09:44:09.000000000 +0300
-+++ percona-server-5.7.12-5/include/mysql.h.pp 2016-06-20 09:12:25.119724253 +0300
+ 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);
@@ -35,9 +42,10 @@ diff -Naur mysql-5.5.8.orig/include/my_sys.h mysql-5.5.8/include/my_sys.h
  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,
---- percona-server-5.7.12-5/include/mysql_com.h~       2016-06-01 09:44:09.000000000 +0300
-+++ percona-server-5.7.12-5/include/mysql_com.h        2016-06-20 09:12:01.301815678 +0300
-@@ -509,6 +509,7 @@
+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);
@@ -45,13 +53,3 @@ diff -Naur mysql-5.5.8.orig/include/my_sys.h mysql-5.5.8/include/my_sys.h
  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);
---- mysql-5.5.9/include/m_string.h~    2011-01-20 00:37:08.000000000 +0200
-+++ mysql-5.5.9/include/m_string.h     2011-03-31 16:36:35.184588054 +0300
-@@ -118,6 +118,7 @@
- extern size_t strnlen(const char *s, size_t n);
- #endif
- 
-+#define is_prefix mysql_is_prefix             /* namespace sanity */
- extern int is_prefix(const char *, const char *);
- 
- /* Conversion routines */

diff --git a/mysql-opt.patch b/mysql-opt.patch
index bc2de8e53ab40d24c0f5db502b191173666bc9b0..c24063f9a3c67a6ea7f0ac85537078e5a9bf333e 100644 (file)
--- a/mysql-opt.patch
+++ b/mysql-opt.patch
@@ -1,6 +1,7 @@
---- percona-server-5.7.25-28/cmake/build_configurations/compiler_options.cmake.orig    2019-02-18 07:11:31.000000000 +0100
-+++ percona-server-5.7.25-28/cmake/build_configurations/compiler_options.cmake 2019-02-28 06:43:42.913206001 +0100
-@@ -25,17 +25,17 @@ IF(SIZEOF_VOIDP EQUAL 8)
+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
+@@ -32,17 +32,17 @@
    SET(64BIT 1)
  ENDIF()
  
@@ -23,7 +24,7 @@
      ENDIF()
    ENDIF()
  
-@@ -61,8 +61,8 @@ IF(UNIX)
+@@ -68,8 +68,8 @@
      IF(C_NO_EXPENSIVE_OPTIMIZATIONS)
        SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -fno-expensive-optimizations")
      ENDIF()
@@ -34,7 +35,7 @@
    ENDIF()
    IF(CMAKE_COMPILER_IS_GNUCXX)
      SET(COMMON_CXX_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-@@ -95,8 +95,8 @@ IF(UNIX)
+@@ -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")
@@ -45,7 +46,7 @@
    ENDIF()
    IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
      SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
-@@ -146,10 +146,10 @@ IF(UNIX)
+@@ -153,10 +153,10 @@
  
        SET(COMMON_C_FLAGS            "-g ${SUNPRO_FLAGS}")
        SET(COMMON_CXX_FLAGS          "-g0 ${SUNPRO_FLAGS}")

diff --git a/mysql-protobuf.patch b/mysql-protobuf.patch
index cce64d4166e6bc1f41507c05a604caea49a8fa30..6a6749bf4206d597fd4e1c6e48244729624a4861 100644 (file)
--- a/mysql-protobuf.patch
+++ b/mysql-protobuf.patch
@@ -1,6 +1,7 @@
---- mysql-5.7.27/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h.orig        2019-06-10 16:43:20.000000000 +0200
-+++ mysql-5.7.27/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h     2019-07-29 19:19:29.421629353 +0200
-@@ -29,7 +29,9 @@
+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
+@@ -36,7 +36,9 @@
  #include <google/protobuf/io/tokenizer.h>
  #include <google/protobuf/io/zero_copy_stream.h>
  #include <google/protobuf/wire_format_lite.h>

diff --git a/mysql-versioning.patch b/mysql-versioning.patch
index 6d4ea8c8a4fec04d9be57bc893423da7b6fbe80d..076fad0a2102ca0f40d7c86070059c51ff9ef23a 100644 (file)
--- a/mysql-versioning.patch
+++ b/mysql-versioning.patch
@@ -1,5 +1,6 @@
---- Percona-Server-5.6.14-rel62.0//libmysql/libmysql.map       2013-10-30 17:14:14.270019272 +0100
-+++ percona-server-5.6.16-64.1/libmysql/libmysql.map   2014-05-02 22:58:14.025317912 +0300
+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
 @@ -145,6 +145,7 @@
        mysql_net_realloc;
  # PHP's mysqli.so requires this (via the ER() macro)
@@ -8,7 +9,9 @@
  # mydumper requires this (added by remi)
        my_net_read;
  };
-@@ -155,2 +156,4 @@
+@@ -152,4 +153,6 @@
+ libperconaserverclient_18_1 {
+   global:
        get_tty_password;
 +# for mysql-workbench 6.1
 +      mysql_options4;

diff --git a/mysql.spec b/mysql.spec
index deb8be561fcc614cb637cecce3fd4c0526711990..e0875dc8181342df00112c017048e82938105c25 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -43,8 +43,8 @@
 %undefine      with_tokudb
 %endif
 
-%define                rel     2
-%define                percona_rel     30
+%define                rel     1
+%define                percona_rel     31
 %include       /usr/lib/rpm/macros.perl
 Summary:       MySQL: a very fast and reliable SQL database engine
 Summary(de.UTF-8):     MySQL: ist eine SQL-Datenbank
@@ -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.27
+Version:       5.7.28
 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: f4161888aa25073597bbf4c4e9226479
+# Source0-md5: 0e10c019af943dece4ef7d98cdb36010
 Source100:     http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
 # Source100-md5:       5cac34f3d78a9d612ca4301abfcbd666
 %if %{without system_boost}
@@ -84,10 +84,10 @@ Patch0:             mysql-opt.patch
 Patch1:                mysql-versioning.patch
 Patch2:                mysql-sphinx.patch
 Patch3:                mysql-chain-certs.patch
-# from fedora
 Patch4:                mysql-dubious-exports.patch
 Patch5:                mysql-cmake.patch
 Patch6:                mysql-protobuf.patch
+Patch7:                drop-sysctl_h.patch
 URL:           https://www.percona.com/software/mysql-database/percona-server
 BuildRequires: bison >= 1.875
 BuildRequires: cmake >= 2.8.2
@@ -503,6 +503,7 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # to get these files rebuild
 [ -f sql/sql_yacc.cc ] && %{__rm} sql/sql_yacc.cc