diff options
author | holyfoot/hf@hfmain.(none) <> | 2007-06-19 12:31:37 +0500 |
---|---|---|
committer | holyfoot/hf@hfmain.(none) <> | 2007-06-19 12:31:37 +0500 |
commit | 438422d929e960a212c4749c4a197677da320537 (patch) | |
tree | be3853e814ff3e84df5072c7717f8cdba1d479f5 /sql | |
parent | f015b4332b1db4c903ed6a65b5bbfedcea61abb3 (diff) | |
parent | 5a9d6856dea9c051cd0c7d2f7521494995daeab7 (diff) | |
download | mariadb-git-438422d929e960a212c4749c4a197677da320537.tar.gz |
Merge mysql.com:/home/hf/work/29117/my41-29117
into mysql.com:/home/hf/work/29117/my50-29117
Diffstat (limited to 'sql')
-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; |