Commit 91f4cb1c authored by dkatz@damien-katzs-computer.local's avatar dkatz@damien-katzs-computer.local

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

into  damien-katzs-computer.local:/Users/dkatz/mysql51
parents 276b95a0 0a308745
...@@ -3764,13 +3764,13 @@ void do_connect(struct st_command *command) ...@@ -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))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment