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 */
+--- 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;