diff options
| author | unknown <tomas@poseidon.mysql.com> | 2007-03-09 20:44:44 +0700 |
|---|---|---|
| committer | unknown <tomas@poseidon.mysql.com> | 2007-03-09 20:44:44 +0700 |
| commit | 75c207298cf07715ec9ffab36938b97c9583e4a1 (patch) | |
| tree | 3e25d14a7f3fd8585a850430e49d01390a66f916 /storage/ndb | |
| parent | 31796706d507bdf849197a32bfc8b1d772dcce5f (diff) | |
| parent | f184c8173315a16445ab846c2bf3516ef352cb7b (diff) | |
| download | mariadb-git-75c207298cf07715ec9ffab36938b97c9583e4a1.tar.gz | |
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
into poseidon.mysql.com:/home/tomas/mysql-5.1
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
Diffstat (limited to 'storage/ndb')
| -rw-r--r-- | storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp | 2 | ||||
| -rw-r--r-- | storage/ndb/src/ndbapi/ndberror.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp index 1f4a9838c91..917f4e17051 100644 --- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp +++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp @@ -1753,6 +1753,7 @@ NdbDictInterface::dictSignal(NdbApiSignal* sig, m_transporter->sendSignal(sig, node)); if(res != 0){ DBUG_PRINT("info", ("dictSignal failed to send signal")); + m_error.code = 4007; continue; } @@ -1770,6 +1771,7 @@ NdbDictInterface::dictSignal(NdbApiSignal* sig, */ if(ret_val == -2) //WAIT_NODE_FAILURE { + m_error.code = 4013; continue; } if(m_waiter.m_state == WST_WAIT_TIMEOUT) diff --git a/storage/ndb/src/ndbapi/ndberror.c b/storage/ndb/src/ndbapi/ndberror.c index 193177fbd54..7dd16f2d57f 100644 --- a/storage/ndb/src/ndbapi/ndberror.c +++ b/storage/ndb/src/ndbapi/ndberror.c @@ -149,10 +149,12 @@ ErrorBundle ErrorCodes[] = { /** * Unknown result */ + { 4007, DMEC, UR, "Send to ndbd node failed" }, { 4008, DMEC, UR, "Receive from NDB failed" }, { 4009, DMEC, UR, "Cluster Failure" }, { 4012, DMEC, UR, "Request ndbd time-out, maybe due to high load or communication problems"}, + { 4013, DMEC, UR, "Request timed out in waiting for node failure"}, { 4024, DMEC, UR, "Time-out, most likely caused by simple read or cluster failure" }, |