Commit e958b49e authored by unknown's avatar unknown
Browse files

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

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


storage/ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  merge
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  merge
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  merge
storage/ndb/src/ndbapi/ndberror.c:
  merge
parents bfc5a0cc cc00d542

storage/ndb/src/common/util/NdbSqlUtil.cpp

+12 −7
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ NdbSqlUtil::m_typeList[] = { 
  },

  { // 22

    Type::Bit,

    NULL,

    cmpBit,

    NULL

  },

  { // 23
@@ -678,6 +678,17 @@ NdbSqlUtil::cmpText(const void* info, const void* p1, unsigned n1, const void* p 
  return 0;

}



int

NdbSqlUtil::cmpBit(const void* info, const void* p1, unsigned n1, const void* p2, unsigned n2, bool full)

{ 

  Uint32 n = (n1 < n2) ? n1 : n2;

  char* c1 = (char*)p1;

  char* c2 = (char*)p2;

  int ret = memcmp(p1, p2, n);

  return ret;

}





int

NdbSqlUtil::cmpTime(const void* info, const void* p1, unsigned n1, const void* p2, unsigned n2, bool full)

{
@@ -698,12 +709,6 @@ NdbSqlUtil::cmpTime(const void* info, const void* p1, unsigned n1, const void* p 
}



// not yet

int

NdbSqlUtil::cmpBit(const void* info, const void* p1, unsigned n1, const void* p2, unsigned n2, bool full)

{

  assert(false);

  return 0;

}



int

NdbSqlUtil::cmpLongvarchar(const void* info, const void* p1, unsigned n1, const void* p2, unsigned n2, bool full)

storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp

+10 −12
Original line number Diff line number Diff line
@@ -366,6 +366,16 @@ void Cmvmi::execSTTOR(Signal* signal) 
  jamEntry();

  if (theStartPhase == 1){

    jam();



    if(theConfig.lockPagesInMainMemory())

    {

      int res = NdbMem_MemLockAll();

      if(res != 0){

	g_eventLogger.warning("Failed to memlock pages");

	warningEvent("Failed to memlock pages");

      }

    }

    

    sendSTTORRY(signal);

    return;

  } else if (theStartPhase == 3) {
@@ -381,18 +391,6 @@ void Cmvmi::execSTTOR(Signal* signal) 
    signal->theData[2] = NodeInfo::API;

    execOPEN_COMREQ(signal);

    globalData.theStartLevel = NodeState::SL_STARTED;

    sendSTTORRY(signal);

  } else {

    jam();



    if(m_ctx.m_config.lockPagesInMainMemory()){

      int res = NdbMem_MemLockAll();

      if(res != 0){

	g_eventLogger.warning("Failed to memlock pages");

	warningEvent("Failed to memlock pages");

      }

    }

    

    sendSTTORRY(signal);

  }

}

storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp

+1 −1
Original line number Diff line number Diff line
@@ -1617,7 +1617,7 @@ private: 
  void dump_replica_info();



  // DIH specifics for execNODE_START_REP (sendDictUnlockOrd)

  void exec_node_start_rep(Signal* signal);

  void execNODE_START_REP(Signal* signal);



  /*

   * Lock master DICT.  Only current use is by starting node

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

+2 −1
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ Dbdih::Dbdih(Block_context& ctx): 


  addRecSignal(GSN_DICT_LOCK_CONF, &Dbdih::execDICT_LOCK_CONF);

  addRecSignal(GSN_DICT_LOCK_REF, &Dbdih::execDICT_LOCK_REF);

  addRecSignal(GSN_NODE_START_REP, &Dbdih::execNODE_START_REP);

  

  addRecSignal(GSN_START_FRAGREF,

	       &Dbdih::execSTART_FRAGREF);

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

+1 −1
Original line number Diff line number Diff line
@@ -1421,7 +1421,7 @@ void Dbdih::execNDB_STTOR(Signal* signal) 
}//Dbdih::execNDB_STTOR()









void









Dbdih::exec_node_start_rep(Signal* signal)









Dbdih::execNODE_START_REP(Signal* signal)









{









  /*









   * Send DICT_UNLOCK_ORD when this node is SL_STARTED.