Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Long-term solution for #2632 #8130

Closed
wants to merge 2 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions src/dsql/DsqlCompilerScratch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -430,16 +430,19 @@ void DsqlCompilerScratch::genReturn(bool eosFlag)
appendUChar(1);
appendUChar(blr_begin);

for (Array<dsql_var*>::const_iterator i = outputVariables.begin(); i != outputVariables.end(); ++i)
if (!hasEos || !eosFlag) // Generate full assignment list only if it is not EOS assignment. See CORE-2204.
{
const dsql_var* variable = *i;
appendUChar(blr_assignment);
appendUChar(blr_variable);
appendUShort(variable->number);
appendUChar(blr_parameter2);
appendUChar(variable->msgNumber);
appendUShort(variable->msgItem);
appendUShort(variable->msgItem + 1);
for (Array<dsql_var*>::const_iterator i = outputVariables.begin(); i != outputVariables.end(); ++i)
{
const dsql_var* variable = *i;
appendUChar(blr_assignment);
appendUChar(blr_variable);
appendUShort(variable->number);
appendUChar(blr_parameter2);
appendUChar(variable->msgNumber);
appendUShort(variable->msgItem);
appendUShort(variable->msgItem + 1);
}
}

if (hasEos)
Expand Down
Loading