summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.sh
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-08-06 16:47:48 -0600
committerunknown <sasha@mysql.sashanet.com>2001-08-06 16:47:48 -0600
commit4bb40187438bdfb8b1d8b091399bd01e0e3425c1 (patch)
tree3899db9196d895b67af082ace2454b1268b01d70 /mysql-test/mysql-test-run.sh
parentad5100da0f7041cf7a0dbf3cf2860c0f82fc4c7a (diff)
downloadmariadb-git-4bb40187438bdfb8b1d8b091399bd01e0e3425c1.tar.gz
misc bug fixes
libmysqld/Makefile.am: sql_unions -> sql_union BitKeeper/etc/ignore: Added libmysqld/sql_union.cc to the ignore list mysql-test/mysql-test-run.sh: fix to get path-independent logging mysql-test/r/rpl_log.result: fix for path-independent logging sql/log.cc: fixed compile error with USING_TRANSACTIONS sql/log_event.h: fixed compile error with USING_TRANSACTIONS
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
-rw-r--r--mysql-test/mysql-test-run.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index a3c15236254..4dad16b1e2a 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -109,6 +109,7 @@ USERT=0
SYST=0
REALT=0
MYSQL_TMP_DIR=$MYSQL_TEST_DIR/var/tmp
+SLAVE_LOAD_TMPDIR=../../var/tmp #needs to be same length to test logging
RES_SPACE=" "
MYSQLD_SRC_DIRS="strings mysys include extra regex isam merge myisam \
myisammrg heap sql"
@@ -570,6 +571,7 @@ start_slave()
--tmpdir=$MYSQL_TMP_DIR \
--language=$LANGUAGE \
--skip-innodb --skip-slave-start \
+ --slave-load-tmpdir=$SLAVE_LOAD_TMPDIR \
--report-host=127.0.0.1 --report-user=root \
--report-port=$SLAVE_MYPORT \
$SMALL_SERVER \