List:Commits« Previous MessageNext Message »
From:Magnus Svensson Date:October 10 2008 2:19pm
Subject:bzr commit into mysql-5.1 branch (msvensson:2676) Bug#39008
View as plain text  
#At file:///home/msvensson/mysql/5.1-rpl/

 2676 Magnus Svensson	2008-10-10
      BUG#39008 Additional fix after review, remove files that could potentially be set to path outside datadir
modified:
  mysql-test/mysql-test-run.pl

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2008-10-08 20:30:56 +0000
+++ b/mysql-test/mysql-test-run.pl	2008-10-10 14:19:04 +0000
@@ -4099,9 +4099,26 @@ sub start_servers($) {
     }
 
     my $datadir= $mysqld->value('datadir');
-    if (!$opt_start_dirty)
+    if ($opt_start_dirty)
     {
       # Don't delete anything if starting dirty
+      ;
+    }
+    else
+    {
+
+      my @options= ('log-bin', 'relay-log');
+      foreach my $option_name ( @options )  {
+	next unless $mysqld->option($option_name);
+
+	my $file_name= $mysqld->value($option_name);
+	next unless
+	  defined $file_name and
+	    -e $file_name;
+
+	mtr_debug(" -removing '$file_name'");
+	unlink($file_name) or die ("unable to remove file '$file_name'");
+      }
 
       if (-d $datadir ) {
 	mtr_verbose(" - removing '$datadir'");

Thread
bzr commit into mysql-5.1 branch (msvensson:2676) Bug#39008Magnus Svensson10 Oct