- up to 5.7.20-19.1

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

diff --git a/mysql-dubious-exports.patch b/mysql-dubious-exports.patch
index 3342bf82bb72e5ab4fb374ce195f58929081eeac..076167c7650609abbdb01bdd879902c28579fc35 100644 (file)
--- a/mysql-dubious-exports.patch
+++ b/mysql-dubious-exports.patch
@@ -3,17 +3,6 @@ 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/errmsg.h mysql-5.5.8/include/errmsg.h
---- mysql-5.5.8.orig/include/errmsg.h  2010-12-03 12:58:24.000000000 -0500
-+++ mysql-5.5.8/include/errmsg.h       2010-12-27 14:29:59.184552374 -0500
-@@ -24,6 +24,7 @@
- #endif
- void  init_client_errs(void);
- void  finish_client_errs(void);
-+#define client_errors mysql_client_errors             /* namespace sanity */
- extern const char *client_errors[];   /* Error messages */
- #ifdef        __cplusplus
- }
 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
@@ -35,26 +24,34 @@ 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
-@@ -86,7 +86,7 @@
- void my_net_local_init(NET *net);
+--- 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 @@
  void net_end(NET *net);
-   void net_clear(NET *net, my_bool clear_buffer);
+ 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 -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
-@@ -448,6 +448,7 @@
- void  my_net_local_init(NET *net);
- void  net_end(NET *net);
-   void        net_clear(NET *net, my_bool clear_buffer);
-+#define net_realloc mysql_net_realloc         /* namespace sanity */
+--- 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 @@
+ 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);
+--- 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 */