Commit 6cb0c79c authored by tomas@poseidon.mysql.com's avatar tomas@poseidon.mysql.com

Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean

into  poseidon.mysql.com:/home/tomas/mysql-5.0
parents 0a6f5107 e28ea98a
...@@ -880,6 +880,7 @@ NdbDictInterface::dictSignal(NdbApiSignal* signal, ...@@ -880,6 +880,7 @@ NdbDictInterface::dictSignal(NdbApiSignal* signal,
r = m_transporter->sendSignal(signal, aNodeId); r = m_transporter->sendSignal(signal, aNodeId);
} }
if(r != 0){ if(r != 0){
m_error.code= 4007;
m_transporter->unlock_mutex(); m_transporter->unlock_mutex();
continue; continue;
} }
...@@ -903,7 +904,10 @@ NdbDictInterface::dictSignal(NdbApiSignal* signal, ...@@ -903,7 +904,10 @@ NdbDictInterface::dictSignal(NdbApiSignal* signal,
* Handle error codes * Handle error codes
*/ */
if(m_waiter.m_state == WAIT_NODE_FAILURE) if(m_waiter.m_state == WAIT_NODE_FAILURE)
{
m_error.code = 4013;
continue; continue;
}
if(m_waiter.m_state == WST_WAIT_TIMEOUT) if(m_waiter.m_state == WST_WAIT_TIMEOUT)
{ {
......
...@@ -137,10 +137,12 @@ ErrorBundle ErrorCodes[] = { ...@@ -137,10 +137,12 @@ ErrorBundle ErrorCodes[] = {
/** /**
* Unknown result * Unknown result
*/ */
{ 4007, UR, "Send to ndbd node failed" },
{ 4008, UR, "Receive from NDB failed" }, { 4008, UR, "Receive from NDB failed" },
{ 4009, UR, "Cluster Failure" }, { 4009, UR, "Cluster Failure" },
{ 4012, UR, { 4012, UR,
"Request ndbd time-out, maybe due to high load or communication problems"}, "Request ndbd time-out, maybe due to high load or communication problems"},
{ 4013, UR, "Request timed out in waiting for node failure"},
{ 4024, UR, { 4024, UR,
"Time-out, most likely caused by simple read or cluster failure" }, "Time-out, most likely caused by simple read or cluster failure" },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment