List:Commits« Previous MessageNext Message »
From:Sergei Golubchik Date:July 12 2007 10:47pm
Subject:Re: bk commit into 5.0 tree (dkatz:1.2507) BUG#29579
View as plain text  
Hi!

On Jul 05, damien@stripped wrote:
> ChangeSet@stripped, 2007-07-05 15:01:29-04:00, dkatz@stripped +7 -0
>   Bug #29579  Clients using SSL can hang the server
>   
>   Added an option to yassl to allow "quiet shutdown" like openssl
>   does. This option causes the SSL libs to NOT perform the
>   close_notify handshake during shutdown. This fixes a hang we
>   experience because we hold a lock during socket shutdown.

ok to push
one small change in mysqltest.c, see below
 
> diff -Nrup a/client/mysqltest.c b/client/mysqltest.c
> --- a/client/mysqltest.c	2007-06-14 07:37:34 -04:00
> +++ b/client/mysqltest.c	2007-07-05 15:01:25 -04:00
> @@ -3731,19 +3776,24 @@ void do_connect(struct st_command *comma
>      con_options= end;
>    }
>  
> -  if (next_con == connections_end)
> -    die("Connection limit exhausted, you can have max %d connections",
> -        (int) (sizeof(connections)/sizeof(struct st_connection)));
> -
>    if (find_connection_by_name(ds_connection_name.str))
>      die("Connection %s already exists", ds_connection_name.str);
> +  
> +  if (!(con_slot= find_connection_by_name("closed_connection")))

okay, but change "closed_connection" to something that cannot legally be
used in the connect() command, e.g. to "," (I know, it was not you who
introduced "closed_connection").  And as you use the string in two
places, create a #define or a constant variable for it - makes the code
easier to maintain. Thanks.

> +  {
> +    if (next_con == connections_end)
> +      die("Connection limit exhausted, you can have max %d connections",
> +          (int) (sizeof(connections)/sizeof(struct st_connection)));
> +          
> +    con_slot= next_con;
> +  }
>  
Regards / Mit vielen Grüssen,
Sergei

-- 
   __  ___     ___ ____  __
  /  |/  /_ __/ __/ __ \/ /   Sergei Golubchik <serg@stripped>
 / /|_/ / // /\ \/ /_/ / /__  Principal Software Developer
/_/  /_/\_, /___/\___\_\___/  MySQL GmbH, Radlkoferstr. 2, D-81373 München
       <___/                  Geschäftsführer: Kaj Arnö - HRB
München 162140
Thread
bk commit into 5.0 tree (dkatz:1.2507) BUG#29579damien5 Jul
  • Re: bk commit into 5.0 tree (dkatz:1.2507) BUG#29579Sergei Golubchik12 Jul