Commit 7542d1f7 authored by unknown's avatar unknown
Browse files

merge

parent abd3a43b

storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp

+5 −3
Original line number Diff line number Diff line
@@ -950,9 +950,10 @@ int Dbtup::handleReadReq(Signal* signal, 
    }

  } else {

    jam();

    if (likely(interpreterStartLab(signal, req_struct) != -1) {

    if (likely(interpreterStartLab(signal, req_struct) != -1)) {

      return 0;

    }

    return -1;

  }



  jam();
@@ -1046,7 +1047,8 @@ int Dbtup::handleUpdateReq(Signal* signal, 
                               req_struct->attrinfo_len);

  } else {

    jam();

    retValue= interpreterStartLab(signal, req_struct);

    if (unlikely(interpreterStartLab(signal, req_struct) == -1))

      return -1;

  }

  

  if (retValue == -1) {