Commit 5b8771ea authored by Magnus Svensson's avatar Magnus Svensson
Browse files

WL4189 Active state perl fixes

parent b3b8274e

mysql-test/lib/My/Platform.pm

+5 −3
Original line number Diff line number Diff line
@@ -65,9 +65,11 @@ BEGIN { 
#



use Memoize;

if (!IS_WIN32PERL){

  memoize('mixed_path');

  memoize('native_path');

  memoize('posix_path');

}



sub mixed_path {

  my ($path)= @_;

mysql-test/lib/My/SafeProcess.pm

+8 −0
Original line number Diff line number Diff line
@@ -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--){

mysql-test/lib/My/SysInfo.pm

+1 −1
Original line number Diff line number Diff line
@@ -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= {};