Commit be3d4002 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca 

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge
parents 4c3a363b af0554d1

sql/ha_ndbcluster.cc

+1 −1
Original line number Diff line number Diff line
@@ -3817,7 +3817,7 @@ int ha_ndbcluster::info(uint flag) 
  if (flag & HA_STATUS_AUTO)

  {

    DBUG_PRINT("info", ("HA_STATUS_AUTO"));

    if (m_table)

    if (m_table && table->found_next_number_field)

    {

      Ndb *ndb= get_ndb();

      Ndb_tuple_id_range_guard g(m_share);

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 );