bzr commit into mysql-5.1-mtr branch (bjorn.munch:2934) Bug#56125

[Bjorn Munch]

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

 2934 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 12:12:21 +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;


Attachment: [text/bzr-bundle] bzr/[e-mail]