bk commit into 5.0 tree (pem:1.1957)

[pem]

Below is the list of changes that have just been committed into a local
5.0 repository of pem. When pem 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
  1.1957 05/10/31 19:31:05 pem@stripped +1 -0
  Fixed bugs in client/mysqltest.c which made lots of "connect" commands in tests fail.

  client/mysqltest.c
    1.175 05/10/31 19:30:52 pem@stripped +3 -2
    Fixed crash bug in debug mode and make sure q->last_argument is set right
    so that check_eol_junk() will work again.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	pem
# Host:	mysql.comhem.se
# Root:	/usr/home/pem/bug14376/mysql-5.0

--- 1.174/client/mysqltest.c	2005-10-31 17:51:34 +01:00
+++ 1.175/client/mysqltest.c	2005-10-31 19:30:52 +01:00
@@ -2183,7 +2183,7 @@
   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 @@
       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");