bk commit into 5.1 tree (kent:1.2368)

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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.2368 06/04/18 17:16:27 kent@stripped +3 -0
  Merge

  client/mysqlslap.c
    1.33 06/04/18 17:16:15 kent@stripped +0 -1

  client/mysql.cc
    1.202 06/04/18 17:13:49 kent@stripped +0 -0
    Auto merged

  configure.in
    1.364 06/04/18 17:13:48 kent@stripped +0 -0
    Auto merged

# 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:	kent
# Host:	c-6c4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-new/RESYNC

--- 1.201/client/mysql.cc	2006-04-16 03:17:24 +02:00
+++ 1.202/client/mysql.cc	2006-04-18 17:13:49 +02:00
@@ -653,7 +653,7 @@
    "Base name of shared memory.", (gptr*) &shared_memory_base_name, (gptr*) &shared_memory_base_name, 
    0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #endif
-  {"socket", 'S', "Socket file to use for connection. (This will override --port unless --protocol=TCP is specified.)",
+  {"socket", 'S', "Socket file to use for connection.",
    (gptr*) &opt_mysql_unix_port, (gptr*) &opt_mysql_unix_port, 0, GET_STR_ALLOC,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #include "sslopt-longopts.h"
@@ -939,14 +939,7 @@
     opt_reconnect= 0;
     connect_flag= 0; /* Not in interactive mode */
   }
-
-  if (opt_mysql_port && (!opt_protocol) && (!opt_mysql_unix_port))
-  {
-    /* Not checking return type since we are using a constant value */
-    /* straight from the initialization of sql_protocol_typelib.    */
-    opt_protocol= find_type("TCP", &sql_protocol_typelib, 0);
-  }
-
+  
   if (strcmp(default_charset, charset_info->csname) &&
       !(charset_info= get_charset_by_csname(default_charset, 
 					    MY_CS_PRIMARY, MYF(MY_WME))))