diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2008-06-16 10:57:25 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2008-06-16 10:57:25 +0200 |
| commit | 96e2ca52adfc4e58e4a08d20dcb32a6ff2f1ab2c (patch) | |
| tree | 20f1b29491309769b5ef769028e722ff313ad126 | |
| parent | 771a66eaeee0f68f2b64743973fd5b48f73723b3 (diff) | |
| download | mariadb-git-96e2ca52adfc4e58e4a08d20dcb32a6ff2f1ab2c.tar.gz | |
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
| -rw-r--r-- | mysql-test/r/maria-recover.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/maria-recover.test | 1 | ||||
| -rwxr-xr-x | storage/maria/ma_test_force_start.pl | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/r/maria-recover.result b/mysql-test/r/maria-recover.result index f470d05081b..ff66a47f68b 100644 --- a/mysql-test/r/maria-recover.result +++ b/mysql-test/r/maria-recover.result @@ -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 diff --git a/mysql-test/t/maria-recover.test b/mysql-test/t/maria-recover.test index d6604d8f94e..83729c6bd46 100644 --- a/mysql-test/t/maria-recover.test +++ b/mysql-test/t/maria-recover.test @@ -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 diff --git a/storage/maria/ma_test_force_start.pl b/storage/maria/ma_test_force_start.pl index 0b25ac35605..44a2a62afed 100755 --- a/storage/maria/ma_test_force_start.pl +++ b/storage/maria/ma_test_force_start.pl @@ -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; |