X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=mysql-dubious-exports.patch;h=a928927900a80ccbfaecdbc8973f92be48281f3d;hb=f10179a5e65b812c92658bc7207cfda060d53f0c;hp=edac52294c716b542225d17e838c6c04b7faba22;hpb=456c407349487a98cf7b12da72c8bb28e84fc297;p=packages%2Fmysql.git

diff --git a/mysql-dubious-exports.patch b/mysql-dubious-exports.patch
index edac522..a928927 100644
--- a/mysql-dubious-exports.patch
+++ b/mysql-dubious-exports.patch
@@ -1,12 +1,41 @@
-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.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
+ 
++#define is_prefix mysql_is_prefix		/* namespace sanity */
+ extern int is_prefix(const char *, const char *);
+ 
+ /* Conversion routines */
+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 */
  #define MY_ALL_CHARSETS_SIZE 2048
@@ -14,7 +43,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,37 +52,4 @@ 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,
-diff -Naur mysql-5.5.8.orig/include/mysql.h.pp mysql-5.5.8/include/mysql.h.pp
---- mysql-5.5.8.orig/include/mysql.h.pp	2010-12-03 12:58:24.000000000 -0500
-+++ mysql-5.5.8/include/mysql.h.pp	2010-12-27 14:27:23.956926896 -0500
-@@ -90,7 +90,7 @@
- void my_net_local_init(NET *net);
- void net_end(NET *net);
- void net_clear(NET *net, my_bool check_buffer);
--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 -Naur mysql-5.5.8.orig/include/mysql_com.h mysql-5.5.8/include/mysql_com.h
---- mysql-5.5.8.orig/include/mysql_com.h	2010-12-03 12:58:24.000000000 -0500
-+++ mysql-5.5.8/include/mysql_com.h	2010-12-27 14:27:23.957927198 -0500
-@@ -497,6 +497,7 @@
- void my_net_local_init(NET *net);
- void net_end(NET *net);
- void net_clear(NET *net, my_bool check_buffer);
-+#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);
---- 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 */
+ extern CHARSET_INFO *my_collation_get_by_name(MY_CHARSET_LOADER *loader,