adjust for 5.6.14

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

diff --git a/mysql-dubious-exports.patch b/mysql-dubious-exports.patch
index ed8bec52d580f944ed763aba6980c5421d981e46..4166c52d228cc937cc9a195c22bbb553673f490b 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
@@ -38,10 +27,10 @@ diff -Naur mysql-5.5.8.orig/include/my_sys.h mysql-5.5.8/include/my_sys.h
 diff -Naur mysql-5.5.8.orig/include/mysql.h.pp mysql-5.5.8/include/mysql.h.pp
 --- mysql-5.5.8.orig/include/mysql.h.pp        2010-12-03 12:58:24.000000000 -0500
 +++ mysql-5.5.8/include/mysql.h.pp     2010-12-27 14:27:23.956926896 -0500
-@@ -86,7 +86,7 @@
+@@ -90,7 +90,7 @@
  void my_net_local_init(NET *net);
  void net_end(NET *net);
-   void net_clear(NET *net, my_bool clear_buffer);
+ void net_clear(NET *net, my_bool check_buffer);
 -my_bool net_realloc(NET *net, size_t length);
 +my_bool mysql_net_realloc(NET *net, size_t length);
  my_bool net_flush(NET *net);
@@ -50,11 +39,11 @@ diff -Naur mysql-5.5.8.orig/include/mysql.h.pp mysql-5.5.8/include/mysql.h.pp
 diff -Naur mysql-5.5.8.orig/include/mysql_com.h mysql-5.5.8/include/mysql_com.h
 --- mysql-5.5.8.orig/include/mysql_com.h       2010-12-03 12:58:24.000000000 -0500
 +++ mysql-5.5.8/include/mysql_com.h    2010-12-27 14:27:23.957927198 -0500
-@@ -448,6 +448,7 @@
- void  my_net_local_init(NET *net);
- void  net_end(NET *net);
-   void        net_clear(NET *net, my_bool clear_buffer);
-+#define net_realloc mysql_net_realloc         /* namespace sanity */
+@@ -497,6 +497,7 @@
+ void my_net_local_init(NET *net);
+ void net_end(NET *net);
+ void net_clear(NET *net, my_bool check_buffer);
++#define net_realloc mysql_net_realloc          /* namespace sanity */
  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);
@@ -68,36 +57,3 @@ diff -Naur mysql-5.5.8.orig/include/mysql_com.h mysql-5.5.8/include/mysql_com.h
  extern int is_prefix(const char *, const char *);
  
  /* Conversion routines */
---- mysql-5.5.9/sql/ha_ndbcluster.h~   2011-01-20 00:37:09.000000000 +0200
-+++ mysql-5.5.9/sql/ha_ndbcluster.h    2011-03-31 16:39:03.528050275 +0300
-@@ -28,7 +28,7 @@
- #endif
- 
- /* Blob tables and events are internal to NDB and must never be accessed */
--#define IS_NDB_BLOB_PREFIX(A) is_prefix(A, "NDB$BLOB")
-+#define IS_NDB_BLOB_PREFIX(A) mysql_is_prefix(A, "NDB$BLOB")
- 
- #include <NdbApi.hpp>
- #include <ndbapi_limits.h>
---- mysql-5.5.9/sql/ha_ndbcluster_binlog.h~    2011-01-20 00:37:09.000000000 +0200
-+++ mysql-5.5.9/sql/ha_ndbcluster_binlog.h     2011-03-31 16:39:17.212010376 +0300
-@@ -27,7 +27,7 @@
- typedef NdbDictionary::Dictionary  NDBDICT;
- typedef NdbDictionary::Event  NDBEVENT;
- 
--#define IS_TMP_PREFIX(A) (is_prefix(A, tmp_file_prefix))
-+#define IS_TMP_PREFIX(A) (mysql_is_prefix(A, tmp_file_prefix))
- 
- #define INJECTOR_EVENT_LEN 200
- 
---- mysql-5.5.9/strings/is_prefix.c~   2011-01-20 00:37:10.000000000 +0200
-+++ mysql-5.5.9/strings/is_prefix.c    2011-03-31 17:03:18.174663621 +0300
-@@ -24,7 +24,7 @@
- #include <my_global.h>
- #include "m_string.h"
- 
--int is_prefix(register const char *s, register const char *t)
-+int mysql_is_prefix(register const char *s, register const char *t)
- {
-   while (*t)
-     if (*s++ != *t++) return 0;