1 diff -ur percona-server-5.7.35-38.orig/include/m_string.h percona-server-5.7.35-38/include/m_string.h
2 --- percona-server-5.7.35-38.orig/include/m_string.h 2021-11-24 19:49:05.797848959 +0100
3 +++ percona-server-5.7.35-38/include/m_string.h 2021-11-24 19:49:38.519926500 +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.35-38.orig/include/mysql_com.h percona-server-5.7.35-38/include/mysql_com.h
13 --- percona-server-5.7.35-38.orig/include/mysql_com.h 2021-11-24 19:49:05.801848968 +0100
14 +++ percona-server-5.7.35-38/include/mysql_com.h 2021-11-24 19:49:38.553926581 +0100
16 void net_end(NET *net);
17 void net_clear(NET *net, my_bool check_buffer);
18 void net_claim_memory_ownership(NET *net);
19 +#define net_realloc mysql_net_realloc /* namespace sanity */
20 my_bool net_realloc(NET *net, size_t length);
21 my_bool net_flush(NET *net);
22 my_bool my_net_write(NET *net,const unsigned char *packet, size_t len);
23 diff -ur percona-server-5.7.35-38.orig/include/mysql.h.pp percona-server-5.7.35-38/include/mysql.h.pp
24 --- percona-server-5.7.35-38.orig/include/mysql.h.pp 2021-11-24 19:49:05.799848964 +0100
25 +++ percona-server-5.7.35-38/include/mysql.h.pp 2021-11-24 19:49:38.552926579 +0100
27 void net_end(NET *net);
28 void net_clear(NET *net, my_bool check_buffer);
29 void net_claim_memory_ownership(NET *net);
30 -my_bool net_realloc(NET *net, size_t length);
31 +my_bool mysql_net_realloc(NET *net, size_t length);
32 my_bool net_flush(NET *net);
33 my_bool my_net_write(NET *net,const unsigned char *packet, size_t len);
34 my_bool net_write_command(NET *net,unsigned char command,
35 diff -ur percona-server-5.7.35-38.orig/include/my_sys.h percona-server-5.7.35-38/include/my_sys.h
36 --- percona-server-5.7.35-38.orig/include/my_sys.h 2021-11-24 19:49:05.798848961 +0100
37 +++ percona-server-5.7.35-38/include/my_sys.h 2021-11-24 19:49:38.552926579 +0100
41 #define MY_ALL_CHARSETS_SIZE 2048
42 +#define default_charset_info mysql_default_charset_info /* namespace sanity */
43 extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *default_charset_info;
44 extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *all_charsets[MY_ALL_CHARSETS_SIZE];
45 extern CHARSET_INFO compiled_charsets[];
47 extern uint get_collation_number(const char *name);
48 extern const char *get_charset_name(uint cs_number);
50 +#define get_charset mysql_get_charset /* namespace sanity */
51 +#define get_charset_by_csname mysql_get_charset_by_csname
53 extern CHARSET_INFO *get_charset(uint cs_number, myf flags);
54 extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags);
55 extern CHARSET_INFO *my_collation_get_by_name(MY_CHARSET_LOADER *loader,