diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-02-15 12:58:34 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-02-15 12:58:34 +0200 |
| commit | a8fdaa6f2c5b2e302bffb069be3475772ca20f48 (patch) | |
| tree | b5c9560ec7346f7af6a5904ad344fdbb8020849c /mysql-test/suite/maria/t/maria-recover.test | |
| parent | 115efe100dbc1393bce964fa1370e50cfef71d18 (diff) | |
| parent | f7a24d72dc7a86341da4634f6d1a71f1ea77000b (diff) | |
| download | mariadb-git-a8fdaa6f2c5b2e302bffb069be3475772ca20f48.tar.gz | |
Merge with base MySQL 5.1
Contains fixes for test cases
Changed release tag to beta
configure.in:
change release tag to beta
Diffstat (limited to 'mysql-test/suite/maria/t/maria-recover.test')
| -rw-r--r-- | mysql-test/suite/maria/t/maria-recover.test | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/suite/maria/t/maria-recover.test b/mysql-test/suite/maria/t/maria-recover.test index 63e764a3b0e..de085d3ee8f 100644 --- a/mysql-test/suite/maria/t/maria-recover.test +++ b/mysql-test/suite/maria/t/maria-recover.test @@ -28,9 +28,9 @@ insert into t1 select concat(a,'b') from t1 limit 1; # a specific name to do specific detection (don't want to ignore # any corruption messages of other tests using "t2" as table). -copy_file $MYSQLTEST_VARDIR/master-data/mysqltest/t1.frm $MYSQLTEST_VARDIR/master-data/mysqltest/t_corrupted2.frm; -copy_file $MYSQLTEST_VARDIR/master-data/mysqltest/t1.MAD $MYSQLTEST_VARDIR/master-data/mysqltest/t_corrupted2.MAD; -copy_file $MYSQLTEST_VARDIR/master-data/mysqltest/t1.MAI $MYSQLTEST_VARDIR/master-data/mysqltest/t_corrupted2.MAI; +copy_file $MYSQLTEST_VARDIR/mysqld.1/data/mysqltest/t1.frm $MYSQLTEST_VARDIR/mysqld.1/data/mysqltest/t_corrupted2.frm; +copy_file $MYSQLTEST_VARDIR/mysqld.1/data/mysqltest/t1.MAD $MYSQLTEST_VARDIR/mysqld.1/data/mysqltest/t_corrupted2.MAD; +copy_file $MYSQLTEST_VARDIR/mysqld.1/data/mysqltest/t1.MAI $MYSQLTEST_VARDIR/mysqld.1/data/mysqltest/t_corrupted2.MAI; # Ruin the index file. # If maria-block-size is smaller than the default, the corruption @@ -38,7 +38,7 @@ copy_file $MYSQLTEST_VARDIR/master-data/mysqltest/t1.MAI $MYSQLTEST_VARDIR/maste perl; use strict; use warnings; - my $fname= "$ENV{'MYSQLTEST_VARDIR'}/master-data/mysqltest/t_corrupted2.MAI"; + my $fname= "$ENV{'MYSQLTEST_VARDIR'}/mysqld.1/data/mysqltest/t_corrupted2.MAI"; open(FILE, "+<", $fname) or die; my $whatever= ("\xAB" x 100); sysseek (FILE, 8192, 0) or die; @@ -54,3 +54,4 @@ enable_ps_protocol; select * from t_corrupted2; # should show just rows drop database mysqltest; +set @@global.maria_recover=BACKUP; |