Commit f755cf9e authored by unknown's avatar unknown
Browse files

1) Removed to hard require 

2) Fix variable scope for irix compiler


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Remove part of require
ndb/test/src/NDBT_Tables.cpp:
  old compiler fix
parent d9e3b38f

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

+9 −1
Original line number Diff line number Diff line
@@ -5912,10 +5912,18 @@ void Dblqh::execACCKEYREF(Signal* signal) 
     * Only primary replica can get ZTUPLE_ALREADY_EXIST || ZNO_TUPLE_FOUND

     *

     * Unless it's a simple or dirty read

     *

     * NOT TRUE!

     * 1) op1 - primary insert ok

     * 2) op1 - backup insert fail (log full or what ever)

     * 3) op1 - delete ok @ primary

     * 4) op1 - delete fail @ backup

     *

     * -> ZNO_TUPLE_FOUND is possible

     */

    ndbrequire

      (tcPtr->seqNoReplica == 0 ||

       (errCode != ZTUPLE_ALREADY_EXIST && errCode != ZNO_TUPLE_FOUND) ||

       errCode != ZTUPLE_ALREADY_EXIST ||

       (tcPtr->operation == ZREAD && (tcPtr->dirtyOp || tcPtr->opSimple)));

  }

  tcPtr->abortState = TcConnectionrec::ABORT_FROM_LQH;

ndb/test/src/NDBT_Tables.cpp

+1 −1
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ NDBT_Tables::createTable(Ndb* pNdb, const char* _name, bool _temp, 
    }

    

    Uint32 i = 0;

    for(Uint32 i = 0; indexes[i].m_table != 0; i++){

    for(i = 0; indexes[i].m_table != 0; i++){

      if(strcmp(indexes[i].m_table, _name) != 0)

	continue;

      Uint32 j = 0;