bk commit into 5.0 tree (ian:1.2097) BUG#16855

[Ian Greenhoe]

Below is the list of changes that have just been committed into a local
5.0 repository of ian. When ian 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.2097 06/03/27 17:45:06 ian@zim.(none) +2 -0
  Fix for bug #16855

  client/mysql.cc
    1.198 06/03/27 17:45:01 ian@zim.(none) +9 -2
    If --socket is not set, provides --protocol=TCP when --port=
    is specified (and --protocol= is not specified.)

  BitKeeper/etc/ignore
    1.217 06/03/27 17:45:01 ian@zim.(none) +2 -0
    Added mysql-test/r/bdb.log mysql-test/r/im_client_port.log to the ignore list

# 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:	ian
# Host:	zim.(none)
# Root:	/home/ian/workspace/bug-5.0

--- 1.197/client/mysql.cc	2006-03-03 13:26:34 -08:00
+++ 1.198/client/mysql.cc	2006-03-27 17:45:01 -08: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.",
+  {"socket", 'S', "Socket file to use for connection. (This will override --port unless --protocol=TCP is specified.)",
    (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,7 +939,14 @@
     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))))

--- 1.216/BitKeeper/etc/ignore	2006-03-06 13:08:02 -08:00
+++ 1.217/BitKeeper/etc/ignore	2006-03-27 17:45:01 -08:00
@@ -1275,3 +1275,5 @@
 zlib/*.vcproj
 scripts/mysql_upgrade
 include/openssl
+mysql-test/r/bdb.log
+mysql-test/r/im_client_port.log