Commit 2b1df537 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/51-work 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
parents edfeedb6 fae72af5

storage/ndb/include/kernel/GlobalSignalNumbers.h

+1 −2
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_ACC_ABORTCONF               67

/* 68 not unused */

/* 69 not unused */

/* 70 unused */

#define GSN_UPDATE_FRAG_DIST_KEY_ORD    70

#define GSN_ACC_ABORTREQ                71

#define GSN_ACC_CHECK_SCAN              72
@@ -183,7 +182,7 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_CNTR_START_CONF             118

#define GSN_CNTR_START_REP              119

/* 120 not unused */

/* 121 unused */

#define GSN_ROUTE_ORD                   121

/* 122 unused */

/* 123 unused */

/* 124 unused */

storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ public: 
    TuxSetLogFlags = 12002,

    TuxMetaDataJunk = 12009,

    

    DumpTsman = 9002, 

    DumpTsman = 9800, 

    DumpLgman = 10000,

    DumpPgman = 11000

  };

storage/ndb/include/kernel/signaldata/RouteOrd.hpp

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/* 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 ROUTE_ORD_HPP

#define ROUTE_ORD_HPP



#include "SignalData.hpp"

#include <NodeBitmask.hpp>



/**

 * Request to allocate node id

 */

struct RouteOrd {

  STATIC_CONST( SignalLength = 4 );



  Uint32 dstRef;

  Uint32 srcRef;

  Uint32 gsn;

  Uint32 cnt;

};



#endif

storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp

+3 −2
Original line number Diff line number Diff line
@@ -20,9 +20,10 @@ 
bool 

printBACKUP_REQ(FILE * output, const Uint32 * theData, Uint32 len, Uint16 bno){

  BackupReq* sig = (BackupReq*)theData;

  fprintf(output, " senderData: %d DataLength: %d\n", 

  fprintf(output, " senderData: %d DataLength: %d flags: %d\n", 

	  sig->senderData,

	  sig->backupDataLen);

	  sig->backupDataLen,

	  sig->flags);

  return true;

}

storage/ndb/src/common/debugger/signaldata/SignalNames.cpp

+2 −0
Original line number Diff line number Diff line
@@ -635,5 +635,7 @@ const GsnName SignalNames [] = { 


  ,{ GSN_UPDATE_FRAG_DIST_KEY_ORD, "UPDATE_FRAG_DIST_KEY_ORD" }

  ,{ GSN_DICT_COMMIT_REQ,  "DICT_COMMIT_REQ"}



  ,{ GSN_ROUTE_ORD, "ROUTE_ORD" }

};

const unsigned short NO_OF_SIGNAL_NAMES = sizeof(SignalNames)/sizeof(GsnName);