diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-09-15 11:43:49 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-09-15 11:43:49 +0200 |
| commit | fe4672d7082c8b93db86a65368e58aa754e6bf0c (patch) | |
| tree | 16617a8068500c1f0e700829f94901889b1c4a76 /storage/ndb/include/mgmcommon | |
| parent | ba6b37a005544016e02a8900ff04aaa069d10bf2 (diff) | |
| parent | dc8649badabcf6e871071eedbbdf4375a89e03e3 (diff) | |
| download | mariadb-git-fe4672d7082c8b93db86a65368e58aa754e6bf0c.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/include/ndb_version.h.in:
Auto merged
storage/ndb/src/common/util/SocketClient.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/include/mgmcommon/ConfigRetriever.hpp:
Auto merged
storage/ndb/include/util/SocketClient.hpp:
Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/include/kernel/signaldata/CopyFrag.hpp:
merge
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
merge
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
merge
Diffstat (limited to 'storage/ndb/include/mgmcommon')
| -rw-r--r-- | storage/ndb/include/mgmcommon/ConfigRetriever.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/ndb/include/mgmcommon/ConfigRetriever.hpp b/storage/ndb/include/mgmcommon/ConfigRetriever.hpp index 1b4ecd56f80..89a1eb976c8 100644 --- a/storage/ndb/include/mgmcommon/ConfigRetriever.hpp +++ b/storage/ndb/include/mgmcommon/ConfigRetriever.hpp @@ -28,7 +28,8 @@ class ConfigRetriever { public: ConfigRetriever(const char * _connect_string, - Uint32 version, Uint32 nodeType); + Uint32 version, Uint32 nodeType, + const char * _bind_address = 0); ~ConfigRetriever(); int do_connect(int no_retries, int retry_delay_in_seconds, int verbose); |