From d7d9a12a80eeec2583c54a7d9609f409b1e91bad Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Tue, 31 Jan 2006 09:38:40 +0100
Subject: Bug #16919 some tests fail in 5.0  - Use "../tmp" as
 --slave-load-tmpdir. Same as in mysql-test-run.pl

mysql-test/mysql-test-run.sh:
  Use same --slave-load-tmpdir as in mysql-test-run.pl
---
 mysql-test/mysql-test-run.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'mysql-test/mysql-test-run.sh')

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 47253fec572..21eeb65943d 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -202,7 +202,14 @@ SYST=0
 REALT=0
 FAST_START=""
 MYSQL_TMP_DIR=$MYSQL_TEST_DIR/var/tmp
-SLAVE_LOAD_TMPDIR=../../var/tmp #needs to be same length to test logging
+
+# Use a relative path for where the slave will find the dumps
+# generated by "LOAD DATA" on the master. The path is relative
+# since it must have fixed length to test logging
+# i.e otherwise the output from "SHOW MASTER STATUS" will vary
+# with the strlen() of MYSQL_TEST_DIR
+SLAVE_LOAD_TMPDIR=../tmp
+
 RES_SPACE="      "
 MYSQLD_SRC_DIRS="strings mysys include extra regex myisam \
  myisammrg heap sql"
-- 
cgit v1.2.1


From 107ad3a03e2b76da117bc05624e807d9936fe73f Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Tue, 31 Jan 2006 10:48:40 +0100
Subject: Check std_data_ln already created Add / to std_data in ln command

mysql-test/mysql-test-run.sh:
  Check if std_data_ln is already created
  Add / to std_data to create a symlink to a dir an not a file.
---
 mysql-test/mysql-test-run.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'mysql-test/mysql-test-run.sh')

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 21eeb65943d..ac5457beaa6 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -608,8 +608,10 @@ fi
 [ -d $MYSQL_TEST_DIR/var/tmp ] || mkdir $MYSQL_TEST_DIR/var/tmp
 [ -d $MYSQL_TEST_DIR/var/run ] || mkdir $MYSQL_TEST_DIR/var/run
 [ -d $MYSQL_TEST_DIR/var/log ] || mkdir $MYSQL_TEST_DIR/var/log
-ln -s $MYSQL_TEST_DIR/std_data $MYSQL_TEST_DIR/var/std_data_ln
- 
+if ! test -L $MYSQL_TEST_DIR/var/std_data_ln ; then
+  ln -s $MYSQL_TEST_DIR/std_data/ $MYSQL_TEST_DIR/var/std_data_ln
+fi
+
 if test ${COLUMNS:-0} -lt 80 ; then COLUMNS=80 ; fi
 E=`$EXPR $COLUMNS - 8`
 DASH72=`$ECHO '-------------------------------------------------------'|$CUT -c 1-$E`
-- 
cgit v1.2.1