Commit f1fa487f authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0
parents f7893fcc fb95d742

mysql-test/mysql-test-run.sh

+7 −1
Original line number Diff line number Diff line
@@ -973,7 +973,13 @@ start_ndbcluster() 
    else

      NDBCLUSTER_EXTRA_OPTS="--small"

    fi

    ./ndb/ndbcluster $NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --initial || exit 1

    NDB_STARTED=1

    ./ndb/ndbcluster $NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --initial || NDB_STARTED=0

    if [ x$NDB_STARTED != x1 ] ; then

      if [ x$FORCE != x1 ] ; then

        exit 1

      fi

    fi

    NDB_CONNECTSTRING="host=localhost:$NDBCLUSTER_PORT"

  else

    NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER"

ndb/src/mgmapi/mgmapi.cpp

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply, 
    ndbout << "Error in mgm protocol parser. "

	   << "cmd: '" << cmd

	   << "' status=" << (Uint32)ctx.m_status

	   << ", curr=" << (Uint32)ctx.m_currentToken

	   << ", curr=" << ctx.m_currentToken

	   << endl;

    DBUG_PRINT("info",("parser.parse returned NULL"));

  }