From cebe93dc5b5a6af01e61b873f379b3ca6b86bb8f Mon Sep 17 00:00:00 2001
From: sayantan dutta <sayantan.dutta@oracle.com>
Date: Tue, 11 Feb 2014 17:15:50 +0530
Subject: Bug #18027288 - MTR SUITE ABORTS WHEN A CLIENT TRIES TO CONNECT
 SERVER WITH A WRONG PORT NUMBER

---
 mysql-test/mysql-test-run.pl | 1 -
 1 file changed, 1 deletion(-)

(limited to 'mysql-test/mysql-test-run.pl')

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 7900b54c3fb..378c1f8c8d9 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -417,7 +417,6 @@ sub main {
     );
   mtr_error("Could not create testcase server port: $!") unless $server;
   my $server_port = $server->sockport();
-  mtr_report("Using server port $server_port");
 
   if ($opt_resfile) {
     resfile_init("$opt_vardir/mtr-results.txt");
-- 
cgit v1.2.1


From 6f027d9dfc152a0a3f5825ee1956a40d7b78b6b4 Mon Sep 17 00:00:00 2001
From: sayantan dutta <sayantan.dutta@oracle.com>
Date: Tue, 25 Feb 2014 18:42:14 +0530
Subject: Bug #17926328 - MTR SHOULD NOT WAIT FOR CHILDREN WHEN ABORTING TEST
 RUN ON WINDOWS

---
 mysql-test/mysql-test-run.pl | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'mysql-test/mysql-test-run.pl')

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 378c1f8c8d9..e236d3ce267 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 
-# Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2014, 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
@@ -474,15 +474,17 @@ sub main {
   # Send Ctrl-C to any children still running
   kill("INT", keys(%children));
 
-  # Wait for childs to exit
-  foreach my $pid (keys %children)
-  {
-    my $ret_pid= waitpid($pid, 0);
-    if ($ret_pid != $pid){
-      mtr_report("Unknown process $ret_pid exited");
-    }
-    else {
-      delete $children{$ret_pid};
+  if (!IS_WINDOWS) { 
+    # Wait for children to exit
+    foreach my $pid (keys %children)
+    {
+      my $ret_pid= waitpid($pid, 0);
+      if ($ret_pid != $pid){
+        mtr_report("Unknown process $ret_pid exited");
+      }
+      else {
+        delete $children{$ret_pid};
+      }
     }
   }
 
-- 
cgit v1.2.1