bzr commit into mysql-5.1 branch (msvensson:2670)

[Magnus Svensson]

#At file:///home/msvensson/mysql/5.1-rpl/

 2670 Magnus Svensson	2008-10-08
      WL4189 Active state perl fixes
modified:
  mysql-test/lib/My/Platform.pm
  mysql-test/lib/My/SafeProcess.pm
  mysql-test/lib/My/SysInfo.pm

=== modified file 'mysql-test/lib/My/Platform.pm'
--- a/mysql-test/lib/My/Platform.pm	2008-09-22 16:15:55 +0000
+++ b/mysql-test/lib/My/Platform.pm	2008-10-08 18:25:28 +0000
@@ -65,9 +65,11 @@ BEGIN {
 #
 
 use Memoize;
-memoize('mixed_path');
-memoize('native_path');
-memoize('posix_path');
+if (!IS_WIN32PERL){
+  memoize('mixed_path');
+  memoize('native_path');
+  memoize('posix_path');
+}
 
 sub mixed_path {
   my ($path)= @_;

=== modified file 'mysql-test/lib/My/SafeProcess.pm'
--- a/mysql-test/lib/My/SafeProcess.pm	2008-08-10 17:46:43 +0000
+++ b/mysql-test/lib/My/SafeProcess.pm	2008-10-08 18:25:28 +0000
@@ -212,6 +212,14 @@ sub timer {
   };
 
   $0= "safe_timer($duration)";
+
+  if (IS_WIN32PERL){
+    # Just a thread in same process
+    sleep($duration);
+    print STDERR "timer $$: expired after $duration seconds\n";
+    exit(0);
+  }
+
   my $count_down= $duration;
   while($count_down--){
 

=== modified file 'mysql-test/lib/My/SysInfo.pm'
--- a/mysql-test/lib/My/SysInfo.pm	2008-07-24 20:22:47 +0000
+++ b/mysql-test/lib/My/SysInfo.pm	2008-10-08 18:25:28 +0000
@@ -76,7 +76,7 @@ sub _kstat {
   my ($self)= @_;
   while (1){
     my $instance_num= $self->{cpus} ? @{$self->{cpus}} : 0;
-    my $list= `kstat -p -m cpu_info -i $instance_num`;
+    my $list= `kstat -p -m cpu_info -i $instance_num 2> /dev/null`;
     my @lines= split('\n', $list) or last; # Break loop
 
     my $cpuinfo= {};