Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria

into  gbichot4.local:/home/mysql_src/mysql-maria-clean

dbug/tests-t.pl

-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 #
 #  A driver program to test DBUG features - runs tests (shell commands)

storage/maria/unittest/ma_test_all-t

-#!/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;

storage/maria/unittest/ma_test_recovery.pl

-#!/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.