From 47559994b14d52e20c53b669875887363c33903d Mon Sep 17 00:00:00 2001
From: unknown <msvensson@pilot.(none)>
Date: Thu, 7 Jun 2007 14:25:17 +0200
Subject: Bug#28718 Running backup testcase fails in mysql testsuite  - Skip
 test if the mysqld to test is not started from MYSQLTEST_VARDIR

mysql-test/t/backup.test:
  Skip test if the mysqld to test is not started from MYSQLTEST_VARDIR
mysql-test/t/blackhole.test:
  Skip test if the mysqld to test is not started from MYSQLTEST_VARDIR
mysql-test/include/uses_vardir.inc:
  New BitKeeper file ``mysql-test/include/uses_vardir.inc''
---
 mysql-test/t/backup.test    | 5 +++++
 mysql-test/t/blackhole.test | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'mysql-test/t')

diff --git a/mysql-test/t/backup.test b/mysql-test/t/backup.test
index a3339ecce69..6ff4144aaf2 100644
--- a/mysql-test/t/backup.test
+++ b/mysql-test/t/backup.test
@@ -1,3 +1,8 @@
+
+# The server need to be started in $MYSQLTEST_VARDIR since it
+# uses ../std_data_ln/
+-- source include/uses_vardir.inc
+
 #
 # This test is a bit tricky as we can't use backup table to overwrite an old
 # table
diff --git a/mysql-test/t/blackhole.test b/mysql-test/t/blackhole.test
index 51cc663d6bc..0abe5ae063a 100644
--- a/mysql-test/t/blackhole.test
+++ b/mysql-test/t/blackhole.test
@@ -5,6 +5,10 @@
 -- source include/not_embedded.inc
 -- source include/have_blackhole.inc
 
+# The server need to be started in $MYSQLTEST_VARDIR since it
+# uses ../std_data_ln/
+-- source include/uses_vardir.inc
+
 --disable_warnings
 drop table if exists t1,t2;
 --enable_warnings
@@ -109,7 +113,7 @@ insert into t1 values(1);
 insert ignore into t1 values(1);
 replace into t1 values(100);
 create table t2 (a varchar(200)) engine=blackhole;
-load data infile '../std_data_ln/words.dat' into table t2;
+eval load data infile '../std_data_ln/words.dat' into table t2;
 alter table t1 add b int;
 alter table t1 drop b;
 create table t3 like t1;
-- 
cgit v1.2.1