bk commit into 5.1 tree (ian:1.2209) BUG#16855

[Ian Greenhoe]

Below is the list of changes that have just been committed into a local
5.1 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.2209 06/03/22 16:40:24 ian@zim.(none) +1 -0
  Bug #16855
  (Bug is not currently assigned to me due to bug system not being
  properly configured W/RT my account.)

  client/mysql.cc
    1.198 06/03/22 16:40:18 ian@zim.(none) +8 -1
    Fix for #16855: Command line options are ignored for mysql client

# 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.1

--- 1.197/client/mysql.cc	2006-03-03 13:26:34 -08:00
+++ 1.198/client/mysql.cc	2006-03-22 16:40:18 -08:00
@@ -939,7 +939,14 @@
     opt_reconnect= 0;
     connect_flag= 0; /* Not in interactive mode */
   }
-  
+
+  if (opt_mysql_port && !opt_protocol)
+  {
+    /* 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))))