diff options
| author | unknown <msvensson@pilot.mysql.com> | 2008-02-28 18:55:46 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2008-02-28 18:55:46 +0100 |
| commit | 5435b66b9141bc095d071ba536b83c6b9ca081ec (patch) | |
| tree | ae72ed95bb9cb615544eae4769fe85a7d84440c3 /mysql-test/t/drop.test | |
| parent | 3320c165cf0c58938a5dd4ac6235b7d48030fc6c (diff) | |
| download | mariadb-git-5435b66b9141bc095d071ba536b83c6b9ca081ec.tar.gz | |
Fix after merge
mysql-test/extra/rpl_tests/rpl_charset.test:
Fix merge error
mysql-test/lib/mtr_report.pm:
Move the . out of [] to avoid log file parsing errors
mysql-test/mysql-test-run.pl:
Correct spelling of option
sql/ha_ndbcluster_binlog.cc:
Fix merge error(used "Use remote")
Diffstat (limited to 'mysql-test/t/drop.test')
| -rw-r--r-- | mysql-test/t/drop.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/t/drop.test b/mysql-test/t/drop.test index a79044436eb..2bd37f9ad0d 100644 --- a/mysql-test/t/drop.test +++ b/mysql-test/t/drop.test @@ -131,7 +131,8 @@ create table mysql_test.t1(f1 int); create table mysql_test.`#sql-347f_7` (f1 int); create table mysql_test.`#sql-347f_8` (f1 int); drop table mysql_test.`#sql-347f_8`; -copy_file $MYSQLTEST_VARDIR/master-data/mysql_test/t1.frm $MYSQLTEST_VARDIR/master-data/mysql_test/#sql-347f_6.frm; +let $MYSQLD_DATADIR= `select @@datadir`; +copy_file $MYSQLD_DATADIR/mysql_test/t1.frm $MYSQLD_DATADIR/mysql_test/#sql-347f_6.frm; drop database mysql_test; --echo End of 5.1 tests |