bk commit into 5.0 tree (msvensson:1.2526) BUG#28718

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-07 23:18:19+02:00, msvensson@pilot.(none) +1 -0
  Bug#28718 Running backup testcase fails in mysql testsuite of MySQL-enterprise-5.0.40
   - Fix test to work on OS where backslashes are forward

  mysql-test/include/uses_vardir.inc@stripped, 2007-06-07 23:18:18+02:00, msvensson@pilot.(none) +2 -3
    Make the test work on windows too

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.(none)
# Root:	/data/msvensson/mysql/mysql-5.0-maint

--- 1.1/mysql-test/include/uses_vardir.inc	2007-06-07 14:25:16 +02:00
+++ 1.2/mysql-test/include/uses_vardir.inc	2007-06-07 23:18:18 +02:00
@@ -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;
 }