bk commit into 5.1 tree (tomas:1.2557) BUG#11313

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-09-07 11:15:07+02:00, tomas@stripped +3 -0
  Bug #11313 confusing/erroneous 4006 message

  sql/ha_ndbcluster_binlog.cc@stripped, 2007-09-07 11:15:04+02:00,
tomas@stripped +1 -1
    Bug #11313 confusing/erroneous 4006 message

  storage/ndb/src/ndbapi/Ndb.cpp@stripped, 2007-09-07 11:15:04+02:00,
tomas@stripped +3 -2
    Bug #11313 confusing/erroneous 4006 message

  storage/ndb/src/ndbapi/ndberror.c@stripped, 2007-09-07 11:15:04+02:00,
tomas@stripped +1 -0
    Bug #11313 confusing/erroneous 4006 message

diff -Nrup a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
--- a/sql/ha_ndbcluster_binlog.cc	2007-09-05 11:43:39 +02:00
+++ b/sql/ha_ndbcluster_binlog.cc	2007-09-07 11:15:04 +02:00
@@ -3082,7 +3082,7 @@ ndbcluster_handle_drop_table(Ndb *ndb, c
       /* 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);
diff -Nrup a/storage/ndb/src/ndbapi/Ndb.cpp b/storage/ndb/src/ndbapi/Ndb.cpp
--- a/storage/ndb/src/ndbapi/Ndb.cpp	2007-08-13 15:11:18 +02:00
+++ b/storage/ndb/src/ndbapi/Ndb.cpp	2007-09-07 11:15:04 +02:00
@@ -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 -Nrup a/storage/ndb/src/ndbapi/ndberror.c b/storage/ndb/src/ndbapi/ndberror.c
--- a/storage/ndb/src/ndbapi/ndberror.c	2007-08-30 10:46:29 +02:00
+++ b/storage/ndb/src/ndbapi/ndberror.c	2007-09-07 11:15:04 +02:00
@@ -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" },