bk commit into 5.0 tree (msvensson:1.2510) 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-01 17:32:42+02:00, msvensson@pilot.(none) +3 -0
  Bug#28718 Running backup testcase fails in mysql testsuite
   - Skip test if the mysqld to test is not started from MYSQLTEST_VARDIR

  mysql-test/include/uses_vardir.inc@stripped, 2007-06-01 17:32:41+02:00, msvensson@pilot.(none) +6 -0
    New BitKeeper file ``mysql-test/include/uses_vardir.inc''

  mysql-test/include/uses_vardir.inc@stripped, 2007-06-01 17:32:41+02:00, msvensson@pilot.(none) +0 -0

  mysql-test/t/backup.test@stripped, 2007-06-01 17:32:41+02:00, msvensson@pilot.(none) +3 -0
    Skip test if the mysqld to test is not started from MYSQLTEST_VARDIR

  mysql-test/t/blackhole.test@stripped, 2007-06-01 17:32:41+02:00, msvensson@pilot.(none) +3 -0
    Skip test if the mysqld to test is not started from MYSQLTEST_VARDIR

# 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/bug28718/my50-bug28718

--- 1.10/mysql-test/t/blackhole.test	2007-05-10 15:14:02 +02:00
+++ 1.11/mysql-test/t/blackhole.test	2007-06-01 17:32:41 +02:00
@@ -5,6 +5,9 @@
 -- source include/not_embedded.inc
 -- source include/have_blackhole.inc
 
+# Check that the server was started in the MYSQLTEST_VARDIR
+source include/uses_vardir.inc;
+
 --disable_warnings
 drop table if exists t1,t2;
 --enable_warnings
--- New file ---
+++ mysql-test/include/uses_vardir.inc	07/06/01 17:32:41
let $datadir=
  query_get_value("SHOW VARIABLES LIKE 'datadir'", Value, 1);
if (`select LOCATE("$MYSQLTEST_VARDIR", "$datadir") != 1`)
{
  skip Need mysqld in MYSQLTEST_VARDIR;
}


--- 1.20/mysql-test/t/backup.test	2007-01-16 19:30:16 +01:00
+++ 1.21/mysql-test/t/backup.test	2007-06-01 17:32:41 +02:00
@@ -1,3 +1,6 @@
+# Check that the server was started in the MYSQLTEST_VARDIR
+source include/uses_vardir.inc;
+
 #
 # This test is a bit tricky as we can't use backup table to overwrite an old
 # table