Commit 96e2ca52 authored by Guilhem Bichot's avatar Guilhem Bichot

Fix for failure of test maria-recover under Windows.

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
parent 771a66ea
...@@ -24,7 +24,7 @@ select * from t_corrupted2; ...@@ -24,7 +24,7 @@ select * from t_corrupted2;
a a
ThursdayMorningsMarket ThursdayMorningsMarket
Warnings: 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 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 1 client is using or hasn't closed the table properly
Error 1034 Wrong base information on indexpage at page: 1 Error 1034 Wrong base information on indexpage at page: 1
......
...@@ -48,6 +48,7 @@ EOF ...@@ -48,6 +48,7 @@ EOF
# line below will be removed # line below will be removed
disable_ps_protocol; disable_ps_protocol;
replace_regex /.mysqltest.t_corrupted2/t_corrupted2/ ;
select * from t_corrupted2; # should show corruption and repair messages select * from t_corrupted2; # should show corruption and repair messages
enable_ps_protocol; enable_ps_protocol;
select * from t_corrupted2; # should show just rows select * from t_corrupted2; # should show just rows
......
...@@ -44,12 +44,12 @@ my @cmd_output; ...@@ -44,12 +44,12 @@ my @cmd_output;
my $whatever; # garbage data my $whatever; # garbage data
my $base_server_cmd= "perl mysql-test-run.pl --mysqld=--maria-force-start-after-recovery-failures=$force_after maria-recover "; my $base_server_cmd= "perl mysql-test-run.pl --mysqld=--maria-force-start-after-recovery-failures=$force_after maria-recover ";
if ($^O =~ /^mswin/i) if ($^O =~ /^mswin/i)
{ {
print <<EOF; print <<EOF;
WARNING: with Activestate Perl, mysql-test-run.pl --start-and-exit has a bug: WARNING: with Activestate Perl, mysql-test-run.pl --start-and-exit has a bug:
it does not exit; cygwin perl recommended it does not exit; cygwin perl recommended
EOF EOF
} }
my $iswindows= ( $^O =~ /win/i && $^O !~ /darwin/i ); my $iswindows= ( $^O =~ /win/i && $^O !~ /darwin/i );
$base_server_cmd.= ($iswindows ? "--mysqld=--console" : "--mem"); $base_server_cmd.= ($iswindows ? "--mysqld=--console" : "--mem");
my $server_cmd; my $server_cmd;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment