Commit 343e9bbd authored by unknown's avatar unknown
Browse files

mysql-test-run.sh: 

  backported access to ndb_mgm from 5.0


mysql-test/mysql-test-run.sh:
  backported access to ndb_mgm from 5.0
parent 2f196ec7

mysql-test/mysql-test-run.sh

+3 −0
Original line number Diff line number Diff line
@@ -537,6 +537,7 @@ if [ x$SOURCE_DIST = x1 ] ; then 
 INSTALL_DB="./install_test_db"

 MYSQL_FIX_SYSTEM_TABLES="$BASEDIR/scripts/mysql_fix_privilege_tables"

 NDB_TOOLS_DIR="$BASEDIR/ndb/tools"

 NDB_MGM="$BASEDIR/ndb/src/mgmclient/ndb_mgm"

else

 if test -x "$BASEDIR/libexec/mysqld"

 then
@@ -558,6 +559,7 @@ else 
 INSTALL_DB="./install_test_db --bin"

 MYSQL_FIX_SYSTEM_TABLES="$CLIENT_BINDIR/mysql_fix_privilege_tables"

 NDB_TOOLS_DIR="$CLIENT_BINDIR"

 NDB_MGM="$CLIENT_BINDIR/ndb_mgm"

 if test -d "$BASEDIR/share/mysql/english"

 then

   LANGUAGE="$BASEDIR/share/mysql/english/"
@@ -607,6 +609,7 @@ MYSQL="$MYSQL --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --u 
export MYSQL MYSQL_DUMP MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES

export CLIENT_BINDIR TESTS_BINDIR CHARSETSDIR

export NDB_TOOLS_DIR

export NDB_MGM



MYSQL_TEST_ARGS="--no-defaults --socket=$MASTER_MYSOCK --database=$DB \

 --user=$DBUSER --password=$DBPASSWD --silent -v --skip-safemalloc \