fix merge problem

64cba867 · jonas@perch.ndb.mysql.com · 44310b14 · 64cba867
Commit 64cba867 authored Oct 13, 2006 by jonas@perch.ndb.mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp +2 -2

No files found.
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
@@ -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;