bk commit into maria tree (guilhem:1.2631)

[Guilhem Bichot]

Below is the list of changes that have just been committed into a local
maria repository of guilhem.  When guilhem does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-16 16:31:38+02:00, guilhem@stripped +3 -0
  Fix for ma_test_all-t failure and dbug/tests-t failure on Solaris:
  on that machine, "perl" calls /usr/local/bin/perl (so this is what
  runs unittest's unit.pl), while some test scripts (ma_test_recovery.pl
  etc) use /usr/bin/perl which seems to either conflict with /usr/local/bin/perl
  or have problems of its own (Perl errors when loading modules).
  Instead we use perl from the PATH. /usr/bin/env seems to be available
  on lots of Unix machines.

  dbug/tests-t.pl@stripped, 2008-04-16 16:31:35+02:00, guilhem@stripped +1 -1
    look for perl in PATH

  storage/maria/unittest/ma_test_all-t@stripped, 2008-04-16 16:31:35+02:00, guilhem@stripped +2 -1
    Look for perl in PATH

  storage/maria/unittest/ma_test_recovery.pl@stripped, 2008-04-16 16:31:35+02:00, guilhem@stripped +3 -1
    Look for perl in PATH. Close MY_LOG to flush buffers to that diff sees
    the whole file

diff -Nrup a/dbug/tests-t.pl b/dbug/tests-t.pl
--- a/dbug/tests-t.pl	2008-02-13 20:29:23 +01:00
+++ b/dbug/tests-t.pl	2008-04-16 16:31:35 +02:00
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 #
 #  A driver program to test DBUG features - runs tests (shell commands)
diff -Nrup a/storage/maria/unittest/ma_test_all-t b/storage/maria/unittest/ma_test_all-t
--- a/storage/maria/unittest/ma_test_all-t	2008-02-21 23:05:25 +01:00
+++ b/storage/maria/unittest/ma_test_all-t	2008-04-16 16:31:35 +02:00
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 # Run various unit tests.
 #
@@ -7,6 +7,7 @@ use Getopt::Long;
 use File::Basename;
 
 $|= 1;
+$^W = 1; # warnings, because env cannot parse 'perl -w'
 $VER= "1.3";
 
 $opt_version=         0;
diff -Nrup a/storage/maria/unittest/ma_test_recovery.pl b/storage/maria/unittest/ma_test_recovery.pl
--- a/storage/maria/unittest/ma_test_recovery.pl	2008-03-10 18:55:31 +01:00
+++ b/storage/maria/unittest/ma_test_recovery.pl	2008-04-16 16:31:35 +02:00
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 
 use Getopt::Long;
 use File::Copy;
@@ -7,6 +7,7 @@ use File::Basename;
 use Digest::MD5;
 
 $|= 1;
+$^W = 1; # warnings, because env cannot parse 'perl -w'
 $VER= "1.2";
 
 $opt_version= 0;
@@ -243,6 +244,7 @@ sub main
     exit(1);
   }
 
+  close(MY_LOG);
   # also note that maria_chk -dvv shows differences for ma_test2 in UNDO phase,
   # this is normal: removing records does not shrink the data/key file,
   # does not put back the "analyzed,optimized keys"(etc) index state.