summaryrefslogtreecommitdiff
path: root/sql/net_serv.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/net_serv.cc')
-rw-r--r--sql/net_serv.cc18
1 files changed, 15 insertions, 3 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index fd5e4f1d71a..9e9eaf9eea1 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -30,7 +30,10 @@
3 byte length & 1 byte package-number.
*/
-#ifndef EMBEDDED_LIBRARY
+/*
+ HFTODO this must be hidden if we don't want client capabilities in
+ embedded library
+ */
#ifdef __WIN__
#include <winsock.h>
#endif
@@ -46,6 +49,17 @@
#include <signal.h>
#include <errno.h>
+#ifdef EMBEDDED_LIBRARY
+
+#undef net_flush
+
+extern "C" {
+my_bool net_flush(NET *net);
+}
+
+#endif /*EMBEDDED_LIBRARY */
+
+
/*
The following handles the differences when this is linked between the
client and the server.
@@ -959,5 +973,3 @@ my_net_read(NET *net)
return len;
}
-#endif /* #ifndef EMBEDDED_LIBRARY */
-