bk commit into 5.1 tree (kent:1.2547)

[kent]

Below is the list of changes that have just been committed into a local
5.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@stripped, 2008-06-10 22:11:01+02:00, kent@stripped +2 -0
  configure.in:
    Changed version string to plain 6.2.15
  TCP_Transporter.cpp:
    Use NDB_SOCKLEN_T for portability

  configure.in@stripped, 2008-06-10 21:53:30+02:00, kent@stripped +1 -1
    Changed version string to plain 6.2.15

  storage/ndb/src/common/transporter/TCP_Transporter.cpp@stripped, 2008-06-10 21:53:04+02:00, kent@stripped +1 -1
    Use NDB_SOCKLEN_T for portability

diff -Nrup a/configure.in b/configure.in
--- a/configure.in	2008-03-17 12:15:50 +01:00
+++ b/configure.in	2008-06-10 21:53:30 +02:00
@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
 #
 # When changing major version number please also check switch statement
 # in mysqlbinlog::check_master_version().
-AM_INIT_AUTOMAKE(mysql, 5.1.23-ndb-6.2.15)
+AM_INIT_AUTOMAKE(mysql, 6.2.15)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 NDB_VERSION_MAJOR=6
diff -Nrup a/storage/ndb/src/common/transporter/TCP_Transporter.cpp b/storage/ndb/src/common/transporter/TCP_Transporter.cpp
--- a/storage/ndb/src/common/transporter/TCP_Transporter.cpp	2008-01-24 12:20:55 +01:00
+++ b/storage/ndb/src/common/transporter/TCP_Transporter.cpp	2008-06-10 21:53:04 +02:00
@@ -167,7 +167,7 @@ set_get(NDB_SOCKET_TYPE fd, int level, i
 	int val)
 {
   int actual = 0, defval = 0;
-  socklen_t len = sizeof(actual);
+  NDB_SOCKLEN_T len = sizeof(actual);
 
   getsockopt(fd, level, optval, (char*)&defval, &len);