From c1cf6e612d0aeb81cc3dd6fb0e2d1ae156143ac9 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 19 Jun 2007 11:13:11 +0500 Subject: Bug #29117 (init_file test crashes with embedded server) we use net->vio in my_net_local_init, but in the my_net_init implementation we set it after the call, so work with unspecified net->vio value sql/net_serv.cc: Bug #29117 (init_file test crashes with embedded server) as we started using net->vio in my_net_local_init, we should set it before the call --- sql/net_serv.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/net_serv.cc') diff --git a/sql/net_serv.cc b/sql/net_serv.cc index a5a05d381cd..1c356902eae 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -111,13 +111,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 = 0; net->error=0; net->return_errno=0; net->return_status=0; net->pkt_nr=net->compress_pkt_nr=0; -- cgit v1.2.1