Commit 3511385c authored by unknown's avatar unknown
Browse files

fix merge problem

parent 1b7ac273

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

+2 −2
Original line number Diff line number Diff line
@@ -169,8 +169,8 @@ void Dbtup::execCONTINUEB(Signal* signal) 
  case ZREPORT_MEMORY_USAGE:{

    ljam();

    static int c_currentMemUsed = 0;

    Uint32 sz = c_page_pool.getSize();

    int now = sz ? (cnoOfAllocatedPages * 100)/sz : 0;

    Uint32 tmp = c_page_pool.getSize();

    int now = tmp ? (cnoOfAllocatedPages * 100)/tmp : 0;

    const int thresholds[] = { 100, 90, 80, 0 };

    

    Uint32 i = 0;