From 50e36147305f46588c786dd227fcafbecaf1d49d Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Wed, 10 May 2017 22:59:52 +0100
Subject: [PATCH] MCOL-707 Fix memory accounting for ORDER BY

Missed off window function order by memory accounting in my first commit
for MCOL-707. Fixed in the same way
---
 utils/windowfunction/idborderby.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/windowfunction/idborderby.cpp b/utils/windowfunction/idborderby.cpp
index 2add7c7f2..1375af542 100644
--- a/utils/windowfunction/idborderby.cpp
+++ b/utils/windowfunction/idborderby.cpp
@@ -339,13 +339,13 @@ void IdbOrderBy::initialize(const RowGroup& rg)
 	IdbCompare::initialize(rg);
 
 	uint64_t newSize = fRowsPerRG * rg.getRowSize();
-	if (!fRm->getMemory(newSize, fSessionMemLimit))
+	fMemSize += newSize;
+    if (!fRm->getMemory(newSize, fSessionMemLimit))
 	{
 		cerr << IDBErrorInfo::instance()->errorMsg(fErrorCode)
 			 << " @" << __FILE__ << ":" << __LINE__;
 		throw IDBExcept(fErrorCode);
 	}
-	fMemSize += newSize;
 	fData.reinit(fRowGroup, fRowsPerRG);
 	fRowGroup.setData(&fData);
 	fRowGroup.resetRowGroup(0);