summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.sh
diff options
context:
space:
mode:
authorunknown <ram@gw.mysql.r18.ru>2003-09-24 16:46:19 +0500
committerunknown <ram@gw.mysql.r18.ru>2003-09-24 16:46:19 +0500
commit97933001fd9141944169aa22b279266100994397 (patch)
tree56edac662e34e39b11461bae3a9f007bd7df8e66 /mysql-test/mysql-test-run.sh
parent9e2b97fb25defd3478c0e27f9ac85702b24623bf (diff)
downloadmariadb-git-97933001fd9141944169aa22b279266100994397.tar.gz
Added MYSQL_BINLOG variable.
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
-rw-r--r--mysql-test/mysql-test-run.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index a2643e84d9f..e63c8866d5a 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -433,6 +433,11 @@ if [ x$SOURCE_DIST = x1 ] ; then
else
MYSQL_DUMP="$BASEDIR/client/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK"
fi
+ if [ -f "$BASEDIR/client/.libs/mysqlbinlog" ] ; then
+ MYSQL_BINLOG="$BASEDIR/client/.libs/mysqlbinlog"
+ else
+ MYSQL_BINLOG="$BASEDIR/client/mysqlbinlog"
+ fi
if [ -n "$STRACE_CLIENT" ]; then
MYSQL_TEST="strace -o $MYSQL_TEST_DIR/var/log/mysqltest.strace $MYSQL_TEST"
fi
@@ -455,6 +460,7 @@ else
fi
MYSQL_TEST="$BASEDIR/bin/mysqltest"
MYSQL_DUMP="$BASEDIR/bin/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK"
+ MYSQL_BINLOG="$BASEDIR/bin/mysqlbinlog"
MYSQLADMIN="$BASEDIR/bin/mysqladmin"
WAIT_PID="$BASEDIR/bin/mysql_waitpid"
MYSQL_MANAGER="$BASEDIR/bin/mysqlmanager"
@@ -473,6 +479,7 @@ else
fi
export MYSQL_DUMP
+export MYSQL_BINLOG
if [ -z "$MASTER_MYSQLD" ]
then