Commit ae62a588 authored by kent@mysql.com's avatar kent@mysql.com
Browse files

make_binary_distribution.sh: 

  Corrected platform name output
Services.cpp:
  Dont print null address (back port from 5.0)
parent 87016b43

ndb/src/mgmsrv/Services.cpp

+1 −1
Original line number Diff line number Diff line
@@ -918,7 +918,7 @@ printNodeStatus(OutputStream *output, 
    output->println("node.%d.dynamic_id: %d", nodeId, dynamicId);

    output->println("node.%d.node_group: %d", nodeId, nodeGroup);

    output->println("node.%d.connect_count: %d", nodeId, connectCount);

    output->println("node.%d.address: %s", nodeId, address);

    output->println("node.%d.address: %s", nodeId, address ? address : "");

  }



}

scripts/make_binary_distribution.sh

+2 −2
Original line number Diff line number Diff line
@@ -293,10 +293,10 @@ if [ x$NDBCLUSTER = x1 ]; then 
fi



# Change the distribution to a long descriptive name

NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-$version-$PLATFORM$SUFFIX

NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-$version-$platform$SUFFIX



# Print the platform name for build logs

echo "PLATFORM NAME: $PLATFORM"

echo "PLATFORM NAME: $platform"



BASE2=$TMP/$NEW_NAME

rm -rf $BASE2