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/myisampack.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/myisampack.test')
| -rw-r--r-- | mysql-test/t/myisampack.test | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/t/myisampack.test b/mysql-test/t/myisampack.test index 6598af6318a..89bd8b02bd1 100644 --- a/mysql-test/t/myisampack.test +++ b/mysql-test/t/myisampack.test @@ -26,8 +26,9 @@ INSERT INTO t1 VALUES (2.22402118719591e-05,2.37546284320705e-05,2.58463051055541e-05,1.83391609130854e-05,1.6300720519646e-05,1.74559091886791e-05,1.63733785575587e-05,2.26616253279828e-05,1.79541237435621e-05,45), (3.01092775359837e-05,3.23865212934412e-05,4.09444584045994e-05,0,2.15470966302776e-05,2.39082636344032e-05,2.28296706429177e-05,2.9007671511595e-05,2.44201138973326e-05,46); FLUSH TABLES; ---exec $MYISAMPACK -s $MYSQLTEST_VARDIR/master-data/test/t1 ---exec $MYISAMCHK -srq $MYSQLTEST_VARDIR/master-data/test/t1 ---exec $MYISAMCHK -s --unpack $MYSQLTEST_VARDIR/master-data/test/t1 +let $MYSQLD_DATADIR= `select @@datadir`; +--exec $MYISAMPACK -s $MYSQLD_DATADIR/test/t1 +--exec $MYISAMCHK -srq $MYSQLD_DATADIR/test/t1 +--exec $MYISAMCHK -s --unpack $MYSQLD_DATADIR/test/t1 CHECK TABLE t1 EXTENDED; DROP TABLE t1; |