Commit 5aaba829 authored by unknown's avatar unknown
Browse files

ndb - bug#18781 post-merge 5.0->5.1 fixes (one more to come) 

      have to push this to be able to push 5.0


storage/ndb/include/kernel/signaldata/DictLock.hpp:
  Rename: ndb/include/kernel/signaldata/DictLock.hpp -> storage/ndb/include/kernel/signaldata/DictLock.hpp
storage/ndb/src/kernel/blocks/dbdict/DictLock.txt:
  Rename: ndb/src/kernel/blocks/dbdict/DictLock.txt -> storage/ndb/src/kernel/blocks/dbdict/DictLock.txt
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  debug
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  bug#18781 post-merge 5.0->5.1 fixes (one more to come)
storage/ndb/src/ndbapi/ndberror.c:
  bug#18781 post-merge 5.0->5.1 fixes (one more to come)
storage/ndb/test/ndbapi/testDict.cpp:
  bug#18781 post-merge 5.0->5.1 fixes (one more to come)
storage/ndb/test/src/NdbRestarter.cpp:
  bug#18781 post-merge 5.0->5.1 fixes (one more to come)
parent 2dc4e170

storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp

+1 −0
Original line number Diff line number Diff line
@@ -1082,6 +1082,7 @@ private: 
    BlockState& operator=(const BlockState& bs) {

      Dbdict* dict = (Dbdict*)globalData.getBlock(DBDICT);

      dict->infoEvent("DICT: bs %d->%d", m_value, bs.m_value);

      globalSignalLoggers.log(DBDICT, "bs %d->%d", m_value, bs.m_value);

      m_value = bs.m_value;

      return *this;

    }

storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

+11 −7
Original line number Diff line number Diff line
@@ -15055,13 +15055,14 @@ Dbdih::sendDictLockReq(Signal* signal, Uint32 lockType, Callback c) 
  {

    Uint32 masterVersion = getNodeInfo(cmasterNodeId).m_version;









    unsigned int get_major = getMajor(masterVersion);









    unsigned int get_minor = getMinor(masterVersion);









    unsigned int get_build = getBuild(masterVersion);

















    ndbrequire(get_major == 4 || get_major == 5);









    const unsigned int get_major = getMajor(masterVersion);









    const unsigned int get_minor = getMinor(masterVersion);









    const unsigned int get_build = getBuild(masterVersion);









    ndbrequire(get_major >= 4);

















    if (masterVersion < NDBD_DICT_LOCK_VERSION_5 ||









        masterVersion < NDBD_DICT_LOCK_VERSION_5_1 &&









          get_major == 5 && get_minor == 1 ||









        ERROR_INSERTED(7176)) {









      jam();
















@@ -15132,10 +15133,13 @@ Dbdih::sendDictUnlockOrd(Signal* signal, Uint32 lockSlavePtrI)







  {









    Uint32 masterVersion = getNodeInfo(cmasterNodeId).m_version;

















    unsigned int get_major = getMajor(masterVersion);









    ndbrequire(get_major == 4 || get_major == 5);









    const unsigned int get_major = getMajor(masterVersion);









    const unsigned int get_minor = getMinor(masterVersion);









    ndbrequire(get_major >= 4);

















    if (masterVersion < NDBD_DICT_LOCK_VERSION_5 ||









        masterVersion < NDBD_DICT_LOCK_VERSION_5_1 &&









          get_major == 5 && get_minor == 1 ||









        ERROR_INSERTED(7176)) {









      return;









    }

























storage/ndb/src/ndbapi/ndberror.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -214,6 +214,7 @@ ErrorBundle ErrorCodes[] = {







   * OverloadError









   */









  { 701,  DMEC, OL, "System busy with other schema operation" },









  { 711,  DMEC, OL, "System busy with node restart, schema operations not allowed" },









  { 410,  DMEC, OL, "REDO log files overloaded, consult online manual (decrease TimeBetweenLocalCheckpoints, and|or increase NoOfFragmentLogFiles)" },









  { 677,  DMEC, OL, "Index UNDO buffers overloaded (increase UndoIndexBuffer)" },









  { 891,  DMEC, OL, "Data UNDO buffers overloaded (increase UndoDataBuffer)" },