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

Author: blaudden

mysql-test/include/ndb_default_cluster.inc

@@ -1,4 +1,18 @@
 # -*- cperl -*-
+# Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 package My::Exec;
 
@@ -55,6 +69,16 @@ sub show_last_lines_from_file {
     $F->close();
 }
 
+# Extract the command name with args, ignoring its location
+sub get_command_name {
+    my $cmd = shift;
+
+    my @cmd_parts = split(' ', $cmd);
+    my $cmd_base_name = fileparse($cmd_parts[0]);
+    my $cmd_base_with_args = substr($cmd , index($cmd, $cmd_base_name));
+    return $cmd_base_with_args;
+}
+
 #
 # exec_print_on_error - executes command, and prints n last lines of output
 #                       from the command only if the command fails. If the command runs
@@ -75,14 +99,16 @@ sub exec_print_on_error {
 
     my $logfile_name = get_logfile_name($cmd);
 
+    my $cmd_base_name = get_command_name($cmd);
+
     # Redirect stdout and stderr of command to log file
     $cmd .= " > $logfile_name 2>&1";
 
     # Execute command
-    print "Running '$cmd'\n";
+    print "Running '$cmd_base_name'\n";
     system($cmd);
 
-    print "Result of '$cmd': $?\n";
+    print "Result of '$cmd_base_name': $?\n";
     if ($? == 0)
     {
 	# Test program suceeded