mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
make_binary_distribution.sh:
Corrected platform name output Services.cpp: Dont print null address (back port from 5.0)
This commit is contained in:
@ -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
|
|||||||
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
|
||||||
|
Reference in New Issue
Block a user