diff options
author | unknown <stewart@willster.(none)> | 2006-10-05 23:13:29 +1000 |
---|---|---|
committer | unknown <stewart@willster.(none)> | 2006-10-05 23:13:29 +1000 |
commit | 596bf8ec021354077052b69f4fae81cf3385f0ec (patch) | |
tree | 478350f5cda23d29590a3f224d65609e99824456 /storage/ndb/include/mgmapi/mgmapi.h | |
parent | d7bb7cc561300fbb6bacee3bcb5993f34099d8f3 (diff) | |
parent | dcf21e94faef2ccc122358c4b25866e605c7d2dc (diff) | |
download | mariadb-git-596bf8ec021354077052b69f4fae81cf3385f0ec.tar.gz |
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987
Merge 5.0-ndb into 5.1-ndb
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/include/mgmapi/mgmapi_debug.h:
Auto merged
storage/ndb/include/util/Parser.hpp:
Auto merged
storage/ndb/include/util/socket_io.h:
Auto merged
storage/ndb/src/common/util/InputStream.cpp:
Auto merged
storage/ndb/src/common/util/Parser.cpp:
Auto merged
storage/ndb/src/common/util/socket_io.cpp:
Auto merged
storage/ndb/src/cw/cpcd/main.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmclient/main.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
Auto merged
storage/ndb/src/mgmsrv/main.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/test/ndbapi/testMgm.cpp:
Auto merged
storage/ndb/tools/delete_all.cpp:
Auto merged
storage/ndb/tools/drop_index.cpp:
Auto merged
storage/ndb/tools/drop_tab.cpp:
Auto merged
storage/ndb/tools/listTables.cpp:
Auto merged
storage/ndb/tools/select_count.cpp:
Auto merged
storage/ndb/tools/waiter.cpp:
Auto merged
mysql-test/r/ndb_config.result:
manual merge
mysql-test/t/ndb_config.test:
manual merge
storage/ndb/include/util/InputStream.hpp:
manual merge
storage/ndb/tools/desc.cpp:
manual merge
storage/ndb/tools/ndb_condig.cpp:
manual merge
storage/ndb/tools/restore/restore_main.cpp:
manual merge
storage/ndb/tools/select_all.cpp:
manual merge
Diffstat (limited to 'storage/ndb/include/mgmapi/mgmapi.h')
-rw-r--r-- | storage/ndb/include/mgmapi/mgmapi.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/storage/ndb/include/mgmapi/mgmapi.h b/storage/ndb/include/mgmapi/mgmapi.h index 1ab877b1081..b6b87ebaaa9 100644 --- a/storage/ndb/include/mgmapi/mgmapi.h +++ b/storage/ndb/include/mgmapi/mgmapi.h @@ -1081,6 +1081,19 @@ extern "C" { int ndb_mgm_end_session(NdbMgmHandle handle); /** + * ndb_mgm_get_fd + * + * get the file descriptor of the handle. + * INTERNAL ONLY. + * USE FOR TESTING. OTHER USES ARE NOT A GOOD IDEA. + * + * @param handle NDB management handle + * @return handle->socket + * + */ + int ndb_mgm_get_fd(NdbMgmHandle handle); + + /** * Get the node id of the mgm server we're connected to */ Uint32 ndb_mgm_get_mgmd_nodeid(NdbMgmHandle handle); |