Commit 6ad7d664 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/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged
parents 1c64c0fa 3fcc6915

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

+2 −1
Original line number Diff line number Diff line
@@ -212,7 +212,8 @@ public: 
    NullablePrimaryKey = 740,

    UnsupportedChange = 741,

    BackupInProgress = 762,

    IncompatibleVersions = 763

    IncompatibleVersions = 763,

    SingleUser = 299

  };



private:

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

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ public: 
    AllocationError = 4252,

    CreateIndexTableFailed = 4253,

    DuplicateAttributes = 4258,

    SingleUser = 299,

    TableIsTemporary = 776,

    TableIsNotTemporary = 777,

    NoLoggingTemporaryIndex = 778

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

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ public: 
    InvalidPrimaryKeySize  = 739,

    NullablePrimaryKey = 740,

    InvalidCharset = 743,

    SingleUser = 299,

    InvalidTablespace = 755,

    VarsizeBitfieldNotSupported = 757,

    NotATablespace = 758,

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

+2 −1
Original line number Diff line number Diff line
@@ -172,7 +172,8 @@ public: 
    IndexNotFound = 4243,

    BadRequestType = 4247,

    InvalidName = 4248,

    NotAnIndex = 4254

    NotAnIndex = 4254,

    SingleUser = 299

  };

  STATIC_CONST( SignalLength = DropIndxConf::SignalLength + 3 );

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

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ public: 
    InvalidTableVersion = 241,

    DropInProgress      = 283,

    NoDropTableRecordAvailable = 1229,

    BackupInProgress = 761

    BackupInProgress = 761,

    SingleUser = 299

  };

};