diff options
| author | msvensson@pilot.mysql.com <> | 2008-04-03 21:40:10 +0200 |
|---|---|---|
| committer | msvensson@pilot.mysql.com <> | 2008-04-03 21:40:10 +0200 |
| commit | 95d9608d3ef3e1e827f94f99d693b71ca705212f (patch) | |
| tree | 76dd3a7c6efd70af4dfc8db28827b033dcd983df /mysql-test/t/drop.test | |
| parent | a011d27cf95ecf401385bdfff4950d1e28f6df84 (diff) | |
| download | mariadb-git-95d9608d3ef3e1e827f94f99d693b71ca705212f.tar.gz | |
Fix paths in test and result files
Diffstat (limited to 'mysql-test/t/drop.test')
| -rw-r--r-- | mysql-test/t/drop.test | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mysql-test/t/drop.test b/mysql-test/t/drop.test index ef8b59ff1fc..4f0777922b8 100644 --- a/mysql-test/t/drop.test +++ b/mysql-test/t/drop.test @@ -149,17 +149,18 @@ DROP DATABASE IF EXISTS mysql_test; CREATE DATABASE mysql_test; ---copy_file $MYSQLTEST_VARDIR/master-data/mysql/proc.frm $MYSQLTEST_VARDIR/tmp/bug29958.proc.frm ---copy_file $MYSQLTEST_VARDIR/master-data/mysql/proc.MYD $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYD ---copy_file $MYSQLTEST_VARDIR/master-data/mysql/proc.MYI $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYI +let $MYSQLD_DATADIR= `select @@datadir`; +--copy_file $MYSQLD_DATADIR/mysql/proc.frm $MYSQLTEST_VARDIR/tmp/bug29958.proc.frm +--copy_file $MYSQLD_DATADIR/mysql/proc.MYD $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYD +--copy_file $MYSQLD_DATADIR/mysql/proc.MYI $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYI DROP TABLE mysql.proc; DROP DATABASE mysql_test; ---copy_file $MYSQLTEST_VARDIR/tmp/bug29958.proc.frm $MYSQLTEST_VARDIR/master-data/mysql/proc.frm ---copy_file $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYD $MYSQLTEST_VARDIR/master-data/mysql/proc.MYD ---copy_file $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYI $MYSQLTEST_VARDIR/master-data/mysql/proc.MYI +--copy_file $MYSQLTEST_VARDIR/tmp/bug29958.proc.frm $MYSQLD_DATADIR/mysql/proc.frm +--copy_file $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYD $MYSQLD_DATADIR/mysql/proc.MYD +--copy_file $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYI $MYSQLD_DATADIR/mysql/proc.MYI --echo --echo # -- |