List:Commits« Previous MessageNext Message »
From:Magnus Svensson Date:August 11 2008 8:41am
Subject:bzr push into mysql-5.1 branch (msvensson:2655 to 2657)
View as plain text  
 2657 Magnus Svensson	2008-08-11
      Debug printouts
modified:
  mysql-test/lib/My/Platform.pm
  mysql-test/lib/mtr_unique.pm

 2656 Magnus Svensson	2008-08-11
      Don't use slots 200-249 since they are also used by PB
modified:
  mysql-test/mysql-test-run.pl

 2655 Magnus Svensson	2008-08-10
      fix distcheck
modified:
  mysql-test/Makefile.am

=== modified file 'mysql-test/lib/My/Platform.pm'
--- a/mysql-test/lib/My/Platform.pm	2008-08-10 17:46:43 +0000
+++ b/mysql-test/lib/My/Platform.pm	2008-08-11 08:41:23 +0000
@@ -66,7 +66,9 @@ sub mixed_path {
   my ($path)= @_;
   if (IS_CYGWIN){
     return unless defined $path;
-    $path= `cygpath -m $path`;
+    my $cmd= "cygpath -m $path";
+    print "$cmd\n";
+    $path= `$cmd`;
     chomp $path;
   }
   return $path;

=== modified file 'mysql-test/lib/mtr_unique.pm'
--- a/mysql-test/lib/mtr_unique.pm	2008-08-10 17:46:43 +0000
+++ b/mysql-test/lib/mtr_unique.pm	2008-08-11 08:41:23 +0000
@@ -88,7 +88,8 @@ sub mtr_get_unique_id($$) {
     msg("taken: $id, $pid");
     # Check if process with given pid is alive
     if(!process_alive($pid)) {
-      msg("Removing slot $id used by missing process $pid");;
+      print "Removing slot $id used by missing process $pid\n";
+      msg("Removing slot $id used by missing process $pid");
       delete $taken{$id};
       $changed++;
     }

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2008-08-10 17:46:43 +0000
+++ b/mysql-test/mysql-test-run.pl	2008-08-11 08:41:12 +0000
@@ -1181,7 +1181,7 @@ sub set_build_thread_ports($) {
 
   if ( lc($build_thread) eq 'auto' ) {
     mtr_report("Requesting build thread... ");
-    $build_thread= mtr_get_unique_id(200, 299);
+    $build_thread= mtr_get_unique_id(250, 299);
     if ( !defined $build_thread ) {
       mtr_error("Could not get a unique build thread id");
     }

Thread
bzr push into mysql-5.1 branch (msvensson:2655 to 2657) Magnus Svensson11 Aug