diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-19 12:32:18 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-19 12:32:18 +0500 |
| commit | d616511e0d359cfe2610c32c6ea55199f73381a8 (patch) | |
| tree | 6c15c145ee5040263b74e9f9e8c504f190c95bdd /sql/net_serv.cc | |
| parent | 318b8814130e885c20cd3631e73c995ca02dfbdf (diff) | |
| parent | fcacd0b2718ce86dc782304e82df5ce93b71c41d (diff) | |
| download | mariadb-git-d616511e0d359cfe2610c32c6ea55199f73381a8.tar.gz | |
Merge mysql.com:/home/hf/work/29117/my50-29117
into mysql.com:/home/hf/work/29117/my51-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 959418df87b..bd273145782 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -116,13 +116,13 @@ static my_bool net_write_buff(NET *net,const uchar *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((size_t) 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; |