- rediff patches

diff --git a/mysql-cmake.patch b/mysql-cmake.patch
index 7b7ae1c2100e24e5d81f3a164bf7ed8f352c8c60..45ee6aba62873c04cad424c1c761d5b95ff235ce 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 -urNp -x '*.orig' percona-server-5.7.31-34.org/cmake/readline.cmake percona-server-5.7.31-34/cmake/readline.cmake
+--- percona-server-5.7.31-34.org/cmake/readline.cmake  2020-08-15 11:23:18.000000000 +0200
++++ percona-server-5.7.31-34/cmake/readline.cmake      2021-05-26 15:30:14.903462364 +0200
+@@ -107,23 +107,23 @@ ENDMACRO()
  
  MACRO (FIND_SYSTEM_EDITLINE)
    FIND_PATH(FOUND_EDITLINE_READLINE
@@ -28,8 +29,8 @@
    )
    MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY)
  
-@@ -160,7 +160,7 @@
-     SET(CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})
+@@ -138,7 +138,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
+     LIST(APPEND CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})
      CHECK_CXX_SOURCE_COMPILES("
      #include <stdio.h>
 -    #include <readline.h>
@@ -37,7 +38,7 @@
      int main(int argc, char **argv)
      {
         HIST_ENTRY entry;
-@@ -170,14 +170,13 @@
+@@ -148,14 +148,13 @@ MACRO (FIND_SYSTEM_EDITLINE)
  
      CHECK_CXX_SOURCE_COMPILES("
      #include <stdio.h>
@@ -55,5 +56,5 @@
 +      rl_completion_matches(0,0);
 +      return res ? 0 : 1;
      }"
-     EDITLINE_HAVE_COMPLETION)
+     XLINE_HAVE_COMPLETION_INT)
  

diff --git a/mysql-dubious-exports.patch b/mysql-dubious-exports.patch
index 076167c7650609abbdb01bdd879902c28579fc35..3520c5fae24ab87310d6224d97e420fbc7944461 100644 (file)
--- a/mysql-dubious-exports.patch
+++ b/mysql-dubious-exports.patch
@@ -3,10 +3,21 @@ 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 -urNp -x '*.orig' percona-server-5.7.31-34.org/include/m_string.h percona-server-5.7.31-34/include/m_string.h
+--- percona-server-5.7.31-34.org/include/m_string.h    2020-08-15 11:23:18.000000000 +0200
++++ percona-server-5.7.31-34/include/m_string.h        2021-05-26 15:27:27.448089383 +0200
+@@ -193,6 +193,7 @@ static inline int native_strncasecmp(con
+ 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 -urNp -x '*.orig' percona-server-5.7.31-34.org/include/my_sys.h percona-server-5.7.31-34/include/my_sys.h
+--- percona-server-5.7.31-34.org/include/my_sys.h      2020-08-15 11:23:18.000000000 +0200
++++ percona-server-5.7.31-34/include/my_sys.h  2021-05-26 15:27:27.444755877 +0200
+@@ -261,6 +261,7 @@ extern int (*is_killed_hook)(const void
  
  /* charsets */
  #define MY_ALL_CHARSETS_SIZE 2048
@@ -14,7 +25,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_charset_number(const cha
  extern uint get_collation_number(const char *name);
  extern const char *get_charset_name(uint cs_number);
  
@@ -23,10 +34,11 @@ 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
-@@ -128,7 +128,7 @@
+ extern CHARSET_INFO *my_collation_get_by_name(MY_CHARSET_LOADER *loader,
+diff -urNp -x '*.orig' percona-server-5.7.31-34.org/include/mysql.h.pp percona-server-5.7.31-34/include/mysql.h.pp
+--- percona-server-5.7.31-34.org/include/mysql.h.pp    2020-08-15 11:23:18.000000000 +0200
++++ percona-server-5.7.31-34/include/mysql.h.pp        2021-05-26 15:27:27.448089383 +0200
+@@ -128,7 +128,7 @@ void my_net_local_init(NET *net);
  void net_end(NET *net);
  void net_clear(NET *net, my_bool check_buffer);
  void net_claim_memory_ownership(NET *net);
@@ -35,9 +47,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 -urNp -x '*.orig' percona-server-5.7.31-34.org/include/mysql_com.h percona-server-5.7.31-34/include/mysql_com.h
+--- percona-server-5.7.31-34.org/include/mysql_com.h   2020-08-15 11:23:18.000000000 +0200
++++ percona-server-5.7.31-34/include/mysql_com.h       2021-05-26 15:27:27.448089383 +0200
+@@ -522,6 +522,7 @@ void my_net_local_init(NET *net);
  void net_end(NET *net);
  void net_clear(NET *net, my_bool check_buffer);
  void net_claim_memory_ownership(NET *net);
@@ -45,13 +58,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..25105fd0fa63d2a640567de28e123166cd478275 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 -urNp -x '*.orig' percona-server-5.7.31-34.org/cmake/build_configurations/compiler_options.cmake percona-server-5.7.31-34/cmake/build_configurations/compiler_options.cmake
+--- percona-server-5.7.31-34.org/cmake/build_configurations/compiler_options.cmake     2020-08-15 11:23:18.000000000 +0200
++++ percona-server-5.7.31-34/cmake/build_configurations/compiler_options.cmake 2021-05-26 15:13:06.336651991 +0200
+@@ -32,17 +32,17 @@ IF(SIZEOF_VOIDP EQUAL 8)
    SET(64BIT 1)
  ENDIF()
  
@@ -23,7 +24,7 @@
      ENDIF()
    ENDIF()
  
-@@ -61,8 +61,8 @@ IF(UNIX)
+@@ -71,8 +71,8 @@ IF(UNIX)
      IF(C_NO_EXPENSIVE_OPTIMIZATIONS)
        SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -fno-expensive-optimizations")
      ENDIF()
@@ -33,8 +34,8 @@
 +    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")
-@@ -95,8 +95,8 @@ IF(UNIX)
+     SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+@@ -108,8 +108,8 @@ IF(UNIX)
    # 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 @@ IF(UNIX)
  
        SET(COMMON_C_FLAGS            "-g ${SUNPRO_FLAGS}")
        SET(COMMON_CXX_FLAGS          "-g0 ${SUNPRO_FLAGS}")