bk commit into 5.0 tree (jonas:1.2090)

[jonas]

Below is the list of changes that have just been committed into a local
5.0 repository of jonas. When jonas 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.2090 06/03/22 15:46:51 jonas@stripped +5 -0
  ndb -
    post merge fixes

  ndb/tools/desc.cpp
    1.20 06/03/22 15:46:49 jonas@stripped +4 -4
    post merge 

  ndb/src/kernel/error/ndbd_exit_codes.c
    1.9 06/03/22 15:46:49 jonas@stripped +3 -0
    post merge 

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.85 06/03/22 15:46:48 jonas@stripped +0 -1
    post merge 

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.45 06/03/22 15:46:48 jonas@stripped +1 -1
    post merge 

  ndb/include/mgmapi/ndbd_exit_codes.h
    1.9 06/03/22 15:46:48 jonas@stripped +0 -2
    post merge 

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/50-work

--- 1.44/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-03-22 15:10:34 +01:00
+++ 1.45/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-03-22 15:46:48 +01:00
@@ -1610,7 +1610,7 @@
 			 " with --initial as partial start has been performed"
 			 " and this filesystem is unusable");
     progError(__LINE__, 
-	      ERR_SR_RESTARTCONFLICT,
+	      NDBD_EXIT_SR_RESTARTCONFLICT,
 	      buf);
     ndbrequire(false);
   }

--- 1.84/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-03-22 15:24:29 +01:00
+++ 1.85/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-03-22 15:46:48 +01:00
@@ -18572,7 +18572,6 @@
 
   TcConnectionrec *regTcConnectionrec = tcConnectionrec;
   Uint32 ttcConnectrecFileSize = ctcConnectrecFileSize;
-  Uint32 arg = dumpState->args[0];
   if(arg == 2306)
   {
     for(Uint32 i = 0; i<1024; i++)

--- 1.8/ndb/include/mgmapi/ndbd_exit_codes.h	2005-10-13 16:38:30 +02:00
+++ 1.9/ndb/include/mgmapi/ndbd_exit_codes.h	2006-03-22 15:46:48 +01:00
@@ -74,9 +74,7 @@
 #define NDBD_EXIT_SR_OTHERNODEFAILED          2308
 #define NDBD_EXIT_NODE_NOT_DEAD               2309
 #define NDBD_EXIT_SR_REDOLOG                  2310
-/*
 #define NDBD_EXIT_SR_RESTARTCONFLICT          2311
-*/
 #define NDBD_EXIT_NO_MORE_UNDOLOG             2312 
 #define NDBD_EXIT_SR_UNDOLOG                  2313 
 #define NDBD_EXIT_MEMALLOC                    2327

--- 1.8/ndb/src/kernel/error/ndbd_exit_codes.c	2005-10-13 16:38:30 +02:00
+++ 1.9/ndb/src/kernel/error/ndbd_exit_codes.c	2006-03-22 15:46:49 +01:00
@@ -85,6 +85,9 @@
    */
    {NDBD_EXIT_OS_SIGNAL_RECEIVED, XIE, "Error OS signal received"},
 
+   {NDBD_EXIT_SR_RESTARTCONFLICT, XRE,
+    "Partial system restart causing conflicting file systems"},
+   
    /* VM */
    {NDBD_EXIT_OUT_OF_LONG_SIGNAL_MEMORY,    XCR,
     "Signal lost, out of long signal memory, please increase LongMessageBuffer"},

--- 1.19/ndb/tools/desc.cpp	2006-03-22 15:24:29 +01:00
+++ 1.20/ndb/tools/desc.cpp	2006-03-22 15:46:49 +01:00
@@ -119,7 +119,7 @@
       ndbout << endl;
       
       if (_partinfo)
-	print_part_info(pMyNdb, pTab);
+	print_part_info(&MyNdb, pTab);
     }
     else
       ndbout << argv[i] << ": " << dict->getNdbError() << endl;
@@ -159,8 +159,8 @@
     if (pOp == NULL)
       break;
     
-    NdbResultSet* rs= pOp->readTuples(NdbOperation::LM_CommittedRead); 
-    if (rs == 0)
+    int rs = pOp->readTuples(NdbOperation::LM_CommittedRead); 
+    if (rs != 0)
       break;
     
     if (pOp->interpret_exit_last_row() != 0)
@@ -183,7 +183,7 @@
       ndbout << g_part_info[i].m_title << "\t";
     ndbout << endl;
     
-    while(rs->nextResult() == 0)
+    while(pOp->nextResult() == 0)
     {
       for(i = 0; g_part_info[i].m_title != 0; i++)
       {