diff options
author | monty@mysql.com <> | 2004-11-04 15:06:24 +0200 |
---|---|---|
committer | monty@mysql.com <> | 2004-11-04 15:06:24 +0200 |
commit | 071001950efe9886a56ec8a365217f0d1cd92c1f (patch) | |
tree | 9d4d27a72c18ead47fb83bd5ec0e2383cdd34ff6 /include/mysql_com.h | |
parent | a1a27eb35a8ad7616cb08937dc4e959e2410c35b (diff) | |
parent | f5e5dfb2f779cbb5468d63d94d659fa3d6a17e8a (diff) | |
download | mariadb-git-071001950efe9886a56ec8a365217f0d1cd92c1f.tar.gz |
Merge with 4.1 to get in latest bug fixes
Diffstat (limited to 'include/mysql_com.h')
-rw-r--r-- | include/mysql_com.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 09ee5b22286..92a67ac0279 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -312,13 +312,7 @@ 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 /* To be removed by HF */ my_bool net_flush(NET *net); -#else -#define net_flush(A) -#endif - my_bool my_net_write(NET *net,const char *packet,unsigned long len); my_bool net_write_command(NET *net,unsigned char command, const char *header, unsigned long head_len, |