WL#15524 patch #13 ndb_waiter and new MTR tests

Post push fix.

Change printout 'Using TLS' to ' trying TLS' added to printout of
'Connecting to management server ...' line for ndb_waiter tool.

Adjust test ndb.ndb_tools_result to ignore wheter TLS is tried or not to
be able to run test suite ndb with or without TLS.

Change-Id: I6fb98b20eda21871248f3b85586c8f2a4cce93eb

Author: zmur

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

@@ -79,9 +79,9 @@ Unable to connect to management server.
 '
 
 Testing ndb_waiter
-Connecting to management server at nodeid=0,localhost:<MGMD-PORT>
+Connecting to management server at nodeid=0,localhost:<MGMD-PORT><MAYBE-TLS>
 Node 1: STARTED
 Node 2: STARTED
-Connecting to management server at nodeid=0,no_such_host:1186
-Unable to resolve any of the address in connect string: nodeid=0,no_such_host:1186
+Connecting to management server at nodeid=0,no_such_host:1186<MAYBE-TLS>
+Unable to resolve any of the address in connect string: nodeid=0,no_such_host:1186<MAYBE-TLS>
 latest_error=1001, line=no_such_host

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

@@ -63,9 +63,11 @@ drop table t1;
 --echo
 
 --echo Testing ndb_waiter
---replace_regex /localhost:[0-9]*/localhost:<MGMD-PORT>/
+replace_regex /localhost:[0-9]+ trying TLS/localhost:<MGMD-PORT><MAYBE-TLS>/
+              /localhost:[0-9]+/localhost:<MGMD-PORT><MAYBE-TLS>/;
 --exec $NDB_WAITER
---replace_regex /line.*/line=no_such_host/
+replace_regex /line.*/line=no_such_host/
+              /no_such_host:1186( trying TLS)?/no_such_host:1186<MAYBE-TLS>/;
 --error 1
 --exec $NDB_WAITER --ndb-connectstring=no_such_host --connect-retry-delay=1 --connect-retries=3
 

storage/ndb/tools/waiter.cpp

@@ -182,8 +182,6 @@ int main(int argc, char** argv){
   }
 
   tlsKeyManager.init_mgm_client(opt_tls_search_path);
-  if(tlsKeyManager.ctx())
-    ndbout_c("Using TLS.");
 
   if (waitClusterStatus(connect_string, wait_status) != 0)
     return NdbToolsProgramExitCode::FAILED;
@@ -320,7 +318,9 @@ waitClusterStatus(const char* _addr,
 
   char buf[1024];
   ndbout << "Connecting to management server at "
-         << ndb_mgm_get_connectstring(handle, buf, sizeof(buf)) << endl;
+         << ndb_mgm_get_connectstring(handle, buf, sizeof(buf))
+         << (tlsKeyManager.ctx() ? " trying TLS" : "")
+         << endl;
   if (ndb_mgm_connect_tls(handle,
                           opt_connect_retries - 1, opt_connect_retry_delay, 1,
                           opt_mgm_tls)) {