Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/backup.test:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged

1 files changed, 15 insertions, 0 deletions

diff --git a/mysql-test/include/uses_vardir.inc b/mysql-test/include/uses_vardir.inc
new file mode 100644
index 00000000000..a5095c3e139
--- /dev/null
+++ b/mysql-test/include/uses_vardir.inc
@@ -0,0 +1,15 @@
+#
+# Some tests uses LOAD DATA with a relative path
+# and need to see for example ../std_data
+#
+# Also if an absolute path was used, the server might be started
+# with --secure-file-priv and wouldn't be allowed to LOAD a file
+# outside of it's vardir anyway
+#
+
+let $datadir=
+  query_get_value("SHOW VARIABLES LIKE 'datadir'", Value, 1);
+if (`select LOCATE("$MYSQLTEST_VARDIR", "$datadir") != 1`)
+{
+  skip Need mysqld in MYSQLTEST_VARDIR;
+}