Merge pull request #1242 from ghalliday/roxiemem2

Fix regression in roxiemem resizing rowsets smaller

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

roxie/roxiemem/roxiemem.cpp

@@ -1385,10 +1385,18 @@ public:
     {
         assertex(newsize);
         assertex(!HeapletBase::isShared(original));
-        assertex(newsize >= oldsize);
         capacity = HeapletBase::capacity(original);
         if (newsize <= capacity)
-            return original;
+        {
+            if (newsize >= oldsize || roundup(newsize) == roundup(oldsize))
+                return original;
+
+            void *ret = allocate(newsize, activityId);
+            memcpy(ret, original, newsize);
+            HeapletBase::release(original);
+            capacity = HeapletBase::capacity(ret);
+            return ret;
+        }
         else
         {
             void *ret = allocate(newsize, activityId);