Commit e60ea455 authored by unknown's avatar unknown
Browse files

removed usage od NDB_MUTEX_INITIALIZER

parent 7e39126d

ndb/test/ndbapi/testDeadlock.cpp

+5 −3
Original line number Diff line number Diff line
@@ -48,14 +48,14 @@ printusage() 


static Opt g_opt;



static NdbMutex ndbout_mutex = NDB_MUTEX_INITIALIZER;

static NdbMutex *ndbout_mutex= NULL;



#define DBG(x) \

  do { \

    if (! g_opt.m_dbg) break; \

    NdbMutex_Lock(&ndbout_mutex); \

    NdbMutex_Lock(ndbout_mutex); \

    ndbout << "line " << __LINE__ << " " << x << endl; \

    NdbMutex_Unlock(&ndbout_mutex); \

    NdbMutex_Unlock(ndbout_mutex); \

  } while (0)



#define CHK(x) \
@@ -492,6 +492,8 @@ wl1822_main(char scantx) 
NDB_COMMAND(testOdbcDriver, "testDeadlock", "testDeadlock", "testDeadlock", 65535)

{

  ndb_init();

  if (ndbout_mutex == NULL)

    ndbout_mutex= NdbMutex_Create();

  while (++argv, --argc > 0) {

    const char* arg = argv[0];

    if (strcmp(arg, "-scan") == 0) {

ndb/test/ndbapi/testOIBasic.cpp

+5 −3
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static const bool g_compare_null = true; 


// log and error macros



static NdbMutex ndbout_mutex = NDB_MUTEX_INITIALIZER;

static NdbMutex *ndbout_mutex= NULL;



static unsigned getthrno();
@@ -160,9 +160,9 @@ getthrstr() 
#define LLN(n, s) \

  do { \

    if ((n) > g_opt.m_v) break; \

    if (g_opt.m_msglock) NdbMutex_Lock(&ndbout_mutex); \

    if (g_opt.m_msglock) NdbMutex_Lock(ndbout_mutex); \

    ndbout << getthrstr() << s << endl; \

    if (g_opt.m_msglock) NdbMutex_Unlock(&ndbout_mutex); \

    if (g_opt.m_msglock) NdbMutex_Unlock(ndbout_mutex); \

  } while(0)



#define LL0(s) LLN(0, s)
@@ -3349,6 +3349,8 @@ runtest(Par par) 
NDB_COMMAND(testOIBasic, "testOIBasic", "testOIBasic", "testOIBasic", 65535)

{

  ndb_init();

  if (ndbout_mutex == NULL)

    ndbout_mutex= NdbMutex_Create();

  while (++argv, --argc > 0) {

    const char* arg = argv[0];

    if (*arg != '-') {