diff options
| author | unknown <hf@deer.(none)> | 2003-07-14 16:41:58 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-07-14 16:41:58 +0500 |
| commit | ef46c1f32b748505bd0aca150c59ecc54fd64737 (patch) | |
| tree | 47aa245dbe934b5af04e6b6945258c3ba48c4adb /sql/net_serv.cc | |
| parent | f1e3a929e844d13bd1e2e51aba19ccc0ea5659a5 (diff) | |
| parent | 90091dee465cef6cd50ef85ed9dd67b06a0edfd2 (diff) | |
| download | mariadb-git-ef46c1f32b748505bd0aca150c59ecc54fd64737.tar.gz | |
Including client code into libmysqld
Merging
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/protocol.cc:
Auto merged
sql/net_serv.cc:
#ifndef was removed
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 18 |
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 */ - |