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/mysqlcheck.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/mysqlcheck.test')
| -rw-r--r-- | mysql-test/t/mysqlcheck.test | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/t/mysqlcheck.test b/mysql-test/t/mysqlcheck.test index ba13a315cb8..2d96d00772c 100644 --- a/mysql-test/t/mysqlcheck.test +++ b/mysql-test/t/mysqlcheck.test @@ -55,9 +55,10 @@ create table t_bug25347 (a int); create view v_bug25347 as select * from t_bug25347; insert into t_bug25347 values (1),(2),(3); flush tables; +let $MYSQLD_DATADIR= `select @@datadir`; --echo removing and creating ---remove_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI ---write_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI +--remove_file $MYSQLD_DATADIR/d_bug25347/t_bug25347.MYI +--write_file $MYSQLD_DATADIR/d_bug25347/t_bug25347.MYI EOF --exec $MYSQL_CHECK --repair --databases d_bug25347 --error 130 @@ -79,7 +80,8 @@ use test; create table t1(a int); create view v1 as select * from t1; show tables; ---copy_file $MYSQLTEST_VARDIR/master-data/test/v1.frm $MYSQLTEST_VARDIR/master-data/test/v-1.frm +let $MYSQLD_DATADIR= `select @@datadir`; +--copy_file $MYSQLD_DATADIR/test/v1.frm $MYSQLD_DATADIR/test/v-1.frm show tables; --exec $MYSQL_CHECK --check-upgrade --fix-table-names --databases test show tables; |