diff options
| author | unknown <pem@mysql.com> | 2005-10-31 19:31:05 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2005-10-31 19:31:05 +0100 |
| commit | 11632315c8493725bc80b160dfd3036f15b5a2cf (patch) | |
| tree | 3d5f86f264e7ecea961a40642f5607a8e8b30848 /client | |
| parent | 17be53b0e2f7f2b68fc7d46cfec53d223abd7100 (diff) | |
| download | mariadb-git-11632315c8493725bc80b160dfd3036f15b5a2cf.tar.gz | |
Fixed bugs in client/mysqltest.c which made lots of "connect" commands in tests fail.
client/mysqltest.c:
Fixed crash bug in debug mode and make sure q->last_argument is set right
so that check_eol_junk() will work again.
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 5a90e483262..6543dba0bb8 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -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"); |