diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-02-12 15:08:56 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-02-12 15:08:56 +0100 |
| commit | 3cf3f9720e641dea71171e915b0057864ddd8f3b (patch) | |
| tree | 73476f970c229f75846855edeeddfbc6fd87ed4b /mysql-test/t/myisam.test | |
| parent | 3550ecb5ccb9b2dbfa012eef445a0de5fc36e40f (diff) | |
| parent | e7dfc37dd0c20238bead920a37586a1c01c0bf40 (diff) | |
| download | mariadb-git-3cf3f9720e641dea71171e915b0057864ddd8f3b.tar.gz | |
merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.
There were so many changes into mtr (this is the new mtr coming) that I rather
copied mtr from 6.0-main here (at least this one knows how to run Maria tests).
I also fixed suite/maria tests to be accepted by the new mtr.
mysys/thr_mutex.c:
adding DBUG_PRINT here, so that we can locate where the warning is issued.
Diffstat (limited to 'mysql-test/t/myisam.test')
| -rw-r--r-- | mysql-test/t/myisam.test | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test index 76d37fdc734..b5099695e47 100644 --- a/mysql-test/t/myisam.test +++ b/mysql-test/t/myisam.test @@ -1473,8 +1473,9 @@ CREATE TABLE t1 ( KEY (c1), KEY (c2) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0; ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR ---exec $MYISAMCHK -d $MYSQLTEST_VARDIR/master-data/test/t1 +let $MYSQLD_DATADIR= `select @@datadir`; +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR +--exec $MYISAMCHK -d $MYSQLD_DATADIR/test/t1 DROP TABLE t1; # Test warnings with transactional=1 with MyISAM |