浏览代码

Merge branch 'candidate-6.0.0'

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 9 年之前
父节点
当前提交
f1995939e1
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      roxie/roxiemem/roxiemem.cpp

+ 2 - 0
roxie/roxiemem/roxiemem.cpp

@@ -3800,6 +3800,8 @@ public:
         if (spillSize > systemMemoryLimit)
         if (spillSize > systemMemoryLimit)
             spillSize = systemMemoryLimit;
             spillSize = systemMemoryLimit;
         maxPageLimit = (unsigned) PAGES(bytes, HEAP_ALIGNMENT_SIZE);
         maxPageLimit = (unsigned) PAGES(bytes, HEAP_ALIGNMENT_SIZE);
+        if (maxPageLimit == 0)
+            maxPageLimit = UNLIMITED_PAGES;
         spillPageLimit = (unsigned) PAGES(spillSize, HEAP_ALIGNMENT_SIZE);
         spillPageLimit = (unsigned) PAGES(spillSize, HEAP_ALIGNMENT_SIZE);
 
 
         if (memTraceLevel >= 2)
         if (memTraceLevel >= 2)