commit into MySQL/Maria:mysql-maria branch (guilhem:2655)

[Guilhem Bichot]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-maria/

 2655 Guilhem Bichot	2008-06-16
      Fix for failure of test maria-recover under Windows.
modified:
  mysql-test/r/maria-recover.result
  mysql-test/t/maria-recover.test
  storage/maria/ma_test_force_start.pl

per-file comments:
  mysql-test/r/maria-recover.result
    result update
  mysql-test/t/maria-recover.test
    making test independent of / or \ in file names (failed under Windows)
  storage/maria/ma_test_force_start.pl
    indentation
=== modified file 'mysql-test/r/maria-recover.result'
--- a/mysql-test/r/maria-recover.result	2008-06-04 08:43:12 +0000
+++ b/mysql-test/r/maria-recover.result	2008-06-16 08:57:25 +0000
@@ -24,7 +24,7 @@ select * from t_corrupted2;
 a
 ThursdayMorningsMarket
 Warnings:
-Error	145	Table './mysqltest/t_corrupted2' is marked as crashed and should be repaired
+Error	145	Table '.t_corrupted2' is marked as crashed and should be repaired
 Error	1194	Table 't_corrupted2' is marked as crashed and should be repaired
 Error	1034	1 client is using or hasn't closed the table properly
 Error	1034	Wrong base information on indexpage at page: 1

=== modified file 'mysql-test/t/maria-recover.test'
--- a/mysql-test/t/maria-recover.test	2008-06-04 08:43:12 +0000
+++ b/mysql-test/t/maria-recover.test	2008-06-16 08:57:25 +0000
@@ -48,6 +48,7 @@ EOF
 
 # line below will be removed
 disable_ps_protocol;
+replace_regex /.mysqltest.t_corrupted2/t_corrupted2/ ;
 select * from t_corrupted2; # should show corruption and repair messages
 enable_ps_protocol;
 select * from t_corrupted2; # should show just rows

=== modified file 'storage/maria/ma_test_force_start.pl'
--- a/storage/maria/ma_test_force_start.pl	2008-06-13 15:39:45 +0000
+++ b/storage/maria/ma_test_force_start.pl	2008-06-16 08:57:25 +0000
@@ -44,12 +44,12 @@ my @cmd_output;
 my $whatever; # garbage data
 my $base_server_cmd= "perl mysql-test-run.pl
--mysqld=--maria-force-start-after-recovery-failures=$force_after maria-recover ";
 if ($^O =~ /^mswin/i)
-{
-  print <<EOF;
+  {
+    print <<EOF;
 WARNING: with Activestate Perl, mysql-test-run.pl --start-and-exit has a bug:
 it does not exit; cygwin perl recommended
 EOF
-}
+  }
 my $iswindows= ( $^O =~ /win/i  && $^O !~ /darwin/i );
 $base_server_cmd.= ($iswindows ? "--mysqld=--console" : "--mem");
 my $server_cmd;