- updated to 5.7.35-38

[packages/mysql.git] / mysql-dubious-exports.patch

diff --git a/mysql-dubious-exports.patch b/mysql-dubious-exports.patch
index 30a240c7b82657f25ab900866ef40bb360e31266..a928927900a80ccbfaecdbc8973f92be48281f3d 100644 (file)
--- 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);