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

removed usage od NDB_MUTEX_INITIALIZER

Browse Source
This commit is contained in:
unknown
2004-10-25 16:02:41 +00:00
parent 7e39126de8
commit e60ea455e3
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ndb/test/ndbapi/testDeadlock.cpp
View File

@@ -48,14 +48,14 @@ printusage()
static Opt g_opt; static Opt g_opt;
static NdbMutex ndbout_mutex = NDB_MUTEX_INITIALIZER; static NdbMutex *ndbout_mutex= NULL;
#define DBG(x) \ #define DBG(x) \
do { \ do { \
if (! g_opt.m_dbg) break; \ if (! g_opt.m_dbg) break; \
NdbMutex_Lock(&ndbout_mutex); \ NdbMutex_Lock(ndbout_mutex); \
ndbout << "line " << __LINE__ << " " << x << endl; \ ndbout << "line " << __LINE__ << " " << x << endl; \
NdbMutex_Unlock(&ndbout_mutex); \ NdbMutex_Unlock(ndbout_mutex); \
} while (0) } while (0)
#define CHK(x) \ #define CHK(x) \
@@ -492,6 +492,8 @@ wl1822_main(char scantx)
NDB_COMMAND(testOdbcDriver, "testDeadlock", "testDeadlock", "testDeadlock", 65535) NDB_COMMAND(testOdbcDriver, "testDeadlock", "testDeadlock", "testDeadlock", 65535)
{ {
ndb_init(); ndb_init();
if (ndbout_mutex == NULL)
ndbout_mutex= NdbMutex_Create();
while (++argv, --argc > 0) { while (++argv, --argc > 0) {
const char* arg = argv[0]; const char* arg = argv[0];
if (strcmp(arg, "-scan") == 0) { if (strcmp(arg, "-scan") == 0) {

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

@@ -137,7 +137,7 @@ static const bool g_compare_null = true;
// log and error macros // log and error macros
static NdbMutex ndbout_mutex = NDB_MUTEX_INITIALIZER; static NdbMutex *ndbout_mutex= NULL;
static unsigned getthrno(); static unsigned getthrno();
@@ -160,9 +160,9 @@ getthrstr()
#define LLN(n, s) \ #define LLN(n, s) \
do { \ do { \
if ((n) > g_opt.m_v) break; \ 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; \ ndbout << getthrstr() << s << endl; \
if (g_opt.m_msglock) NdbMutex_Unlock(&ndbout_mutex); \ if (g_opt.m_msglock) NdbMutex_Unlock(ndbout_mutex); \
} while(0) } while(0)
#define LL0(s) LLN(0, s) #define LL0(s) LLN(0, s)
@@ -3349,6 +3349,8 @@ runtest(Par par)
NDB_COMMAND(testOIBasic, "testOIBasic", "testOIBasic", "testOIBasic", 65535) NDB_COMMAND(testOIBasic, "testOIBasic", "testOIBasic", "testOIBasic", 65535)
{ {
ndb_init(); ndb_init();
if (ndbout_mutex == NULL)
ndbout_mutex= NdbMutex_Create();
while (++argv, --argc > 0) { while (++argv, --argc > 0) {
const char* arg = argv[0]; const char* arg = argv[0];
if (*arg != '-') { if (*arg != '-') {