Commit 1137a376 authored by pem@mysql.com's avatar pem@mysql.com

Fixed bugs in client/mysqltest.c which made lots of "connect" commands in tests fail.

parent 81437a72
......@@ -2183,7 +2183,7 @@ int do_connect(struct st_query *q)
VAR *var_port, *var_sock;
DBUG_ENTER("do_connect");
DBUG_PRINT("enter",("connect: %s",p));
DBUG_PRINT("enter",("connect: %s", q->first_argument));
/* Make a copy of query before parsing, safe_get_param will modify */
if (!(con_buf= my_strdup(q->first_argument, MYF(MY_WME))))
......@@ -2257,7 +2257,8 @@ int do_connect(struct st_query *q)
die("Illegal option to connect: %s", con_options);
con_options= str;
}
q->last_argument= p;
/* Note: 'p' is pointing into the copy 'con_buf' */
q->last_argument= q->first_argument + (p - con_buf);
if (next_con == cons_end)
die("Connection limit exhausted - increase MAX_CONS in mysqltest.c");
......
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