1 |
alien |
166284 |
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. |
4 |
|
|
|
5 |
|
|
|
6 |
alien |
188246 |
--- 5.5_orig/include/errmsg.h 2011-12-27 21:16:50.934455753 +0100 |
7 |
|
|
+++ 5.5/include/errmsg.h 2011-12-27 21:19:14.203380244 +0100 |
8 |
alien |
166284 |
@@ -24,6 +24,7 @@ |
9 |
|
|
#endif |
10 |
|
|
void init_client_errs(void); |
11 |
|
|
void finish_client_errs(void); |
12 |
|
|
+#define client_errors mysql_client_errors /* namespace sanity */ |
13 |
|
|
extern const char *client_errors[]; /* Error messages */ |
14 |
|
|
#ifdef __cplusplus |
15 |
|
|
} |
16 |
alien |
188246 |
--- 5.5_orig/include/mysql_com.h 2011-12-27 21:16:50.934455753 +0100 |
17 |
|
|
+++ 5.5/include/mysql_com.h 2011-12-27 21:19:14.203380244 +0100 |
18 |
alien |
182848 |
@@ -464,6 +464,7 @@ |
19 |
alien |
166284 |
void my_net_local_init(NET *net); |
20 |
|
|
void net_end(NET *net); |
21 |
|
|
void net_clear(NET *net, my_bool clear_buffer); |
22 |
|
|
+#define net_realloc mysql_net_realloc /* namespace sanity */ |
23 |
|
|
my_bool net_realloc(NET *net, size_t length); |
24 |
|
|
my_bool net_flush(NET *net); |
25 |
|
|
my_bool my_net_write(NET *net,const unsigned char *packet, size_t len); |
26 |
alien |
188246 |
--- 5.5_orig/include/mysql.h.pp 2011-12-27 21:16:50.934455753 +0100 |
27 |
|
|
+++ 5.5/include/mysql.h.pp 2011-12-27 21:19:14.203380244 +0100 |
28 |
alien |
166284 |
@@ -86,7 +86,7 @@ |
29 |
|
|
void my_net_local_init(NET *net); |
30 |
|
|
void net_end(NET *net); |
31 |
|
|
void net_clear(NET *net, my_bool clear_buffer); |
32 |
|
|
-my_bool net_realloc(NET *net, size_t length); |
33 |
|
|
+my_bool mysql_net_realloc(NET *net, size_t length); |
34 |
|
|
my_bool net_flush(NET *net); |
35 |
|
|
my_bool my_net_write(NET *net,const unsigned char *packet, size_t len); |
36 |
|
|
my_bool net_write_command(NET *net,unsigned char command, |
37 |
alien |
188246 |
--- 5.5_orig/include/my_sys.h 2011-12-27 21:16:50.935455737 +0100 |
38 |
|
|
+++ 5.5/include/my_sys.h 2011-12-27 21:19:14.203380244 +0100 |
39 |
|
|
@@ -220,6 +220,7 @@ |
40 |
alien |
166284 |
|
41 |
|
|
/* charsets */ |
42 |
|
|
#define MY_ALL_CHARSETS_SIZE 2048 |
43 |
|
|
+#define default_charset_info mysql_default_charset_info /* namespace sanity */ |
44 |
|
|
extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *default_charset_info; |
45 |
|
|
extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *all_charsets[MY_ALL_CHARSETS_SIZE]; |
46 |
|
|
extern struct charset_info_st compiled_charsets[]; |
47 |
alien |
188246 |
@@ -947,6 +948,9 @@ |
48 |
alien |
166284 |
extern uint get_collation_number(const char *name); |
49 |
|
|
extern const char *get_charset_name(uint cs_number); |
50 |
|
|
|
51 |
|
|
+#define get_charset mysql_get_charset /* namespace sanity */ |
52 |
|
|
+#define get_charset_by_csname mysql_get_charset_by_csname |
53 |
|
|
+ |
54 |
|
|
extern CHARSET_INFO *get_charset(uint cs_number, myf flags); |
55 |
|
|
extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags); |
56 |
|
|
extern CHARSET_INFO *get_charset_by_csname(const char *cs_name, |