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 -Naur mysql-5.5.8.orig/include/my_sys.h mysql-5.5.8/include/my_sys.h
7 --- mysql-5.5.8.orig/include/my_sys.h 2010-12-03 12:58:24.000000000 -0500
8 +++ mysql-5.5.8/include/my_sys.h 2010-12-27 14:27:23.956926896 -0500
12 #define MY_ALL_CHARSETS_SIZE 2048
13 +#define default_charset_info mysql_default_charset_info /* namespace sanity */
14 extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *default_charset_info;
15 extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *all_charsets[MY_ALL_CHARSETS_SIZE];
16 extern CHARSET_INFO compiled_charsets[];
18 extern uint get_collation_number(const char *name);
19 extern const char *get_charset_name(uint cs_number);
21 +#define get_charset mysql_get_charset /* namespace sanity */
22 +#define get_charset_by_csname mysql_get_charset_by_csname
24 extern CHARSET_INFO *get_charset(uint cs_number, myf flags);
25 extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags);
26 extern CHARSET_INFO *get_charset_by_csname(const char *cs_name,
27 diff -Naur mysql-5.5.8.orig/include/mysql.h.pp mysql-5.5.8/include/mysql.h.pp
28 --- mysql-5.5.8.orig/include/mysql.h.pp 2010-12-03 12:58:24.000000000 -0500
29 +++ mysql-5.5.8/include/mysql.h.pp 2010-12-27 14:27:23.956926896 -0500
31 void my_net_local_init(NET *net);
32 void net_end(NET *net);
33 void net_clear(NET *net, my_bool check_buffer);
34 -my_bool net_realloc(NET *net, size_t length);
35 +my_bool mysql_net_realloc(NET *net, size_t length);
36 my_bool net_flush(NET *net);
37 my_bool my_net_write(NET *net,const unsigned char *packet, size_t len);
38 my_bool net_write_command(NET *net,unsigned char command,
39 diff -Naur mysql-5.5.8.orig/include/mysql_com.h mysql-5.5.8/include/mysql_com.h
40 --- mysql-5.5.8.orig/include/mysql_com.h 2010-12-03 12:58:24.000000000 -0500
41 +++ mysql-5.5.8/include/mysql_com.h 2010-12-27 14:27:23.957927198 -0500
43 void my_net_local_init(NET *net);
44 void net_end(NET *net);
45 void net_clear(NET *net, my_bool check_buffer);
46 +#define net_realloc mysql_net_realloc /* namespace sanity */
47 my_bool net_realloc(NET *net, size_t length);
48 my_bool net_flush(NET *net);
49 my_bool my_net_write(NET *net,const unsigned char *packet, size_t len);
50 --- mysql-5.5.9/include/m_string.h~ 2011-01-20 00:37:08.000000000 +0200
51 +++ mysql-5.5.9/include/m_string.h 2011-03-31 16:36:35.184588054 +0300
53 extern size_t strnlen(const char *s, size_t n);
56 +#define is_prefix mysql_is_prefix /* namespace sanity */
57 extern int is_prefix(const char *, const char *);
59 /* Conversion routines */