Patch approved.
/ Magnus
tis 2007-06-19 klockan 11:13 +0500 skrev holyfoot@stripped:
> Below is the list of changes that have just been committed into a local
> 4.1 repository of hf. When hf does a push these changes will
> be propagated to the main repository and, within 24 hours after the
> push, to the public repository.
> For information on how to access the public repository
> see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
>
> ChangeSet@stripped, 2007-06-19 11:13:11+05:00, holyfoot@stripped +1 -0
> 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@stripped, 2007-06-19 11:13:10+05:00, holyfoot@stripped +1 -1
> 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
>
> # This is a BitKeeper patch. What follows are the unified diffs for the
> # set of deltas contained in the patch. The rest of the patch, the part
> # that BitKeeper cares about, is below these diffs.
> # User: holyfoot
> # Host: hfmain.(none)
> # Root: /home/hf/work/29117/my41-29117
>
> --- 1.78/sql/net_serv.cc 2007-06-19 11:13:15 +05:00
> +++ 1.79/sql/net_serv.cc 2007-06-19 11:13:15 +05:00
> @@ -111,13 +111,13 @@ static my_bool net_write_buff(NET *net,c
> 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;
>
