1 Prefix mysql_ to the real names of several symbols that have to be exported
2 from libmysqlclient because mysql-connector-odbc and/or PHP depend on them.
3 This limits the intrusion on application namespace.
6 diff -urNp -x '*.orig' percona-server-5.7.31-34.org/include/m_string.h percona-server-5.7.31-34/include/m_string.h
7 --- percona-server-5.7.31-34.org/include/m_string.h 2020-08-15 11:23:18.000000000 +0200
8 +++ percona-server-5.7.31-34/include/m_string.h 2021-05-26 15:27:27.448089383 +0200
9 @@ -193,6 +193,7 @@ static inline int native_strncasecmp(con
10 extern size_t strnlen(const char *s, size_t n);
13 +#define is_prefix mysql_is_prefix /* namespace sanity */
14 extern int is_prefix(const char *, const char *);
16 /* Conversion routines */
17 diff -urNp -x '*.orig' percona-server-5.7.31-34.org/include/my_sys.h percona-server-5.7.31-34/include/my_sys.h
18 --- percona-server-5.7.31-34.org/include/my_sys.h 2020-08-15 11:23:18.000000000 +0200
19 +++ percona-server-5.7.31-34/include/my_sys.h 2021-05-26 15:27:27.444755877 +0200
20 @@ -261,6 +261,7 @@ extern int (*is_killed_hook)(const void
23 #define MY_ALL_CHARSETS_SIZE 2048
24 +#define default_charset_info mysql_default_charset_info /* namespace sanity */
25 extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *default_charset_info;
26 extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *all_charsets[MY_ALL_CHARSETS_SIZE];
27 extern CHARSET_INFO compiled_charsets[];
28 @@ -999,6 +1000,9 @@ extern uint get_charset_number(const cha
29 extern uint get_collation_number(const char *name);
30 extern const char *get_charset_name(uint cs_number);
32 +#define get_charset mysql_get_charset /* namespace sanity */
33 +#define get_charset_by_csname mysql_get_charset_by_csname
35 extern CHARSET_INFO *get_charset(uint cs_number, myf flags);
36 extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags);
37 extern CHARSET_INFO *my_collation_get_by_name(MY_CHARSET_LOADER *loader,
38 diff -urNp -x '*.orig' percona-server-5.7.31-34.org/include/mysql.h.pp percona-server-5.7.31-34/include/mysql.h.pp
39 --- percona-server-5.7.31-34.org/include/mysql.h.pp 2020-08-15 11:23:18.000000000 +0200
40 +++ percona-server-5.7.31-34/include/mysql.h.pp 2021-05-26 15:27:27.448089383 +0200
41 @@ -128,7 +128,7 @@ void my_net_local_init(NET *net);
42 void net_end(NET *net);
43 void net_clear(NET *net, my_bool check_buffer);
44 void net_claim_memory_ownership(NET *net);
45 -my_bool net_realloc(NET *net, size_t length);
46 +my_bool mysql_net_realloc(NET *net, size_t length);
47 my_bool net_flush(NET *net);
48 my_bool my_net_write(NET *net,const unsigned char *packet, size_t len);
49 my_bool net_write_command(NET *net,unsigned char command,
50 diff -urNp -x '*.orig' percona-server-5.7.31-34.org/include/mysql_com.h percona-server-5.7.31-34/include/mysql_com.h
51 --- percona-server-5.7.31-34.org/include/mysql_com.h 2020-08-15 11:23:18.000000000 +0200
52 +++ percona-server-5.7.31-34/include/mysql_com.h 2021-05-26 15:27:27.448089383 +0200
53 @@ -522,6 +522,7 @@ void my_net_local_init(NET *net);
54 void net_end(NET *net);
55 void net_clear(NET *net, my_bool check_buffer);
56 void net_claim_memory_ownership(NET *net);
57 +#define net_realloc mysql_net_realloc /* namespace sanity */
58 my_bool net_realloc(NET *net, size_t length);
59 my_bool net_flush(NET *net);
60 my_bool my_net_write(NET *net,const unsigned char *packet, size_t len);