- updated to 5.7.28-31

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

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 */