Bug #11313 confusing/erroneous 4006 message

parent 0e18338a
......@@ -3082,7 +3082,7 @@ ndbcluster_handle_drop_table(Ndb *ndb, const char *event_name,
/* ToDo; handle error? */
if (share && share->op &&
share->op->getState() == NdbEventOperation::EO_EXECUTING &&
dict->getNdbError().code != 4009)
dict->getNdbError().mysql_code != HA_ERR_NO_CONNECTION)
{
DBUG_ASSERT(FALSE);
DBUG_RETURN(-1);
......
......@@ -202,9 +202,10 @@ Ndb::NDB_connect(Uint32 tNode)
DBUG_PRINT("info",
("unsuccessful connect tReturnCode %d, tNdbCon->Status() %d",
tReturnCode, tNdbCon->Status()));
if (theError.code == 299)
if (theError.code == 299 || // single user mode
theError.code == 281 ) // cluster shutdown in progress
{
// single user mode so no need to retry with other node
// no need to retry with other node
DBUG_RETURN(-1);
}
DBUG_RETURN(3);
......
......@@ -290,6 +290,7 @@ ErrorBundle ErrorCodes[] = {
/**
* Application error
*/
{ 281, HA_ERR_NO_CONNECTION, AE, "Operation not allowed due to cluster shutdown in progress" },
{ 299, DMEC, AE, "Operation not allowed or aborted due to single user mode" },
{ 763, DMEC, AE, "Alter table requires cluster nodes to have exact same version" },
{ 823, DMEC, AE, "Too much attrinfo from application in tuple manager" },
......
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