diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2008-12-18 19:37:18 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2008-12-18 19:37:18 +0000 |
| commit | 606603db95d6b83783e52c10a85a1c2b95a17150 (patch) | |
| tree | a09e55fde4810bebcb8c8ac28fabc1d6a78f285f /mysql-test/t/mysqlcheck.test | |
| parent | 29e8163c9f7ddba84d7ba8004b97fb332aeccb95 (diff) | |
| download | mariadb-git-606603db95d6b83783e52c10a85a1c2b95a17150.tar.gz | |
Post-fix merge 5-1 --> 5.1-rpl. Fixed mysqlcheck.test var directories.
Diffstat (limited to 'mysql-test/t/mysqlcheck.test')
| -rw-r--r-- | mysql-test/t/mysqlcheck.test | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/mysql-test/t/mysqlcheck.test b/mysql-test/t/mysqlcheck.test index da00ea0c2bf..4d196cb86ad 100644 --- a/mysql-test/t/mysqlcheck.test +++ b/mysql-test/t/mysqlcheck.test @@ -82,7 +82,6 @@ create view v1 as select * from information_schema.routines; check table v1, information_schema.routines; drop view v1; - # # Bug#37527: mysqlcheck fails to report entire database # when frm file corruption @@ -90,20 +89,21 @@ drop view v1; CREATE TABLE t1(a INT); CREATE TABLE t2(a INT); # backup then null t1.frm ---copy_file $MYSQLTEST_VARDIR/master-data/test/t1.frm $MYSQLTEST_VARDIR/master-data/test/t1.frm.bak ---remove_file $MYSQLTEST_VARDIR/master-data/test/t1.frm ---write_file $MYSQLTEST_VARDIR/master-data/test/t1.frm +--copy_file $MYSQLD_DATADIR/test/t1.frm $MYSQLD_DATADIR/test/t1.frm.bak +--remove_file $MYSQLD_DATADIR/test/t1.frm +--write_file $MYSQLD_DATADIR/test/t1.frm EOF --exec $MYSQL_CHECK test # restore t1.frm ---remove_file $MYSQLTEST_VARDIR/master-data/test/t1.frm ---copy_file $MYSQLTEST_VARDIR/master-data/test/t1.frm.bak $MYSQLTEST_VARDIR/master-data/test/t1.frm ---remove_file $MYSQLTEST_VARDIR/master-data/test/t1.frm.bak +--remove_file $MYSQLD_DATADIR/test/t1.frm +--copy_file $MYSQLD_DATADIR/test/t1.frm.bak $MYSQLD_DATADIR/test/t1.frm +--remove_file $MYSQLD_DATADIR/test/t1.frm.bak DROP TABLE t1, t2; --echo End of 5.0 tests + # # Bug #30679: 5.1 name encoding not performed for views during upgrade # @@ -117,3 +117,6 @@ show tables; show tables; drop view v1, `v-1`; drop table t1; + + +--echo End of 5.1 tests |