Commit fabab792 authored by unknown's avatar unknown
Browse files

Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.0-rpl 

into  dl145k.mysql.com:/data0/mkindahl/bk/MERGE/mysql-5.0-merge


ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
parents 4ce8ca64 001c7f5f

ndb/include/kernel/GlobalSignalNumbers.h

+7 −4
Original line number Diff line number Diff line
@@ -507,16 +507,12 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_TEST_ORD                    407

#define GSN_TESTSIG                     408

#define GSN_TIME_SIGNAL                 409

/* 410 unused  */

/* 411 unused  */

/* 412 unused */

#define GSN_TUP_ABORTREQ                414

#define GSN_TUP_ADD_ATTCONF             415

#define GSN_TUP_ADD_ATTRREF             416

#define GSN_TUP_ADD_ATTRREQ             417

#define GSN_TUP_ATTRINFO                418

#define GSN_TUP_COMMITREQ               419

/* 420 unused */

#define GSN_TUP_LCPCONF                 421

#define GSN_TUP_LCPREF                  422

#define GSN_TUP_LCPREQ                  423
@@ -591,6 +587,7 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_BLOCK_COMMIT_ORD            485

#define GSN_UNBLOCK_COMMIT_ORD          486



#define GSN_NODE_START_REP              502

#define GSN_NODE_STATE_REP              487

#define GSN_CHANGE_NODE_STATE_REQ       488

#define GSN_CHANGE_NODE_STATE_CONF      489
@@ -938,4 +935,10 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_ACC_LOCKREQ			711

#define GSN_READ_PSUEDO_REQ             712



/* DICT LOCK signals */

#define GSN_DICT_LOCK_REQ               410

#define GSN_DICT_LOCK_CONF              411

#define GSN_DICT_LOCK_REF               412

#define GSN_DICT_UNLOCK_ORD             420



#endif

ndb/include/kernel/signaldata/AlterTable.hpp

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ public: 
    InvalidTableVersion = 241,

    DropInProgress      = 283,

    Busy = 701,

    BusyWithNR = 711,

    NotMaster = 702,

    InvalidFormat = 703,

    AttributeNameTooLong = 704,

ndb/include/kernel/signaldata/CreateTable.hpp

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ public: 
  enum ErrorCode {

    NoError = 0,

    Busy = 701,

    BusyWithNR = 711,

    NotMaster = 702,

    InvalidFormat = 703,

    AttributeNameTooLong = 704,

ndb/include/kernel/signaldata/DictLock.hpp

0 → 100644
+78 −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 DICT_LOCK_HPP

#define DICT_LOCK_HPP



#include "SignalData.hpp"



// see comments in Dbdict.hpp



class DictLockReq {

  friend class Dbdict;

  friend class Dbdih;

public:

  STATIC_CONST( SignalLength = 3 );

  enum LockType {

    NoLock = 0,

    NodeRestartLock = 1

  };

private:

  Uint32 userPtr;

  Uint32 lockType;

  Uint32 userRef;

};



class DictLockConf {

  friend class Dbdict;

  friend class Dbdih;

public:

  STATIC_CONST( SignalLength = 3 );

private:

  Uint32 userPtr;

  Uint32 lockType;

  Uint32 lockPtr;

};



class DictLockRef {

  friend class Dbdict;

  friend class Dbdih;

public:

  STATIC_CONST( SignalLength = 3 );

  enum ErrorCode {

    NotMaster = 1,

    InvalidLockType = 2,

    BadUserRef = 3,

    TooLate = 4,

    TooManyRequests = 5

  };

private:

  Uint32 userPtr;

  Uint32 lockType;

  Uint32 errorCode;

};



class DictUnlockOrd {

  friend class Dbdict;

  friend class Dbdih;

public:

  STATIC_CONST( SignalLength = 2 );

private:

  Uint32 lockPtr;

  Uint32 lockType;

};



#endif

ndb/include/kernel/signaldata/DropTable.hpp

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ public: 
  

  enum ErrorCode {

    Busy = 701,

    BusyWithNR = 711,

    NotMaster = 702,

    NoSuchTable         = 709,

    InvalidTableVersion = 241,