Below is the list of changes that have just been committed into a local
5.0 repository of dkatz. When dkatz 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-07-13 01:55:04-04:00, dkatz@stripped +1 -0
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
client/mysqltest.c@stripped, 2007-07-13 01:55:02-04:00, dkatz@stripped +5 -5
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.
diff -Nrup a/client/mysqltest.c b/client/mysqltest.c
--- a/client/mysqltest.c 2007-07-12 22:06:31 -04:00
+++ b/client/mysqltest.c 2007-07-13 01:55:02 -04:00
@@ -3777,14 +3777,14 @@ void do_connect(struct st_command *comma
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))
