Bug #30787660: CONTRIBUTION: INCLUDE PORT NUMBER IN CLIENT ERROR MESSAGE

RB#25395

Now prints the port in the error message too.
A contribution by Daniel van Eeden

Author: gkodinov

libmysql/errmsg.cc

@@ -36,7 +36,7 @@ const char *client_errors[] = {
     "Unknown MySQL error",
     "Can't create UNIX socket (%d)",
     "Can't connect to local MySQL server through socket '%-.100s' (%d)",
-    "Can't connect to MySQL server on '%-.100s' (%d)",
+    "Can't connect to MySQL server on '%-.100s:%u' (%d)",
     "Can't create TCP/IP socket (%d)",
     "Unknown MySQL server host '%-.100s' (%d)",
     "MySQL server has gone away",

mysql-test/r/mysql.result

@@ -545,5 +545,11 @@ include/assert_grep.inc [check the output of mysql for the binary-as-hex mark in
 #
 SUBSTR(NULL, 0, 0)	@novar
 NULL	NULL
+#
+# Bug #30787660: CONTRIBUTION: INCLUDE PORT NUMBER IN CLIENT ERROR
+#   MESSAGE
+#
+# Success criteria: port number present in the error text
+ERROR 2003 (HY000): Can't connect to MySQL server on '127.0.0.1:99999' (111)
 
 End of tests

mysql-test/suite/clone/r/remote_error_basic.result

@@ -13,7 +13,7 @@ SET GLOBAL clone_autotune_concurrency = OFF;
 SET GLOBAL clone_max_concurrency = 8;
 SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
 CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
-ERROR HY000: Clone Donor Error: Connect failed: 2003 : Can't connect to MySQL server on 'HOST' (socket errno).
+ERROR HY000: Clone Donor Error: Connect failed: 2003 : Can't connect to MySQL server on 'HOST:PORT' (socket errno).
 select ID, STATE, ERROR_NO from performance_schema.clone_status;
 ID	STATE	ERROR_NO
 1	Failed	3862

mysql-test/suite/federated/r/federated_bug_35333.result

@@ -31,13 +31,13 @@ FROM INFORMATION_SCHEMA.TABLES
 WHERE TABLE_SCHEMA = 'realdb' OR TABLE_SCHEMA = 'federated'
   ORDER BY TABLE_SCHEMA, TABLE_NAME;
 TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	ROW_FORMAT	TABLE_ROWS	DATA_LENGTH	TABLE_COMMENT
-federated	t0	BASE TABLE	FEDERATED	Dynamic	NULL	0	Unable to connect to foreign data source: Can't connect to MySQL server on '127.0.0.1' (socket errno)
+federated	t0	BASE TABLE	FEDERATED	Dynamic	NULL	0	Unable to connect to foreign data source: Can't connect to MySQL server on '127.0.0.1:63333' (socket errno)
 realdb	t0	BASE TABLE	MyISAM	Dynamic	0	0	
 Warnings:
-Warning	1429	Unable to connect to foreign data source: Can't connect to MySQL server on '127.0.0.1' (socket errno)
+Warning	1429	Unable to connect to foreign data source: Can't connect to MySQL server on '127.0.0.1:63333' (socket errno)
 SHOW WARNINGS;
 Level	Code	Message
-Warning	1429	Unable to connect to foreign data source: Can't connect to MySQL server on '127.0.0.1' (socket errno)
+Warning	1429	Unable to connect to foreign data source: Can't connect to MySQL server on '127.0.0.1:63333' (socket errno)
 #
 # Create a MyISAM table then corrupt the file
 #

mysql-test/t/mysql.test

@@ -662,5 +662,14 @@ DROP USER bug21464621;
 --echo #
 --exec $MYSQL --binary-as-hex -e "SELECT SUBSTR(NULL, 0, 0), @novar" 2>&1
 
+--echo #
+--echo # Bug #30787660: CONTRIBUTION: INCLUDE PORT NUMBER IN CLIENT ERROR
+--echo #   MESSAGE
+--echo #
+
+--echo # Success criteria: port number present in the error text
+--error 1
+--exec $MYSQL -h 127.0.0.1 -P 99999 2>&1
+
 --echo
 --echo End of tests

sql-common/client.cc

@@ -6065,7 +6065,7 @@ static mysql_state_machine_status csm_begin_connect(mysql_async_connect *ctx) {
       DBUG_PRINT("error",
                  ("Got error %d on connect to '%s'", saved_error, host));
       set_mysql_extended_error(mysql, CR_CONN_HOST_ERROR, unknown_sqlstate,
-                               ER_CLIENT(CR_CONN_HOST_ERROR), host,
+                               ER_CLIENT(CR_CONN_HOST_ERROR), host, port,
                                saved_error);
       return STATE_MACHINE_FAILED;
     }
@@ -6144,7 +6144,7 @@ static mysql_state_machine_status csm_wait_connect(mysql_async_connect *ctx) {
                    ("Got error %d on connect to '%s'", error, ctx->host));
         set_mysql_extended_error(
             ctx->mysql, CR_CONN_HOST_ERROR, unknown_sqlstate,
-            ER_CLIENT(CR_CONN_HOST_ERROR), ctx->host, error);
+            ER_CLIENT(CR_CONN_HOST_ERROR), ctx->host, ctx->port, error);
         return STATE_MACHINE_FAILED;
       }
     }