Merge branch '2.1' into 2.2

This commit is contained in:
Johan Wikman
2017-12-27 11:28:26 +02:00

View File

@ -853,7 +853,10 @@ public:
{ {
if (zToken[1] == '@') if (zToken[1] == '@')
{ {
if ((prev_token == TK_EQ) && (pos == QC_TOKEN_LEFT)) // TODO: This should actually be "... && (m_operation == QUERY_OP_SET)"
// TODO: but there is no QUERY_OP_SET at the moment.
if ((prev_token == TK_EQ) && (pos == QC_TOKEN_LEFT) &&
(m_operation != QUERY_OP_SELECT))
{ {
m_type_mask |= QUERY_TYPE_GSYSVAR_WRITE; m_type_mask |= QUERY_TYPE_GSYSVAR_WRITE;
} }