Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

Change-Id: Ib8fb76fb0b44f6c1985dae7c7b6cdc21e35749ff

Author: zmur

mysql-test/suite/ndb/r/ndb_tools_connect.result

@@ -76,7 +76,10 @@ Unable to connect to management server.
  - Error: '1011: Could not connect to socket: Unable to connect with connect string: nodeid=0,no_such_host:1186'
 
 Testing ndb_waiter
-Connecting to mgmsrv at no_such_host
+Connecting to management server at nodeid=0,localhost:<MGMD-PORT>
+Node 1: STARTED
+Node 2: STARTED
+Connecting to management server at nodeid=0,no_such_host:1186
 Unable to connect with connect string: nodeid=0,no_such_host:1186
 Retrying every 1 seconds. Attempts left: 2 1, failed.
 latest_error=1011, line=no_such_host

mysql-test/suite/ndb/t/ndb_tools_connect.test

@@ -63,6 +63,8 @@ drop table t1;
 --exec $NDB_SHOW_TABLES --ndb-connectstring=no_such_host --connect-retry-delay=1 --connect-retries=3
 --echo
 --echo Testing ndb_waiter
+--replace_regex /localhost:[0-9]*/localhost:<MGMD-PORT>/
+--exec $NDB_WAITER
 --replace_regex /line.*/line=no_such_host/
 --error 1
 --exec $NDB_WAITER --ndb-connectstring=no_such_host --connect-retry-delay=1 --connect-retries=3

storage/ndb/test/src/NdbRestarter.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
+   Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -611,7 +611,7 @@ NdbRestarter::connect(){
     g_err << "handle == NULL" << endl;
     return -1;
   }
-  g_info << "Connecting to mgmsrv at " << addr.c_str() << endl;
+  g_info << "Connecting to management server at " << addr.c_str() << endl;
   if (ndb_mgm_set_connectstring(handle,addr.c_str()))
   {
     MGMERR(handle);

storage/ndb/test/tools/restart.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -51,8 +51,8 @@ int main(int argc, const char** argv){
   int num_args = sizeof(args) / sizeof(args[0]);
   int optind = 0;
   char desc[] = 
-    "hostname:port\n"\
-    "This program will connect to the mgmsrv of a NDB cluster\n"\
+    "hostname:port\n"
+    "This program will connect to the management server of an NDB cluster\n"
     " and restart the cluster. \n";
 
   if(getarg(args, num_args, argc, argv, &optind) || _help) {

storage/ndb/tools/waiter.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
+   Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -298,16 +298,28 @@ waitClusterStatus(const char* _addr,
     ndberr << "Could not create ndb_mgm handle" << endl;
     return -1;
   }
-  ndbout << "Connecting to mgmsrv at " << _addr << endl;
+
   if (ndb_mgm_set_connectstring(handle, _addr))
   {
     MGMERR(handle);
-    ndberr << "Connectstring " << _addr << " invalid" << endl;
+    if (_addr != NULL)
+    {
+      ndberr << "Connectstring " << _addr << " is invalid" << endl;
+    }
+    else
+    {
+      ndberr << "Connectstring is invalid" << endl;
+    }
     return -1;
   }
+  char buf[1024];
+  ndbout << "Connecting to management server at "
+         << ndb_mgm_get_connectstring(handle, buf, sizeof(buf)) << endl;
   if (ndb_mgm_connect(handle, opt_connect_retries - 1, opt_connect_retry_delay, 1)) {
     MGMERR(handle);
-    ndberr << "Connection to " << _addr << " failed" << endl;
+    ndberr << "Connection to "
+           << ndb_mgm_get_connectstring(handle, buf, sizeof(buf)) << " failed"
+           << endl;
     return -1;
   }