Kaydet (Commit) 90c3e690 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

tdf#89048 Macab initialize record list even for never-match condition.

Change-Id: I323f6532d00f30cde50616e9399cad6bbe00cb8c
üst f5d305a6
...@@ -86,6 +86,11 @@ void MacabResultSet::someMacabRecords(const MacabCondition *pCondition) ...@@ -86,6 +86,11 @@ void MacabResultSet::someMacabRecords(const MacabCondition *pCondition)
// maximum alloted size, which means that we'll never have to resize) // maximum alloted size, which means that we'll never have to resize)
m_aMacabRecords = new MacabRecords(allRecords); m_aMacabRecords = new MacabRecords(allRecords);
if(pCondition->isAlwaysFalse())
{
return;
}
MacabRecords::iterator iterator; MacabRecords::iterator iterator;
for (iterator = allRecords->begin(); for (iterator = allRecords->begin();
......
...@@ -329,7 +329,7 @@ void MacabCommonStatement::selectRecords(MacabResultSet *pResult) const throw(SQ ...@@ -329,7 +329,7 @@ void MacabCommonStatement::selectRecords(MacabResultSet *pResult) const throw(SQ
MacabCondition *pCondition = analyseWhereClause(pParseNode); MacabCondition *pCondition = analyseWhereClause(pParseNode);
if (pCondition->isAlwaysTrue()) if (pCondition->isAlwaysTrue())
pResult->allMacabRecords(); pResult->allMacabRecords();
else if (!pCondition->isAlwaysFalse()) else
pResult->someMacabRecords(pCondition); pResult->someMacabRecords(pCondition);
delete pCondition; delete pCondition;
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment