bk commit into 5.0 tree (pem:1.1956)

[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.1956 05/10/31 17:51:48 pem@stripped +1 -0
  Removed C++-isms from client/mysqltest.c

  client/mysqltest.c
    1.174 05/10/31 17:51:34 pem@stripped +1 -2
    Removed C++-isms from C file.

# 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.173/client/mysqltest.c	2005-10-28 11:00:48 +02:00
+++ 1.174/client/mysqltest.c	2005-10-31 17:51:34 +01:00
@@ -2180,6 +2180,7 @@
   int free_con_sock= 0;
   int error= 0;
   int create_conn= 1;
+  VAR *var_port, *var_sock;
 
   DBUG_ENTER("do_connect");
   DBUG_PRINT("enter",("connect: %s",p));
@@ -2199,7 +2200,6 @@
   p= safe_get_param(p, &con_db, "Missing connection db");
 
   /* Port */
-  VAR* var_port;
   p= safe_get_param(p, &con_port_str, 0);
   if (*con_port_str)
   {
@@ -2222,7 +2222,6 @@
   }
 
   /* Sock */
-  VAR *var_sock;
   p= safe_get_param(p, &con_sock, 0);
   if (*con_sock)
   {