diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-09-07 11:15:07 +0200 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-09-07 11:15:07 +0200 |
| commit | 821abeee47be68790857abe5e0d6ee67a34a326c (patch) | |
| tree | eb79fddbffa910fcdd8252224efe22e53145c4dd /storage | |
| parent | c626f660de47b38e3e27044b513fc73f97ff0794 (diff) | |
| download | mariadb-git-821abeee47be68790857abe5e0d6ee67a34a326c.tar.gz | |
Bug #11313 confusing/erroneous 4006 message
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/src/ndbapi/Ndb.cpp | 5 | ||||
| -rw-r--r-- | storage/ndb/src/ndbapi/ndberror.c | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/storage/ndb/src/ndbapi/Ndb.cpp b/storage/ndb/src/ndbapi/Ndb.cpp index 7471e9c84f8..15647861eef 100644 --- a/storage/ndb/src/ndbapi/Ndb.cpp +++ b/storage/ndb/src/ndbapi/Ndb.cpp @@ -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); diff --git a/storage/ndb/src/ndbapi/ndberror.c b/storage/ndb/src/ndbapi/ndberror.c index 10ecc8e5f25..a0417e5b118 100644 --- a/storage/ndb/src/ndbapi/ndberror.c +++ b/storage/ndb/src/ndbapi/ndberror.c @@ -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" }, |