diff options
| author | unknown <tomas@poseidon.(none)> | 2004-09-02 12:04:50 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.(none)> | 2004-09-02 12:04:50 +0000 |
| commit | 3b124d4fb2afb55d4aacf97245a3d2c523a73bab (patch) | |
| tree | e7a0aa97a330c051962779f1d940e84d29c4ce4a /ndb/include/ndbapi/ndb_cluster_connection.hpp | |
| parent | 59e2b96438eb1197f3f8b9128cd53a7c5582be4a (diff) | |
| download | mariadb-git-3b124d4fb2afb55d4aacf97245a3d2c523a73bab.tar.gz | |
added connect thread to Ndb_cluster_connection +
some other small fixes
ndb/include/mgmcommon/ConfigRetriever.hpp:
added options to do_connect to contol how connects failures should be treated
ndb/include/mgmcommon/NdbConfig.h:
method to retrieve datadir path (to user for chdir)
ndb/include/ndbapi/ndb_cluster_connection.hpp:
Added connect thread
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
added options to do_connect to contol how connects failures should be treated
ndb/src/common/mgmcommon/NdbConfig.c:
method to retrieve datadir path (to user for chdir)
ndb/src/kernel/main.cpp:
ndbd to do chdir
ndb/src/kernel/vm/WatchDog.cpp:
added my_thread_init for debug
ndb/src/ndbapi/ClusterMgr.cpp:
added my_thread_init for debug
ndb/src/ndbapi/TransporterFacade.cpp:
removed call to atexit
ndb/src/ndbapi/ndb_cluster_connection.cpp:
added connect thread
Diffstat (limited to 'ndb/include/ndbapi/ndb_cluster_connection.hpp')
| -rw-r--r-- | ndb/include/ndbapi/ndb_cluster_connection.hpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/ndb/include/ndbapi/ndb_cluster_connection.hpp b/ndb/include/ndbapi/ndb_cluster_connection.hpp index 5c3f53dd870..59d5a038844 100644 --- a/ndb/include/ndbapi/ndb_cluster_connection.hpp +++ b/ndb/include/ndbapi/ndb_cluster_connection.hpp @@ -20,16 +20,26 @@ class TransporterFacade; class ConfigRetriever; +class NdbThread; + +extern "C" { + void* run_ndb_cluster_connection_connect_thread(void*); +} class Ndb_cluster_connection { public: Ndb_cluster_connection(const char * connect_string = 0); ~Ndb_cluster_connection(); - int connect(); + int connect(int reconnect= 0); + int start_connect_thread(int (*connect_callback)(void)= 0); private: + friend void* run_ndb_cluster_connection_connect_thread(void*); + void connect_thread(); char *m_connect_string; TransporterFacade *m_facade; ConfigRetriever *m_config_retriever; + NdbThread *m_connect_thread; + int (*m_connect_callback)(void); }; #endif |