mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge damien-katzs-computer.local:/Users/dkatz/50

Browse source 
into  damien-katzs-computer.local:/Users/dkatz/mysql51


client/mysqltest.c:
  Auto merged
This commit is contained in:
unknown 2007-07-13 01:56:57 -04:00
commit f3fd6168ff
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
client/mysqltest.c
View file

@ -3764,13 +3764,13 @@ void do_connect(struct st_command *command)
if (find_connection_by_name(ds_connection_name.str)) if (find_connection_by_name(ds_connection_name.str))
die("Connection %s already exists", 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", die("Connection limit exhausted, you can have max %d connections",
(int) (sizeof(connections)/sizeof(struct st_connection))); (int) (sizeof(connections)/sizeof(struct st_connection)));
con_slot= next_con;
} }
if (!mysql_init(&con_slot->mysql)) if (!mysql_init(&con_slot->mysql))