Commit e72f4653 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 

into  perch.ndb.mysql.com:/home/jonas/src/41-jonas
parents 00a16309 846195aa

mysql-test/r/innodb_mysql.result

0 → 100644
+1 −0
Original line number Diff line number Diff line 
drop table if exists t1;

mysql-test/t/innodb.test

+13 −0
Original line number Diff line number Diff line 
#######################################################################

#                                                                     #

# Please, DO NOT TOUCH this file as well as the innodb.result file.   #

# These files are to be modified ONLY BY INNOBASE guys.               #

#                                                                     #

# Use innodb_mysql.[test|result] files instead.                       #

#                                                                     #

# If nevertheless you need to make some changes here, please, forward #

# your commit message To: dev@innodb.com Cc: dev-innodb@mysql.com     #

# (otherwise your changes may be erased).                             #

#                                                                     #

#######################################################################



-- source include/have_innodb.inc



#

mysql-test/t/innodb_mysql.test

0 → 100644
+5 −0
Original line number Diff line number Diff line 
-- source include/have_innodb.inc



--disable_warnings

drop table if exists t1;

--enable_warnings

ndb/include/util/SocketServer.hpp

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ public: 
  /**

   * Constructor / Destructor

   */

  SocketServer(int maxSessions = 32);

  SocketServer(unsigned maxSessions = ~(unsigned)0);

  ~SocketServer();

  

  /**

ndb/src/common/transporter/Transporter.cpp

+6 −6
Original line number Diff line number Diff line
@@ -100,10 +100,10 @@ Transporter::connect_server(NDB_SOCKET_TYPE sockfd) { 
  }

  

  {

    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);
@@ -173,10 +173,10 @@ Transporter::connect_client() { 
  }



  {

    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);