bk commit into 4.1 tree (kent:1.2479)

[kent]

Below is the list of changes that have just been committed into a local
4.1 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2479 05/10/07 01:56:11 kent@stripped +2 -0
  make_binary_distribution.sh:
    Corrected platform name output
  Services.cpp:
    Dont print null address (back port from 5.0)

  scripts/make_binary_distribution.sh
    1.83 05/10/07 01:55:07 kent@stripped +2 -2
    Corrected platform name output

  ndb/src/mgmsrv/Services.cpp
    1.39 05/10/07 01:37:57 kent@stripped +1 -1
    Dont print null address (back port from 5.0)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-554072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-4.1

--- 1.82/scripts/make_binary_distribution.sh	2005-10-06 22:50:46 +02:00
+++ 1.83/scripts/make_binary_distribution.sh	2005-10-07 01:55:07 +02:00
@@ -293,10 +293,10 @@
 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

--- 1.38/ndb/src/mgmsrv/Services.cpp	2005-09-21 16:41:44 +02:00
+++ 1.39/ndb/src/mgmsrv/Services.cpp	2005-10-07 01:37:57 +02:00
@@ -918,7 +918,7 @@
     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 : "");
   }
 
 }