summaryrefslogtreecommitdiff
path: root/ndb/include
diff options
context:
space:
mode:
authorunknown <magnus@neptunus.(none)>2004-09-20 14:28:43 +0200
committerunknown <magnus@neptunus.(none)>2004-09-20 14:28:43 +0200
commitbdbb091b68087587f42a16923b42921eb44744b1 (patch)
treed9c8ecc32b0f9ad9899a1ddcf30826b5c313bcfb /ndb/include
parent7f1fcf6648c6c4a29b94360fd47f53e90812cb98 (diff)
parent877ba4489a74fe59ecf8a4a9d896204b923e42ac (diff)
downloadmariadb-git-bdbb091b68087587f42a16923b42921eb44744b1.tar.gz
Merged Thd_ndb
ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged sql/ha_ndbcluster.h: Auto merged sql/handler.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_table.cc: Auto merged
Diffstat (limited to 'ndb/include')
-rw-r--r--ndb/include/ndbapi/Ndb.hpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/ndb/include/ndbapi/Ndb.hpp b/ndb/include/ndbapi/Ndb.hpp
index 9d0e9714eef..550d0c0931a 100644
--- a/ndb/include/ndbapi/Ndb.hpp
+++ b/ndb/include/ndbapi/Ndb.hpp
@@ -1087,8 +1087,6 @@ public:
int waitUntilReady(int timeout = 60);
- void connected(Uint32 block_reference);
-
/** @} *********************************************************************/
/**
@@ -1447,6 +1445,9 @@ private:
void setup(Ndb_cluster_connection *ndb_cluster_connection,
const char* aCatalogName, const char* aSchemaName);
+ void connected(Uint32 block_reference);
+
+
NdbConnection* startTransactionLocal(Uint32 aPrio, Uint32 aFragmentId);
// Connect the connection object to the Database.