MDEV-14974: --port ignored for --host=localhostbb-10.6-MDEV-1497410.6-MDEV-14974

Problem:
=======
MariaDB's command line utilities (e.g., mysql,
mysqldump, etc) silently ignore connection
property options (e.g., --port and --socket)
when protocol is not explicitly set via the
command-line for localhost connections.

Fix:
===
If connection properties are specified without a
protocol, override the protocol to be consistent.
For example, if --port is specified, automatically
set protocol=tcp.

Caveats:
=======
 * When multiple connection properties are
specified, nothing is overridden
 * If protocol is is set via the command-line,
its value is used

8 files changed, 17 insertions, 1 deletions

diff --git a/man/mysql.1 b/man/mysql.1
index 03f23df3660..7f722659d2f 100644
--- a/man/mysql.1
+++ b/man/mysql.1
@@ -862,7 +862,8 @@ Directory for client-side plugins\&.
 \fB\-\-port=\fR\fB\fIport_num\fR\fR,
 \fB\-P \fR\fB\fIport_num\fR\fR
 .sp
-The TCP/IP port number to use for the connection or 0 for default to, in order of preference, my.cnf, $MYSQL_TCP_PORT, /etc/services, built-in default (3306)\&.
+The TCP/IP port number to use for the connection or 0 for default to, in order of preference, my.cnf, $MYSQL_TCP_PORT, /etc/services, built-in default (3306)\&. 
+Forces --protocol=tcp when specified on the command line without other connection properties\&.
 .RE
 .sp
 .RS 4
@@ -1200,6 +1201,7 @@ Do not write line numbers for errors\&. Useful when you want to compare result f
 .sp
 For connections to
 localhost, the Unix socket file to use, or, on Windows, the name of the named pipe to use\&.
+Forces --protocol=socket when specified on the command line without other connection properties; on Windows, forces --protocol=pipe\&.
 .RE
 .sp
 .RS 4
diff --git a/man/mysqladmin.1 b/man/mysqladmin.1
index 5b67f87fa5e..aa77cd989fc 100644
--- a/man/mysqladmin.1
+++ b/man/mysqladmin.1
@@ -1105,6 +1105,7 @@ On Windows, connect to the server via a named pipe\&. This option applies only i
 .sp
 The TCP/IP port number to use for the connection or 0 for default to, 
 in order of preference, my.cnf, $MYSQL_TCP_PORT, /etc/services, built-in default (3306)\&.
+Forces --protocol=tcp when specified on the command line without other connection properties\&.
 .RE
 .sp
 .RS 4
@@ -1227,6 +1228,7 @@ executes commands indefinitely until interrupted\&.
 .sp
 For connections to
 localhost, the Unix socket file to use, or, on Windows, the name of the named pipe to use\&.
+Forces --protocol=socket when specified on the command line without other connection properties; on Windows, forces --protocol=pipe\&.
 .RE
 .sp
 .RS 4
diff --git a/man/mysqlbinlog.1 b/man/mysqlbinlog.1
index c2fa339c075..3d12a8fa083 100644
--- a/man/mysqlbinlog.1
+++ b/man/mysqlbinlog.1
@@ -791,6 +791,7 @@ Print the program argument list from all option files and exit\&.
 The TCP/IP port number to use for connecting to a remote server, 
 or \fB0\fR for default to, in order of preference, \fBmy.cnf\fR, 
 \fB$MYSQL_TCP_PORT\fR, \fB/etc/services\fR, \fRbuilt-in default (3306)\fR\&.
+Forces --protocol=tcp when specified on the command line without other connection properties\&.
 .RE
 .sp
 .RS 4
@@ -955,6 +956,7 @@ base64-output, consider using \fB--base64-output=never\fR instead\&.
 .sp
 For connections to
 localhost, the Unix socket file to use, or, on Windows, the name of the named pipe to use\&.
+Forces --protocol=socket when specified on the command line without other connection properties; on Windows, forces --protocol=pipe\&.
 .RE
 .sp
 .RS 4
diff --git a/man/mysqlcheck.1 b/man/mysqlcheck.1
index 93d675f48ee..b8f102a27a4 100644
--- a/man/mysqlcheck.1
+++ b/man/mysqlcheck.1
@@ -731,6 +731,7 @@ On Windows, connect to the server via a named pipe\&. This option applies only i
 \fB\-P \fR\fB\fIport_num\fR\fR
 .sp
 The TCP/IP port number to use for the connection\&.
+Forces --protocol=tcp when specified on the command line without other connection properties\&.
 .RE
 .sp
 .RS 4
@@ -874,6 +875,7 @@ Don't process the database (case-sensitive) specified as argument\&.
 .sp
 For connections to
 localhost, the Unix socket file to use, or, on Windows, the name of the named pipe to use\&.
+Forces --protocol=socket when specified on the command line without other connection properties; on Windows, forces --protocol=pipe\&.
 .RE
 .sp
 .RS 4
diff --git a/man/mysqldump.1 b/man/mysqldump.1
index b9e72881981..e3206e612f7 100644
--- a/man/mysqldump.1
+++ b/man/mysqldump.1
@@ -1614,6 +1614,7 @@ Directory for client-side plugins\&.
 \fB\-P \fR\fB\fIport_num\fR\fR
 .sp
 The TCP/IP port number to use for the connection\&.
+Forces --protocol=tcp when specified on the command line without other connection properties\&.
 .RE
 .sp
 .RS 4
@@ -2056,6 +2057,7 @@ option\&.
 .sp
 For connections to
 localhost, the Unix socket file to use, or, on Windows, the name of the named pipe to use\&.
+Forces --protocol=socket when specified on the command line without other connection properties; on Windows, forces --protocol=pipe\&.
 .RE
 .sp
 .RS 4
diff --git a/man/mysqlimport.1 b/man/mysqlimport.1
index 56530f22628..b7999166d32 100644
--- a/man/mysqlimport.1
+++ b/man/mysqlimport.1
@@ -531,6 +531,7 @@ On Windows, connect to the server via a named pipe\&. This option applies only i
 \fB\-P \fR\fB\fIport_num\fR\fR
 .sp
 The TCP/IP port number to use for the connection\&.
+Forces --protocol=tcp when specified on the command line without other connection properties\&.
 .RE
 .sp
 .RS 4
@@ -617,6 +618,7 @@ Silent mode\&. Produce output only when errors occur\&.
 .sp
 For connections to
 localhost, the Unix socket file to use, or, on Windows, the name of the named pipe to use\&.
+Forces --protocol=socket when specified on the command line without other connection properties; on Windows, forces --protocol=pipe\&.
 .RE
 .sp
 .RS 4
diff --git a/man/mysqlshow.1 b/man/mysqlshow.1
index dc8bf3bd041..f20ac9fed63 100644
--- a/man/mysqlshow.1
+++ b/man/mysqlshow.1
@@ -426,6 +426,7 @@ Directory for client-side plugins\&.
 \fB\-P \fR\fB\fIport_num\fR\fR
 .sp
 The TCP/IP port number to use for the connection\&.
+Forces --protocol=tcp when specified on the command line without other connection properties\&.
 .RE
 .sp
 .RS 4
@@ -494,6 +495,7 @@ VIEW\&.
 .sp
 For connections to
 localhost, the Unix socket file to use, or, on Windows, the name of the named pipe to use\&.
+Forces --protocol=socket when specified on the command line without other connection properties; on Windows, forces --protocol=pipe\&.
 .RE
 .sp
 .RS 4
diff --git a/man/mysqlslap.1 b/man/mysqlslap.1
index 08388f03ca1..4f31489dead 100644
--- a/man/mysqlslap.1
+++ b/man/mysqlslap.1
@@ -799,6 +799,7 @@ Directory for client-side plugins\&.
 \fB\-P \fR\fB\fIport_num\fR\fR
 .sp
 The TCP/IP port number to use for the connection\&.
+Forces --protocol=tcp when specified on the command line without other connection properties\&.
 .RE
 .sp
 .RS 4
@@ -960,6 +961,7 @@ Silent mode\&. No output\&.
 .sp
 For connections to
 localhost, the Unix socket file to use, or, on Windows, the name of the named pipe to use\&.
+Forces --protocol=socket when specified on the command line without other connection properties; on Windows, forces --protocol=pipe\&.
 .RE
 .sp
 .RS 4