3 files changed, 19 insertions, 25 deletions
diff --git a/sql/client_settings.h b/sql/client_settings.h
index 1963281d980..206f00ba3fe 100644
--- a/sql/client_settings.h
+++ b/sql/client_settings.h
@@ -32,3 +32,5 @@ extern ulong slave_net_timeout;
 #ifdef HAVE_SMEM
 #undef HAVE_SMEM
 #endif
+
+#define CLI_MYSQL_USE_RESULT NULL
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index eb4d76bbf6e..370c046c660 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,19 @@
 #include <signal.h>
 #include <errno.h>
 
+#ifdef EMBEDDED_LIBRARY
+
+#ifdef net_flush
+#undef net_flush
+#endif
+
+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 +975,4 @@ my_net_read(NET *net)
   return len;
 }
 
-#endif /* EMBEDDED_LIBRARY */
 
diff --git a/sql/protocol.cc b/sql/protocol.cc
index 10fe2c1725e..62573da54f9 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -237,29 +237,6 @@ net_printf(THD *thd, uint errcode, ...)
 }
 
 /*
-  Function called by my_net_init() to set some check variables
-*/
-
-#ifndef EMBEDDED_LIBRARY
-extern "C" {
-void my_net_local_init(NET *net)
-{
-  net->max_packet=   (uint) global_system_variables.net_buffer_length;
-  net->read_timeout= (uint) global_system_variables.net_read_timeout;
-  net->write_timeout=(uint) global_system_variables.net_write_timeout;
-  net->retry_count=  (uint) global_system_variables.net_retry_count;
-  net->max_packet_size= max(global_system_variables.net_buffer_length,
-			    global_system_variables.max_allowed_packet);
-}
-}
-
-#else /* EMBEDDED_LIBRARY */
-void my_net_local_init(NET *net __attribute__(unused))
-{
-}
-#endif /* EMBEDDED_LIBRARY */
-
-/*
   Return ok to the client.
 
   SYNOPSIS