database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

merge

Browse Source 
configure.in:
  Auto merged
ndb/include/ndbapi/NdbApi.hpp:
  Auto merged
ndb/include/ndbapi/NdbReceiver.hpp:
  Auto merged
ndb/include/transporter/TransporterRegistry.hpp:
  Auto merged
ndb/src/common/logger/Logger.cpp:
  Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
ndb/src/common/transporter/Transporter.hpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
This commit is contained in:
unknown
2005-01-01 14:01:37 +01:00
parent a142cea8a3 9c92a25524
commit 2a5aa24fab
109 changed files with 1922 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ndb/test/ndbapi/testOIBasic.cpp
View File

@@ -1089,6 +1089,8 @@ makebuiltintables(Par par)
// connections
static Ndb_cluster_connection* g_ncc = 0;
struct Con {
Ndb* m_ndb;
NdbDictionary::Dictionary* m_dic;
@@ -1140,7 +1142,7 @@ int
Con::connect()
{
assert(m_ndb == 0);
m_ndb = new Ndb("TEST_DB");
m_ndb = new Ndb(g_ncc, "TEST_DB");
CHKCON(m_ndb->init() == 0, *this);
CHKCON(m_ndb->waitUntilReady(30) == 0, *this);
m_tx = 0, m_op = 0;
@@ -4666,8 +4668,11 @@ NDB_COMMAND(testOIBasic, "testOIBasic", "testOIBasic", "testOIBasic", 65535)
}
{
Par par(g_opt);
if (runtest(par) < 0)
g_ncc = new Ndb_cluster_connection();
if (g_ncc->connect(30) != 0 || runtest(par) < 0)
goto failed;
delete g_ncc;
g_ncc = 0;
}
ok:
return NDBT_ProgramExit(NDBT_OK);