Commit 11632315 authored by unknown's avatar unknown
Browse files

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.
parent 17be53b0

client/mysqltest.c

+3 −2
Original line number Diff line number Diff line
@@ -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");