MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:tomas Date:June 20 2006 5:14pm
Subject:bk commit into 5.0 tree (tomas:1.2132) BUG#17297
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 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
  1.2132 06/06/20 19:13:46 tomas@stripped +5 -0
  Bug #17297 Fix error messages

  ndb/src/ndbapi/ndberror.c
    1.44 06/06/20 19:13:39 tomas@stripped +1 -0
    Bug #17297 Fix error messages

  ndb/src/kernel/error/ndbd_exit_codes.c
    1.10 06/06/20 19:13:39 tomas@stripped +4 -3
    Bug #17297 Fix error messages

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.87 06/06/20 19:13:39 tomas@stripped +2 -1
    Bug #17297 Fix error messages

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.49 06/06/20 19:13:39 tomas@stripped +1 -1
    Bug #17297 Fix error messages

  ndb/src/common/transporter/TransporterRegistry.cpp
    1.61 06/06/20 19:13:39 tomas@stripped +1 -1
    Bug #17297 Fix error messages

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.0

--- 1.60/ndb/src/common/transporter/TransporterRegistry.cpp	2005-10-11 15:47:57 +02:00
+++ 1.61/ndb/src/common/transporter/TransporterRegistry.cpp	2006-06-20 19:13:39 +02:00
@@ -1322,7 +1322,7 @@
 	      else
 	      {
 		ndbout_c("Management server closed connection early. "
-			 "It is probably being shut down (or has crashed). "
+			 "It is probably being shut down (or has problems). "
 			 "We will retry the connection.");
 	      }
 	    }

--- 1.48/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-04-10 08:29:21 +02:00
+++ 1.49/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-06-20 19:13:39 +02:00
@@ -8330,7 +8330,7 @@
 	     *--------_----------------------------------------------------- */
 	    const Uint32 nextCrashed = noCrashedReplicas + 1;
 	    replicaPtr.p->noCrashedReplicas = nextCrashed;
-	    arrGuard(nextCrashed, 8);
+	    arrGuardErr(nextCrashed, 8, NDBD_EXIT_MAX_CRASHED_REPLICAS);
 	    replicaPtr.p->createGci[nextCrashed] = newestRestorableGCI + 1;
 	    ndbrequire(newestRestorableGCI + 1 != 0xF1F1F1F1);
 	    replicaPtr.p->replicaLastGci[nextCrashed] = (Uint32)-1;

--- 1.86/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-03-23 15:46:57 +01:00
+++ 1.87/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-06-20 19:13:39 +02:00
@@ -17989,7 +17989,8 @@
     logFilePtr.p->currentLogpage = logPagePtr.p->logPageWord[ZNEXT_PAGE];
     logPagePtr.i = logPagePtr.p->logPageWord[ZNEXT_PAGE];
     logFilePtr.p->currentFilepage++;
-    ptrCheckGuard(logPagePtr, clogPageFileSize, logPageRecord);
+    ptrCheckGuardErr(logPagePtr, clogPageFileSize, logPageRecord,
+                     NDBD_EXIT_SR_REDOLOG);
     logPagePtr.p->logPageWord[ZCURR_PAGE_INDEX] = ZPAGE_HEADER_SIZE;
     logPartPtr.p->execSrPagesRead--;
     logPartPtr.p->execSrPagesExecuted++;

--- 1.9/ndb/src/kernel/error/ndbd_exit_codes.c	2006-03-22 15:46:49 +01:00
+++ 1.10/ndb/src/kernel/error/ndbd_exit_codes.c	2006-06-20 19:13:39 +02:00
@@ -51,8 +51,9 @@
    {NDBD_EXIT_SYSTEM_ERROR, XIE,
     "System error, node killed during node restart by other node"},
    {NDBD_EXIT_INDEX_NOTINRANGE, XIE, "Array index out of range"},
-   {NDBD_EXIT_ARBIT_SHUTDOWN, XAE, "Arbitrator shutdown, "
-    "please investigate error(s) on other node(s)"},
+   {NDBD_EXIT_ARBIT_SHUTDOWN, XAE, "Node lost connection to other nodes and "
+    "can not form a unpartitioned cluster, please investigate if there are "
+    "error(s) on other node(s)"},
    {NDBD_EXIT_POINTER_NOTINRANGE, XIE, "Pointer too large"},
    {NDBD_EXIT_SR_OTHERNODEFAILED, XRE, "Another node failed during system "
     "restart, please investigate error(s) on other node(s)"},
@@ -94,7 +95,7 @@
    {NDBD_EXIT_WATCHDOG_TERMINATE, XIE, "WatchDog terminate, internal error "
     "or massive overload on the machine running this node"},
    {NDBD_EXIT_SIGNAL_LOST_SEND_BUFFER_FULL, XCR,
-    "Signal lost, out of send buffer memory, please increase SendBufferMemory"},
+    "Signal lost, out of send buffer memory, please increase SendBufferMemory or lower the load"},
    {NDBD_EXIT_SIGNAL_LOST,    XIE, "Signal lost (unknown reason)"},
    {NDBD_EXIT_ILLEGAL_SIGNAL, XIE,
     "Illegal signal (version mismatch a possibility)"},

--- 1.43/ndb/src/ndbapi/ndberror.c	2005-12-14 10:57:06 +01:00
+++ 1.44/ndb/src/ndbapi/ndberror.c	2006-06-20 19:13:39 +02:00
@@ -266,6 +266,7 @@
   /**
    * Application error
    */
+  { 763,  AE, "Alter table requires cluster nodes to have exact same version" },
   { 823,  AE, "Too much attrinfo from application in tuple manager" },
   { 831,  AE, "Too many nullable/bitfields in table definition" },
   { 876,  AE, "876" },
Thread
bk commit into 5.0 tree (tomas:1.2132) BUG#17297tomas20 Jun