- up to 5.5.34

[packages/mysql.git] / mysql-dubious-exports.patch

diff --git a/mysql-dubious-exports.patch b/mysql-dubious-exports.patch
index 3342bf82bb72e5ab4fb374ce195f58929081eeac..8874fce45a6e89b4d421f1e4ab44b121ca4dde0b 100644 (file)
--- a/mysql-dubious-exports.patch
+++ b/mysql-dubious-exports.patch
@@ -3,17 +3,6 @@ from libmysqlclient because mysql-connector-odbc and/or PHP depend on them.
 This limits the intrusion on application namespace.
 
 
-diff -Naur mysql-5.5.8.orig/include/errmsg.h mysql-5.5.8/include/errmsg.h
---- mysql-5.5.8.orig/include/errmsg.h  2010-12-03 12:58:24.000000000 -0500
-+++ mysql-5.5.8/include/errmsg.h       2010-12-27 14:29:59.184552374 -0500
-@@ -24,6 +24,7 @@
- #endif
- void  init_client_errs(void);
- void  finish_client_errs(void);
-+#define client_errors mysql_client_errors             /* namespace sanity */
- extern const char *client_errors[];   /* Error messages */
- #ifdef        __cplusplus
- }
 diff -Naur mysql-5.5.8.orig/include/my_sys.h mysql-5.5.8/include/my_sys.h
 --- mysql-5.5.8.orig/include/my_sys.h  2010-12-03 12:58:24.000000000 -0500
 +++ mysql-5.5.8/include/my_sys.h       2010-12-27 14:27:23.956926896 -0500
@@ -58,3 +47,13 @@ diff -Naur mysql-5.5.8.orig/include/mysql_com.h mysql-5.5.8/include/mysql_com.h
  my_bool net_realloc(NET *net, size_t length);
  my_bool       net_flush(NET *net);
  my_bool       my_net_write(NET *net,const unsigned char *packet, size_t len);
+--- mysql-5.5.9/include/m_string.h~    2011-01-20 00:37:08.000000000 +0200
++++ mysql-5.5.9/include/m_string.h     2011-03-31 16:36:35.184588054 +0300
+@@ -118,6 +118,7 @@
+ extern size_t strnlen(const char *s, size_t n);
+ #endif
+ 
++#define is_prefix mysql_is_prefix             /* namespace sanity */
+ extern int is_prefix(const char *, const char *);
+ 
+ /* Conversion routines */