Commit 2a48132e authored by unknown's avatar unknown
Browse files

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-release 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new


mysql-test/t/ctype_utf8.test:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
parents 638fe9ec 130cd50d

mysql-test/t/ctype_utf8.test

+2 −0
Original line number Diff line number Diff line
@@ -785,12 +785,14 @@ INSERT INTO t1 VALUES 
(1,'blah','464','aaa','fkc1c9ilc20x0hgae7lx6j09','ERR','ERR Имри.Афимим.Аеимимримдмримрмрирор имримримримр имридм ирбднримрфмририримрфмфмим.Ад.Д имдимримрад.Адимримримрмдиримримримр м.Дадимфшьмримд им.Адимимрн имадми','ИМРИ.АФИМИМ.АЕИМИМРИМДМРИМРМРИРОР',3,'2005-06-01 17:30:43','1234567890'),

(2,'blah','464','aaa','haxpl2ilc20x00bj4tt2m5ti','11','11 g','G',3,'2005-06-02 22:43:10','1234567890');



--disable_warnings

CREATE TABLE t2 (

  `msisdn` varchar(15) NOT NULL default '',

  `operator_id` int(11) NOT NULL default '0',

  `created` datetime NOT NULL default '0000-00-00 00:00:00',

  UNIQUE KEY `PK_user` (`msisdn`)

) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--enable_warnings



INSERT INTO t2 VALUES ('1234567890',2,'2005-05-24 13:53:25');

ndb/include/transporter/TransporterRegistry.hpp

+2 −0
Original line number Diff line number Diff line
@@ -238,6 +238,8 @@ public: 
  };

  Vector<Transporter_interface> m_transporter_interface;

  void add_transporter_interface(const char *interf, unsigned short port);



  struct in_addr get_connect_address(NodeId node_id) const;

protected:

  

private:

ndb/src/common/mgmcommon/ConfigRetriever.cpp

+4 −6
Original line number Diff line number Diff line
@@ -136,16 +136,14 @@ ConfigRetriever::getConfig() { 
}



ndb_mgm_configuration *

ConfigRetriever::getConfig(NdbMgmHandle m_handle){

  

ConfigRetriever::getConfig(NdbMgmHandle m_handle)

{

  ndb_mgm_configuration * conf = ndb_mgm_get_configuration(m_handle,m_version);

  if(conf == 0){

  if(conf == 0)

  {

    setError(CR_ERROR, ndb_mgm_get_latest_error_desc(m_handle));

    return 0;

  }



  ndb_mgm_disconnect(m_handle);



  return conf;

}

ndb/src/common/transporter/Transporter.cpp

+15 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ Transporter::Transporter(TransporterRegistry &t_reg, 
  m_connected     = false;

  m_timeOutMillis = 1000;



  m_connect_address.s_addr= 0;

  if (isServer)

    m_socket_client= 0;

  else
@@ -98,6 +99,13 @@ Transporter::connect_server(NDB_SOCKET_TYPE sockfd) { 
    DBUG_RETURN(true); // TODO assert(0);

  }

  

  {

    struct sockaddr addr;

    SOCKET_SIZE_TYPE addrlen= sizeof(addr);

    int r= getpeername(sockfd, &addr, &addrlen);

    m_connect_address= ((struct sockaddr_in *)&addr)->sin_addr;

  }



  bool res = connect_server_impl(sockfd);

  if(res){

    m_connected  = true;
@@ -164,6 +172,13 @@ Transporter::connect_client() { 
    g_eventLogger.warning("Unable to verify transporter compatability with node %d", nodeId);

  }



  {

    struct sockaddr addr;

    SOCKET_SIZE_TYPE addrlen= sizeof(addr);

    int r= getpeername(sockfd, &addr, &addrlen);

    m_connect_address= ((struct sockaddr_in *)&addr)->sin_addr;

  }



  bool res = connect_client_impl(sockfd);

  if(res){

    m_connected  = true;

ndb/src/common/transporter/Transporter.hpp

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ protected: 
private:



  SocketClient *m_socket_client;

  struct in_addr m_connect_address;



protected:

  Uint32 getErrorCount();