diff options
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 19 |
1 files changed, 17 insertions, 2 deletions
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 */ |