bk commit into 5.1 tree (pekka:1.2164)

[pekka]

Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka 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.2164 06/02/25 17:25:22 pekka@stripped +2 -0
  ndb - sockaddr alignment fix, found on sunfire100a, can affect any non-x86

  storage/ndb/src/mgmsrv/Services.cpp
    1.60 06/02/25 17:23:32 pekka@stripped +3 -3
    use sockaddr_in in declarations to guarantee sin_addr alignment

  storage/ndb/src/common/transporter/Transporter.cpp
    1.22 06/02/25 17:23:32 pekka@stripped +6 -6
    use sockaddr_in in declarations to guarantee sin_addr alignment

# 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:	pekka
# Host:	orca.ndb.mysql.com
# Root:	/space/pekka/ndb/version/my51-rel

--- 1.21/storage/ndb/src/common/transporter/Transporter.cpp	2005-07-19 20:40:16 +02:00
+++ 1.22/storage/ndb/src/common/transporter/Transporter.cpp	2006-02-25 17:23:32 +01:00
@@ -105,10 +105,10 @@
   }
   
   {
-    struct sockaddr addr;
+    struct sockaddr_in addr;
     SOCKET_SIZE_TYPE addrlen= sizeof(addr);
-    int r= getpeername(sockfd, &addr, &addrlen);
-    m_connect_address= ((struct sockaddr_in *)&addr)->sin_addr;
+    int r= getpeername(sockfd, (struct sockaddr*)&addr, &addrlen);
+    m_connect_address= (&addr)->sin_addr;
   }
 
   bool res = connect_server_impl(sockfd);
@@ -198,10 +198,10 @@
   }
 
   {
-    struct sockaddr addr;
+    struct sockaddr_in addr;
     SOCKET_SIZE_TYPE addrlen= sizeof(addr);
-    int r= getpeername(sockfd, &addr, &addrlen);
-    m_connect_address= ((struct sockaddr_in *)&addr)->sin_addr;
+    int r= getpeername(sockfd, (struct sockaddr*)&addr, &addrlen);
+    m_connect_address= (&addr)->sin_addr;
   }
 
   bool res = connect_client_impl(sockfd);

--- 1.59/storage/ndb/src/mgmsrv/Services.cpp	2006-02-13 14:20:25 +01:00
+++ 1.60/storage/ndb/src/mgmsrv/Services.cpp	2006-02-25 17:23:32 +01:00
@@ -451,9 +451,9 @@
     return;
   }
 
-  struct sockaddr addr;
+  struct sockaddr_in addr;
   SOCKET_SIZE_TYPE addrlen= sizeof(addr);
-  int r = getpeername(m_socket, &addr, &addrlen);
+  int r = getpeername(m_socket, (struct sockaddr*)&addr, &addrlen);
   if (r != 0 ) {
     m_output->println(cmd);
     m_output->println("result: getpeername(%d) failed, err= %d", m_socket, r);
@@ -465,7 +465,7 @@
   if(tmp == 0 || !m_allocated_resources->is_reserved(tmp)){
     BaseString error_string;
     if (!m_mgmsrv.alloc_node_id(&tmp, (enum ndb_mgm_node_type)nodetype, 
-				&addr, &addrlen, error_string)){
+				(struct sockaddr*)&addr, &addrlen, error_string)){
       const char *alias;
       const char *str;
       alias= ndb_mgm_get_node_type_alias_string((enum ndb_mgm_node_type)