diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-02-07 18:05:11 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-02-07 18:05:11 +0100 |
| commit | 39e8e248392573c7f3105267643c157d7bf9e66d (patch) | |
| tree | 8aeaa57ac4c3e51f99233e70a4e8b3b8c664329e | |
| parent | abf68e41ae1b7c594eaafe03a5794ada74257f86 (diff) | |
| parent | 41dffbb150a7f3080d66b394d2f244bd91ab8b90 (diff) | |
| download | mariadb-git-39e8e248392573c7f3105267643c157d7bf9e66d.tar.gz | |
Merge
mysql-test/include/have_ndb.inc:
Auto merged
mysql-test/mysql-test-run.sh:
merge
| -rw-r--r-- | mysql-test/include/have_ndb.inc | 1 | ||||
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 11 |
2 files changed, 8 insertions, 4 deletions
diff --git a/mysql-test/include/have_ndb.inc b/mysql-test/include/have_ndb.inc index d000a954733..28fcf18cb16 100644 --- a/mysql-test/include/have_ndb.inc +++ b/mysql-test/include/have_ndb.inc @@ -1,3 +1,4 @@ +--exec test x$NDB_STATUS_OK = x1 -- require r/have_ndb.require disable_query_log; show variables like "have_ndbcluster"; diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 7c9ef929703..f0c1d2ba1b5 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -703,6 +703,8 @@ export NDB_MGM export NDB_BACKUP_DIR export NDB_TOOLS_OUTPUT export PURIFYOPTIONS +NDB_STATUS_OK=1 +export NDB_STATUS_OK MYSQL_TEST_ARGS="--no-defaults --socket=$MASTER_MYSOCK --database=$DB \ --user=$DBUSER --password=$DBPASSWD --silent -v --skip-safemalloc \ @@ -1083,13 +1085,15 @@ start_ndbcluster() else NDBCLUSTER_EXTRA_OPTS="--small" fi - NDB_STARTED=1 - ./ndb/ndbcluster $NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --initial || NDB_STARTED=0 - if [ x$NDB_STARTED != x1 ] ; then + ./ndb/ndbcluster $NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --initial || NDB_STATUS_OK=0 + if [ x$NDB_STATUS_OK != x1 ] ; then if [ x$FORCE != x1 ] ; then exit 1 fi + USE_NDBCLUSTER= + return fi + NDB_CONNECTSTRING="host=localhost:$NDBCLUSTER_PORT" else NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER" @@ -1804,7 +1808,6 @@ then mysql_loadstd fi - $ECHO "Starting Tests" # Some test cases need USE_RUNNING_SERVER |