diff options
| author | unknown <df@kahlann.erinye.com> | 2006-12-01 10:39:48 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2006-12-01 10:39:48 +0100 |
| commit | cf245c8f3a5c285af6e53a0035d05262ea5fbe31 (patch) | |
| tree | 64ea9b0e817c69d36e0263d377d1d828ed553be9 /include/mysql_com.h | |
| parent | 5176be8db85e2fbc3e33a35bb6f02905fdf3ede9 (diff) | |
| parent | b6004e6295717c3b616b58416544557bd858afca (diff) | |
| download | mariadb-git-cf245c8f3a5c285af6e53a0035d05262ea5fbe31.tar.gz | |
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 156d68efdec..7a1e2e30ac7 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -340,7 +340,7 @@ extern "C" { my_bool my_net_init(NET *net, Vio* vio); void my_net_local_init(NET *net); void net_end(NET *net); -void net_clear(NET *net); + void net_clear(NET *net, my_bool clear_buffer); my_bool net_realloc(NET *net, unsigned long length); my_bool net_flush(NET *net); my_bool my_net_write(NET *net,const char *packet,unsigned long len); |