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 /include/mysql_com.h | |
| 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 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 5eb59a1c7ab..acfcd221432 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -130,7 +130,7 @@ typedef struct st_vio Vio; #define MAX_BLOB_WIDTH 8192 /* Default width for blob */ typedef struct st_net { -#ifndef EMBEDDED_LIBRARY +#if !defined(CHECK_EMBEDDED_DIFFERENCES) || !defined(EMBEDDED_LIBRARY) Vio* vio; unsigned char *buff,*buff_end,*write_pos,*read_pos; my_socket fd; /* For Perl DBI/dbd */ @@ -234,7 +234,8 @@ void my_net_local_init(NET *net); void net_end(NET *net); void net_clear(NET *net); my_bool net_realloc(NET *net, unsigned long length); -#ifndef EMBEDDED_LIBRARY + +#ifndef EMBEDDED_LIBRARY /* To be removed by HF */ my_bool net_flush(NET *net); #else #define net_flush(A) @@ -339,6 +340,7 @@ void my_thread_end(void); #ifdef _global_h ulong STDCALL net_field_length(uchar **packet); my_ulonglong net_field_length_ll(uchar **packet); +char *net_store_length(char *pkg, ulonglong length); #endif #ifdef __cplusplus |