mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for failure of test maria-recover under Windows.

Browse source 
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
This commit is contained in:
Guilhem Bichot 2008-06-16 10:57:25 +02:00
parent 771a66eaee
commit 96e2ca52ad
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/maria-recover.result
View file

@ -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

1
mysql-test/t/maria-recover.test
View file

@ -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

6
storage/maria/ma_test_force_start.pl
View file

@ -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;