Commit 220edcf5 authored by unknown's avatar unknown
Browse files

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 cfe017a3

mysql-test/mysql-test-run.sh

+2 −1
Original line number Diff line number Diff line
@@ -490,6 +490,7 @@ if [ x$SOURCE_DIST = x1 ] ; then 
     echo "Fatal error: Cannot find embedded server 'mysqltest'" 1>&2

     exit 1

   fi

   TESTS_BINDIR="$BASEDIR/libmysqld/examples"

 else

   MYSQLD="$VALGRIND $BASEDIR/sql/mysqld"

   if [ -f "$BASEDIR/client/.libs/lt-mysqltest" ] ; then
@@ -499,6 +500,7 @@ if [ x$SOURCE_DIST = x1 ] ; then 
   else

     MYSQL_TEST="$BASEDIR/client/mysqltest"

   fi

   TESTS_BINDIR="$BASEDIR/tests"

 fi

 if [ -f "$BASEDIR/client/.libs/mysqldump" ] ; then

   MYSQL_DUMP="$BASEDIR/client/.libs/mysqldump"
@@ -515,7 +517,6 @@ if [ x$SOURCE_DIST = x1 ] ; then 
 fi



 CLIENT_BINDIR="$BASEDIR/client"

 TESTS_BINDIR="$BASEDIR/tests"

 MYSQLADMIN="$CLIENT_BINDIR/mysqladmin"

 WAIT_PID="$BASEDIR/extra/mysql_waitpid"

 MYSQL_MANAGER_CLIENT="$CLIENT_BINDIR/mysqlmanagerc"