diff options
| author | unknown <msvensson@pilot.(none)> | 2007-06-08 07:21:36 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-06-08 07:21:36 +0200 |
| commit | e4d2a0c5cd39c57887a8439c3f2c5e044e67e246 (patch) | |
| tree | ed2941c76d176a3f3de516569f13ec2e8431a1b1 /mysql-test/include | |
| parent | 055a0b85b62a0739dfb75f16b0b514594e2dece1 (diff) | |
| parent | 44626a6de8d1d7d907ade133c7f9481376134621 (diff) | |
| download | mariadb-git-e4d2a0c5cd39c57887a8439c3f2c5e044e67e246.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/extra/binlog_tests/binlog.test:
Merge 5.0->5.1
mysql-test/r/binlog_stm_binlog.result:
Merge 5.0->5.1
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/uses_vardir.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/include/uses_vardir.inc b/mysql-test/include/uses_vardir.inc index a5095c3e139..950de698a43 100644 --- a/mysql-test/include/uses_vardir.inc +++ b/mysql-test/include/uses_vardir.inc @@ -7,9 +7,8 @@ # outside of it's vardir anyway # -let $datadir= - query_get_value("SHOW VARIABLES LIKE 'datadir'", Value, 1); -if (`select LOCATE("$MYSQLTEST_VARDIR", "$datadir") != 1`) + +if (`select LOCATE('$MYSQLTEST_VARDIR', REPLACE(@@datadir, '\\\\', '/')) != 1`) { skip Need mysqld in MYSQLTEST_VARDIR; } |