Commit 0a308745 authored by dkatz@damien-katzs-computer.local's avatar dkatz@damien-katzs-computer.local
Browse files

When opening a new connecgtion, changed mysqltest to prefer a brand new... 

When opening a new connecgtion, changed mysqltest to prefer a brand new connection slot over an existing, closed slot. Fixes a problem with reused slots that can cause tests to fail. bug#29579
parent d2e45f20

client/mysqltest.c

+5 −5
Original line number Diff line number Diff line
@@ -3778,13 +3778,13 @@ void do_connect(struct st_command *command) 
  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-")))

  if (next_con != connections_end)

    con_slot= next_con;

  else

  {

    if (next_con == connections_end)

    if (!(con_slot= find_connection_by_name("-closed_connection-")))

      die("Connection limit exhausted, you can have max %d connections",

          (int) (sizeof(connections)/sizeof(struct st_connection)));

          

    con_slot= next_con;

  }



  if (!mysql_init(&con_slot->mysql))