diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-19 12:31:37 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-19 12:31:37 +0500 |
| commit | fcacd0b2718ce86dc782304e82df5ce93b71c41d (patch) | |
| tree | be3853e814ff3e84df5072c7717f8cdba1d479f5 /sql/net_serv.cc | |
| parent | ccae0cf8b203e1e36b0f8b526ef21ee545ea8bac (diff) | |
| parent | c1cf6e612d0aeb81cc3dd6fb0e2d1ae156143ac9 (diff) | |
| download | mariadb-git-fcacd0b2718ce86dc782304e82df5ce93b71c41d.tar.gz | |
Merge mysql.com:/home/hf/work/29117/my41-29117
into mysql.com:/home/hf/work/29117/my50-29117
sql/net_serv.cc:
Auto merged
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index c56e9c0b073..017a2eb9ecd 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -120,13 +120,13 @@ static my_bool net_write_buff(NET *net,const char *packet,ulong len); my_bool my_net_init(NET *net, Vio* vio) { DBUG_ENTER("my_net_init"); + net->vio = vio; my_net_local_init(net); /* Set some limits */ if (!(net->buff=(uchar*) my_malloc((uint32) net->max_packet+ NET_HEADER_SIZE + COMP_HEADER_SIZE, MYF(MY_WME)))) DBUG_RETURN(1); net->buff_end=net->buff+net->max_packet; - net->vio = vio; net->no_send_ok= net->no_send_eof= net->no_send_error= 0; net->error=0; net->return_errno=0; net->return_status=0; net->pkt_nr=net->compress_pkt_nr=0; |