diff options
| author | unknown <magnus@neptunus.(none)> | 2004-09-21 12:23:27 +0200 |
|---|---|---|
| committer | unknown <magnus@neptunus.(none)> | 2004-09-21 12:23:27 +0200 |
| commit | 548ad8134cfc773b588a525f4853363ba7872f43 (patch) | |
| tree | f34d3e01a7ee5c37fe3be3e8940b7e8e5c88a4ec /ndb/src/ndbapi/NdbDictionaryImpl.cpp | |
| parent | 300346fad3379f3b95d5b30c7f23bc5b9b7c2900 (diff) | |
| parent | dd07a90d612278057217b50076e9100177570613 (diff) | |
| download | mariadb-git-548ad8134cfc773b588a525f4853363ba7872f43.tar.gz | |
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into neptunus.(none):/home/magnus/mysql/wl/wl1424_discover_2
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
Diffstat (limited to 'ndb/src/ndbapi/NdbDictionaryImpl.cpp')
| -rw-r--r-- | ndb/src/ndbapi/NdbDictionaryImpl.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/ndb/src/ndbapi/NdbDictionaryImpl.cpp index 0b2a0386a6b..e616e48bbe6 100644 --- a/ndb/src/ndbapi/NdbDictionaryImpl.cpp +++ b/ndb/src/ndbapi/NdbDictionaryImpl.cpp @@ -868,6 +868,8 @@ NdbDictInterface::dictSignal(NdbApiSignal* signal, const int noerrcodes, const int temporaryMask) { + DBUG_ENTER("NdbDictInterface::dictSignal"); + DBUG_PRINT("enter", ("useMasterNodeId: %d", useMasterNodeId)); for(Uint32 i = 0; i<RETRIES; i++){ //if (useMasterNodeId == 0) m_buffer.clear(); @@ -887,7 +889,7 @@ NdbDictInterface::dictSignal(NdbApiSignal* signal, if(aNodeId == 0){ m_error.code = 4009; m_transporter->unlock_mutex(); - return -1; + DBUG_RETURN(-1); } { int r; @@ -923,7 +925,7 @@ NdbDictInterface::dictSignal(NdbApiSignal* signal, if(m_waiter.m_state == NO_WAIT && m_error.code == 0){ // Normal return - return 0; + DBUG_RETURN(0); } /** @@ -946,9 +948,9 @@ NdbDictInterface::dictSignal(NdbApiSignal* signal, continue; } - return -1; + DBUG_RETURN(-1); } - return -1; + DBUG_RETURN(-1); } /***************************************************************** |