database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge

Browse Source 
mysql-test/include/have_ndb.inc:
  Auto merged
mysql-test/mysql-test-run.sh:
  merge
This commit is contained in:
unknown
2005-02-07 18:05:11 +01:00
parent abf68e41ae 41dffbb150
commit 39e8e24839
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/include/have_ndb.inc
View File

@ -1,3 +1,4 @@
--exec test x$NDB_STATUS_OK = x1
-- require r/have_ndb.require -- require r/have_ndb.require
disable_query_log; disable_query_log;
show variables like "have_ndbcluster"; show variables like "have_ndbcluster";

11
mysql-test/mysql-test-run.sh
View File

@ -703,6 +703,8 @@ export NDB_MGM
export NDB_BACKUP_DIR export NDB_BACKUP_DIR
export NDB_TOOLS_OUTPUT export NDB_TOOLS_OUTPUT
export PURIFYOPTIONS export PURIFYOPTIONS
NDB_STATUS_OK=1
export NDB_STATUS_OK
MYSQL_TEST_ARGS="--no-defaults --socket=$MASTER_MYSOCK --database=$DB \ MYSQL_TEST_ARGS="--no-defaults --socket=$MASTER_MYSOCK --database=$DB \
--user=$DBUSER --password=$DBPASSWD --silent -v --skip-safemalloc \ --user=$DBUSER --password=$DBPASSWD --silent -v --skip-safemalloc \
@ -1083,13 +1085,15 @@ start_ndbcluster()
else else
NDBCLUSTER_EXTRA_OPTS="--small" NDBCLUSTER_EXTRA_OPTS="--small"
fi fi
NDB_STARTED=1 ./ndb/ndbcluster $NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --initial || NDB_STATUS_OK=0
./ndb/ndbcluster $NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --initial || NDB_STARTED=0 if [ x$NDB_STATUS_OK != x1 ] ; then
if [ x$NDB_STARTED != x1 ] ; then
if [ x$FORCE != x1 ] ; then if [ x$FORCE != x1 ] ; then
exit 1 exit 1
fi fi
USE_NDBCLUSTER=
return
fi fi
NDB_CONNECTSTRING="host=localhost:$NDBCLUSTER_PORT" NDB_CONNECTSTRING="host=localhost:$NDBCLUSTER_PORT"
else else
NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER" NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER"
@ -1804,7 +1808,6 @@ then
mysql_loadstd mysql_loadstd
fi fi
$ECHO "Starting Tests" $ECHO "Starting Tests"
# Some test cases need USE_RUNNING_SERVER # Some test cases need USE_RUNNING_SERVER