diff --git a/.bzrignore b/.bzrignore
index e521692f6c2..1bd9f91fccf 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1275,3 +1275,6 @@ zlib/*.ds?
 zlib/*.vcproj
 scripts/mysql_upgrade
 include/openssl
+mysql-test/r/bdb.log
+mysql-test/r/im_client_port.log
+mysql-test/r/udf.log
diff --git a/client/mysql.cc b/client/mysql.cc
index eb6970691bb..2001056dea1 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -653,7 +653,7 @@ static struct my_option my_long_options[] =
    "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 @@ static int get_options(int argc, char **argv)
     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))))
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index f71e24ff3ed..a836b1a2897 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -12,3 +12,4 @@
 
 sp-goto         : GOTO is currently is disabled - will be fixed in the future
 ndb_load        : Bug#17233
+udf             : Bug#18564 (Permission by Brian)