mirror of
https://github.com/MariaDB/server.git
synced 2026-05-05 22:55:32 +02:00
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into neptunus.(none):/home/magnus/mysql/wl/wl1424_discover_2
This commit is contained in:
commit
52b75a65fe
19 changed files with 632 additions and 184 deletions
|
|
@ -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.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue