From: Bjorn Munch
Date: September 28 2010 1:58pm
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2935) Bug#56125
List-Archive: http://lists.mysql.com/commits/119283
X-Bug: 56125
Message-Id: <201009281358.o8SDwTbS015830@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1061368777=="

--===============1061368777==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/ecl-51/ based on revid:bjorn.munch@stripped

 2935 Bjorn Munch	2010-09-28
      Bug #56125 MTR2 start-and-exit removes server tmpdir, server becomes not operational
      This happens when creating new tmpdir due to too long socket path
      Don't delete it if --start-and-exit, but warn user to do it.

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-08-31 09:27:57 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-09-28 13:58:01 +0000
@@ -110,12 +110,24 @@ my $path_vardir_trace;          # unix f
 my $opt_tmpdir;                 # Path to use for tmp/ dir
 my $opt_tmpdir_pid;
 
+my $opt_start;
+my $opt_start_dirty;
+my $opt_start_exit;
+my $start_only;
+
 END {
   if ( defined $opt_tmpdir_pid and $opt_tmpdir_pid == $$ )
   {
-    # Remove the tempdir this process has created
-    mtr_verbose("Removing tmpdir '$opt_tmpdir");
-    rmtree($opt_tmpdir);
+    if (!$opt_start_exit)
+    {
+      # Remove the tempdir this process has created
+      mtr_verbose("Removing tmpdir $opt_tmpdir");
+      rmtree($opt_tmpdir);
+    }
+    else
+    {
+      mtr_warning("tmpdir $opt_tmpdir should be removed after the server has finished");
+    }
   }
 }
 
@@ -215,10 +227,6 @@ my $opt_start_timeout   = $ENV{MTR_START
 sub suite_timeout { return $opt_suite_timeout * 60; };
 sub check_timeout { return $opt_testcase_timeout * 6; };
 
-my $opt_start;
-my $opt_start_dirty;
-my $opt_start_exit;
-my $start_only;
 my $opt_wait_all;
 my $opt_user_args;
 my $opt_repeat= 1;


--===============1061368777==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/ecl-51/
# testament_sha1: 3cf0f66df9f77c2f0b56bcbb15541d2df2fc00d3
# timestamp: 2010-09-28 15:58:29 +0200
# base_revision_id: bjorn.munch@stripped\
#   1p16inebpdk8kn3d
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbwoD5QAAdDfgFAQfOf//1YC
FAC////6UARu683gXd497cl7Xc9CSRJgTJpPRM0p+mKnsqeKemFND1AA9QSUKYxNNA1NTymTU8oa
ANAANDQNCZCTDQke1R6mINDIAADIAYkUZqnkymxTRppskNqaPUA00GjJ6mgkiCEaYUxlHqj1PJin
lNBo9TCAAeI2V7SHx31fkbVBqq6THjqzoi2GT170IpYLLaHxPkZ98pVQJLgRr/j+BbMa6NkyCR2/
A3vicmnQSuTrsHJhad+TTwC7V9NLjbhyv+cEDQyQiIzg+Co56OFLlZ9qvCon3sHQxcULs7V6PHJb
z0zehfIxCXd1G5F641RUmo0ZJU542q8/IhpFxnd+B1bYm8WzvqyJVzvSKxKxqoYyJAdjg9tOwiIb
UJ3EMplJK+91NMpsLJDqOzkpe2mshQoKLk3qSQEHF4S3RTzMAjqoGchhRWtN19t4v0vofucCwyiV
K+Qz2csXEqGQ91NHGPFQgxi/LibBEwwYarfmRa2C1zmWPYKp2xupuReOnnb63HmFzqL2weYXD/Fv
rFKetlFi9eDKtiCgcWlB450UMiWjKCn4EpGemde1py3lnIOHtrKntaEhZf0wu21IcHxNOfSPXZdO
w0Z2Cvl3Uopf7tMURQyB5Y5lTuFVWIyUlIiQF1vSec+Q5qt4ujC3qlfWN55q4T7a77hHVhCVgtnq
iK84KrFQrnEJSZhE2vQKhG81EAHwOfiWtlP6hp5LMrkFZtpsJD4Iob84Z0ovUL8ExxKIhXSMg7hw
2YG0x46ynfLlmSK79EAs9bVQ9hdzzI8SaUSsy5HOj31SDcTdw89I4qGIbAtLBnfuaehQSdj3Flou
HMVFtXQahuM3eC5Cvje6DO9I7JDvLmKoeujEpsns0Yy0RKBM5ZFLPVJeI/zLJFndIXT04X4GzXDp
iBcD0efH05llWNDbn55WyMWuuDDyFFxp0hvo99Zf2dKaN3ak9cnGNhiO3zrB3S0KLyMjCnmjir2Z
DLF3fnmsAZjyzVAbRd13M0SjlNZZ7HVUNqLyI5W0GZi/FroAejlnnPBATgsgqUiqHx6Rh8NtgROq
v0FuWSa2jfdiaDFSI7AirI7a6PPswo1BTWg3lWYNHNM26ntcwF3C2kzpwSOeszJtgYrdvUGW4KQp
cGOaFIadoPSXXFoyTKXz5iN7YKV1k5X0IJghhNoPZfYk7JHUV1QfHitNMczUDJEU5zU9JBYSvZIY
qDoMpScdiip4aSW6sWBFHVV0xtCtVkHhGPNHwr0wjnV5PAkPAnNABtcba/Llgj1WlRV5sWZNCIlU
0pgnbbYo4UuIsv3KbBPDXmFiUrMkEUcopEhJxvEA+YRkTaXDDmgdSiRIPLQyawpFB9k4hSUmDXKh
3nAFBnaI0YWyI6DsqUwPnW+PLzb28QtRLPUHCsJEx9P+svm9zGRr1kINS6i3eYpUUAUxou44deli
I0nTWV3EDXI1Jg0BctnamuINWbc0bjYb3Ty7bF97UiF3TpIqFEmoLBxqKEGnRbmJowGUgqUTDHXy
mG4frhiU5vEP+LuSKcKEheFAfKA=


--===============1061368777==--