Commit 2d017ee8 authored by unknown's avatar unknown

make_binary_distribution.sh:

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


ndb/src/mgmsrv/Services.cpp:
  Dont print null address (back port from 5.0)
scripts/make_binary_distribution.sh:
  Corrected platform name output
parent 707a4b65
...@@ -918,7 +918,7 @@ printNodeStatus(OutputStream *output, ...@@ -918,7 +918,7 @@ printNodeStatus(OutputStream *output,
output->println("node.%d.dynamic_id: %d", nodeId, dynamicId); output->println("node.%d.dynamic_id: %d", nodeId, dynamicId);
output->println("node.%d.node_group: %d", nodeId, nodeGroup); output->println("node.%d.node_group: %d", nodeId, nodeGroup);
output->println("node.%d.connect_count: %d", nodeId, connectCount); 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 : "");
} }
} }
......
...@@ -293,10 +293,10 @@ if [ x$NDBCLUSTER = x1 ]; then ...@@ -293,10 +293,10 @@ if [ x$NDBCLUSTER = x1 ]; then
fi fi
# Change the distribution to a long descriptive name # 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 # Print the platform name for build logs
echo "PLATFORM NAME: $PLATFORM" echo "PLATFORM NAME: $platform"
BASE2=$TMP/$NEW_NAME BASE2=$TMP/$NEW_NAME
rm -rf $BASE2 rm -rf $BASE2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment