List:Commits« Previous MessageNext Message »
From:tomas Date:January 27 2006 5:17pm
Subject:bk commit into 5.1 tree (tomas:1.1983)
View as plain text  
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
  1.1983 06/01/27 18:17:39 tomas@stripped +3 -0
  bug16772 correction

  storage/ndb/include/kernel/signaldata/AllocNodeId.hpp
    1.1 06/01/27 18:17:34 tomas@stripped +65 -0
    New BitKeeper file ``storage/ndb/include/kernel/signaldata/AllocNodeId.hpp''

  storage/ndb/src/ndbapi/ndberror.c
    1.47 06/01/27 18:17:34 tomas@stripped +3 -3
    bug16772 correction

  storage/ndb/include/kernel/signaldata/AllocNodeId.hpp
    1.0 06/01/27 18:17:34 tomas@stripped +0 -0
    BitKeeper file /home/tomas/wl2325-alcatel/storage/ndb/include/kernel/signaldata/AllocNodeId.hpp

  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.26 06/01/27 18:17:33 tomas@stripped +1 -1
    bug16772 correction

# 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/wl2325-alcatel

--- 1.25/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2006-01-27 17:43:28 +01:00
+++ 1.26/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2006-01-27 18:17:33 +01:00
@@ -4099,7 +4099,7 @@
   {
     opAllocNodeIdReq.m_tracker.reportRef(c_counterMgr,
                                          refToNode(ref->senderRef));
-    if (opAllocNodeIdReq.m_error != 0)
+    if (opAllocNodeIdReq.m_error == 0)
       opAllocNodeIdReq.m_error = ref->errorCode;
   }
   completeAllocNodeIdReq(signal);

--- 1.46/storage/ndb/src/ndbapi/ndberror.c	2006-01-27 17:43:28 +01:00
+++ 1.47/storage/ndb/src/ndbapi/ndberror.c	2006-01-27 18:17:34 +01:00
@@ -411,9 +411,9 @@
    */ 
 
   { 1600, DMEC, IE, "Undefined error" },
-  { 1601, DMEC, AE, "Node already reserved" },
-  { 1602, DMEC, AE, "Node already connected" },
-  { 1603, DMEC, AE, "Node failure handling not completed" },
+  { 1601, DMEC, TR, "Node already reserved" },
+  { 1602, DMEC, CE, "Node already connected" },
+  { 1603, DMEC, TR, "Node failure handling not completed" },
   
   /**
    * Still uncategorized
--- New file ---
+++ storage/ndb/include/kernel/signaldata/AllocNodeId.hpp	06/01/27 18:17:34
/* Copyright (C) 2003 MySQL AB

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

#ifndef ALLOC_NODE_ID_HPP
#define ALLOC_NODE_ID_HPP

#include "SignalData.hpp"
#include <NodeBitmask.hpp>

/**
 * Request to allocate node id
 */
class AllocNodeIdReq {
public:
  STATIC_CONST( SignalLength = 3 );

  Uint32 senderRef;
  Uint32 senderData;
  Uint32 nodeId;
};

class AllocNodeIdConf {
public:
  STATIC_CONST( SignalLength = 3 );

  Uint32 senderRef;
  Uint32 senderData;
  Uint32 nodeId;
};

class AllocNodeIdRef {
public:
  STATIC_CONST( SignalLength = 5 );

  enum ErrorCodes {
    NoError = 0,
    Undefined = 1,
    NF_FakeErrorREF = 11,
    Busy  = 701,
    NotMaster  = 702,
    NodeReserved = 1601,
    NodeConnected = 1602,
    NodeFailureHandlingNotCompleted = 1603
  };

  Uint32 senderRef;
  Uint32 senderData;
  Uint32 nodeId;
  Uint32 errorCode;
  Uint32 masterRef;
};
#endif

Thread
bk commit into 5.1 tree (tomas:1.1983)tomas27 Jan