Commit c3cb363d authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
parents 30d59892 8dcfad68

ndb/include/ndbapi/ndb_cluster_connection.hpp

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public: 


  void set_optimized_node_selection(int val);



  int no_db_nodes();

  unsigned no_db_nodes();

#endif



private:

ndb/include/transporter/TransporterRegistry.hpp

+6 −1
Original line number Diff line number Diff line
@@ -100,6 +100,11 @@ public: 
  

  bool init(NodeId localNodeId);



  /**

   * after a connect from client, perform connection using correct transporter

   */

  bool connect_server(NDB_SOCKET_TYPE sockfd);



  /**

   * Remove all transporters

   */

ndb/include/util/ndb_opts.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ OPT_NDB_OPTIMIZED_NODE_SELECTION 


#define OPT_NDB_CONNECTSTRING 'c'



#ifdef NDB_SHM_TRANSPORTER

#if defined(NDB_SHM_TRANSPORTER) && MYSQL_VERSION_ID >= 50000

#define OPT_NDB_SHM_DEFAULT 1

#else

#define OPT_NDB_SHM_DEFAULT 0

ndb/src/common/transporter/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ EXTRA_libtransporter_la_SOURCES = SHM_Transporter.cpp SHM_Transporter.unix.cpp S 
libtransporter_la_LIBADD = @ndb_transporter_opt_objs@

libtransporter_la_DEPENDENCIES = @ndb_transporter_opt_objs@



INCLUDES_LOC = -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/include/transporter @NDB_SCI_INCLUDES@

INCLUDES_LOC = -I$(top_srcdir)/ndb/include/mgmapi  -I$(top_srcdir)/ndb/include/debugger -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/include/transporter @NDB_SCI_INCLUDES@



include $(top_srcdir)/ndb/config/common.mk.am

include $(top_srcdir)/ndb/config/type_util.mk.am

ndb/src/common/transporter/SCI_Transporter.cpp

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ SCI_Transporter::SCI_Transporter(TransporterRegistry &t_reg, 
				 bool chksm,  

				 bool signalId, 

				 Uint32 reportFreq) :  

  Transporter(t_reg, lHostName, rHostName, r_port, _localNodeId,

  Transporter(t_reg, tt_SCI_TRANSPORTER,

	      lHostName, rHostName, r_port, _localNodeId,

              _remoteNodeId, 0, false, chksm, signalId) 

{

  DBUG_ENTER("SCI_Transporter::SCI_Transporter");