Commit c98fa031 authored by unknown's avatar unknown

mysql-test-run.sh:

  Use different TESTS_BINDIR for --embedded-server


mysql-test/mysql-test-run.sh:
  Use different TESTS_BINDIR for --embedded-server
parent 034b1086
...@@ -490,6 +490,7 @@ if [ x$SOURCE_DIST = x1 ] ; then ...@@ -490,6 +490,7 @@ if [ x$SOURCE_DIST = x1 ] ; then
echo "Fatal error: Cannot find embedded server 'mysqltest'" 1>&2 echo "Fatal error: Cannot find embedded server 'mysqltest'" 1>&2
exit 1 exit 1
fi fi
TESTS_BINDIR="$BASEDIR/libmysqld/examples"
else else
MYSQLD="$VALGRIND $BASEDIR/sql/mysqld" MYSQLD="$VALGRIND $BASEDIR/sql/mysqld"
if [ -f "$BASEDIR/client/.libs/lt-mysqltest" ] ; then if [ -f "$BASEDIR/client/.libs/lt-mysqltest" ] ; then
...@@ -499,6 +500,7 @@ if [ x$SOURCE_DIST = x1 ] ; then ...@@ -499,6 +500,7 @@ if [ x$SOURCE_DIST = x1 ] ; then
else else
MYSQL_TEST="$BASEDIR/client/mysqltest" MYSQL_TEST="$BASEDIR/client/mysqltest"
fi fi
TESTS_BINDIR="$BASEDIR/tests"
fi fi
if [ -f "$BASEDIR/client/.libs/mysqldump" ] ; then if [ -f "$BASEDIR/client/.libs/mysqldump" ] ; then
MYSQL_DUMP="$BASEDIR/client/.libs/mysqldump" MYSQL_DUMP="$BASEDIR/client/.libs/mysqldump"
...@@ -515,7 +517,6 @@ if [ x$SOURCE_DIST = x1 ] ; then ...@@ -515,7 +517,6 @@ if [ x$SOURCE_DIST = x1 ] ; then
fi fi
CLIENT_BINDIR="$BASEDIR/client" CLIENT_BINDIR="$BASEDIR/client"
TESTS_BINDIR="$BASEDIR/tests"
MYSQLADMIN="$CLIENT_BINDIR/mysqladmin" MYSQLADMIN="$CLIENT_BINDIR/mysqladmin"
WAIT_PID="$BASEDIR/extra/mysql_waitpid" WAIT_PID="$BASEDIR/extra/mysql_waitpid"
MYSQL_MANAGER_CLIENT="$CLIENT_BINDIR/mysqlmanagerc" MYSQL_MANAGER_CLIENT="$CLIENT_BINDIR/mysqlmanagerc"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment