diff options
| author | unknown <msvensson@pilot.mysql.com> | 2008-04-03 21:40:10 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2008-04-03 21:40:10 +0200 |
| commit | 7674605d7940b428a8bbfe23fd0ef497e99c60c1 (patch) | |
| tree | 76dd3a7c6efd70af4dfc8db28827b033dcd983df /mysql-test/t/drop.test | |
| parent | 3ad402570dcc61e01979db294938123ea9eb4c46 (diff) | |
| download | mariadb-git-7674605d7940b428a8bbfe23fd0ef497e99c60c1.tar.gz | |
Fix paths in test and result files
mysql-test/r/loaddata.result:
Update paths in result
mysql-test/r/myisam.result:
Update paths in result
mysql-test/r/partition_not_windows.result:
Update paths in result
mysql-test/r/symlink.result:
Update paths in result
mysql-test/suite/binlog/r/binlog_index.result:
Update paths in result
mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test:
Update paths
mysql-test/suite/binlog/t/binlog_index.test:
Update paths
mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test:
Fix merge error s/start-position/stop-position/
mysql-test/t/drop.test:
Update paths
mysql-test/t/loaddata.test:
Update paths
mysql-test/t/myisam.test:
Update paths
mysql-test/t/partition_not_windows.test:
Update paths
mysql-test/t/symlink.test:
Update paths
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 # -- |