summaryrefslogtreecommitdiff
path: root/mysql-test/t/repair.test
diff options
context:
space:
mode:
authorChad MILLER <chad@mysql.com>2009-02-10 10:07:54 -0500
committerChad MILLER <chad@mysql.com>2009-02-10 10:07:54 -0500
commit52db1b81535add86f3163745b91985c9feab0ece (patch)
treea67460caf38416ff560e0c9d877ad73b54d378c0 /mysql-test/t/repair.test
parent0d2fecc9779c71bb9b2e214efad369a6f07f69c6 (diff)
parent29f898bb64349f46bde6c61badaf47bccd1183c1 (diff)
downloadmariadb-git-52db1b81535add86f3163745b91985c9feab0ece.tar.gz
Merge from bugteam team tree.
Diffstat (limited to 'mysql-test/t/repair.test')
-rw-r--r--mysql-test/t/repair.test10
1 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/t/repair.test b/mysql-test/t/repair.test
index 94a9fda6757..eb2ca7992a6 100644
--- a/mysql-test/t/repair.test
+++ b/mysql-test/t/repair.test
@@ -29,7 +29,8 @@ repair table t1 use_frm;
create table t1 engine=myisam SELECT 1,"table 1";
flush tables;
-system echo 1 > $MYSQLTEST_VARDIR/master-data/test/t1.MYI ;
+let $MYSQLD_DATADIR= `select @@datadir`;
+system echo 1 > $MYSQLD_DATADIR/test/t1.MYI ;
repair table t1;
repair table t1 use_frm;
drop table t1;
@@ -119,9 +120,10 @@ DROP TABLE t1;
#
--echo # Test with a saved table from 4.1
---copy_file std_data/bug36055.frm $MYSQLTEST_VARDIR/master-data/test/t1.frm
---copy_file std_data/bug36055.MYD $MYSQLTEST_VARDIR/master-data/test/t1.MYD
---copy_file std_data/bug36055.MYI $MYSQLTEST_VARDIR/master-data/test/t1.MYI
+let $MYSQLD_DATADIR= `select @@datadir`;
+--copy_file std_data/bug36055.frm $MYSQLD_DATADIR/test/t1.frm
+--copy_file std_data/bug36055.MYD $MYSQLD_DATADIR/test/t1.MYD
+--copy_file std_data/bug36055.MYI $MYSQLD_DATADIR/test/t1.MYI
--replace_column 12 # 13 #
SHOW TABLE STATUS LIKE 't1';