diff options
author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-07-15 14:13:23 +0200 |
---|---|---|
committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-07-15 14:13:23 +0200 |
commit | 51229d4ba285a947d2a5675cc1d67a445738de21 (patch) | |
tree | a39c5ee7d8d705681658c40e6e3929376c65227d /ndb/include | |
parent | dbbd54e5a8499c46459e80f794e6232053ccdfd7 (diff) | |
parent | 2a48132e01d6a52559cd6e9ad9145c9484e00c24 (diff) | |
download | mariadb-git-51229d4ba285a947d2a5675cc1d67a445738de21.tar.gz |
Merge
mysql-test/t/ctype_utf8.test:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/transporter/Transporter.hpp:
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
support-files/mysql.spec.sh:
Auto merged
tests/mysql_client_test.c:
Auto merged
ndb/include/transporter/TransporterRegistry.hpp:
SCCS merged
ndb/src/common/transporter/Transporter.cpp:
SCCS merged
Diffstat (limited to 'ndb/include')
-rw-r--r-- | ndb/include/transporter/TransporterRegistry.hpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ndb/include/transporter/TransporterRegistry.hpp b/ndb/include/transporter/TransporterRegistry.hpp index 1ae8a4068c4..0bb9733e8c4 100644 --- a/ndb/include/transporter/TransporterRegistry.hpp +++ b/ndb/include/transporter/TransporterRegistry.hpp @@ -268,6 +268,8 @@ public: Transporter* get_transporter(NodeId nodeId); NodeId get_localNodeId() { return localNodeId; }; + + struct in_addr get_connect_address(NodeId node_id) const; protected: private: |