1 diff -ur percona-server-5.7.28-31.orig/include/m_string.h percona-server-5.7.28-31/include/m_string.h
2 --- percona-server-5.7.28-31.orig/include/m_string.h 2019-12-16 23:51:39.761000000 +0100
3 +++ percona-server-5.7.28-31/include/m_string.h 2019-12-16 23:52:03.126000000 +0100
5 extern size_t strnlen(const char *s, size_t n);
8 +#define is_prefix mysql_is_prefix /* namespace sanity */
9 extern int is_prefix(const char *, const char *);
11 /* Conversion routines */
12 diff -ur percona-server-5.7.28-31.orig/include/my_sys.h percona-server-5.7.28-31/include/my_sys.h
13 --- percona-server-5.7.28-31.orig/include/my_sys.h 2019-12-16 23:51:39.762000000 +0100
14 +++ percona-server-5.7.28-31/include/my_sys.h 2019-12-16 23:52:03.125000000 +0100
18 #define MY_ALL_CHARSETS_SIZE 2048
19 +#define default_charset_info mysql_default_charset_info /* namespace sanity */
20 extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *default_charset_info;
21 extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *all_charsets[MY_ALL_CHARSETS_SIZE];
22 extern CHARSET_INFO compiled_charsets[];
24 extern uint get_collation_number(const char *name);
25 extern const char *get_charset_name(uint cs_number);
27 +#define get_charset mysql_get_charset /* namespace sanity */
28 +#define get_charset_by_csname mysql_get_charset_by_csname
30 extern CHARSET_INFO *get_charset(uint cs_number, myf flags);
31 extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags);
32 extern CHARSET_INFO *my_collation_get_by_name(MY_CHARSET_LOADER *loader,
33 diff -ur percona-server-5.7.28-31.orig/include/mysql.h.pp percona-server-5.7.28-31/include/mysql.h.pp
34 --- percona-server-5.7.28-31.orig/include/mysql.h.pp 2019-12-16 23:51:39.762000000 +0100
35 +++ percona-server-5.7.28-31/include/mysql.h.pp 2019-12-16 23:52:03.125000000 +0100
37 void net_end(NET *net);
38 void net_clear(NET *net, my_bool check_buffer);
39 void net_claim_memory_ownership(NET *net);
40 -my_bool net_realloc(NET *net, size_t length);
41 +my_bool mysql_net_realloc(NET *net, size_t length);
42 my_bool net_flush(NET *net);
43 my_bool my_net_write(NET *net,const unsigned char *packet, size_t len);
44 my_bool net_write_command(NET *net,unsigned char command,
45 diff -ur percona-server-5.7.28-31.orig/include/mysql_com.h percona-server-5.7.28-31/include/mysql_com.h
46 --- percona-server-5.7.28-31.orig/include/mysql_com.h 2019-12-16 23:51:39.763000000 +0100
47 +++ percona-server-5.7.28-31/include/mysql_com.h 2019-12-16 23:52:03.126000000 +0100
49 void net_end(NET *net);
50 void net_clear(NET *net, my_bool check_buffer);
51 void net_claim_memory_ownership(NET *net);
52 +#define net_realloc mysql_net_realloc /* namespace sanity */
53 my_bool net_realloc(NET *net, size_t length);
54 my_bool net_flush(NET *net);
55 my_bool my_net_write(NET *net,const unsigned char *packet, size_t len);