fix:[TD-32526] conflicts from 3.0
This commit is contained in:
parent
fbed901add
commit
2e3bebe405
|
@ -690,6 +690,7 @@ int32_t tqRetrieveDataBlock(STqReader* pReader, SSDataBlock** pRes, const char*
|
||||||
code = buildResSDataBlock(pReader, pReader->pSchemaWrapper, pReader->pColIdList);
|
code = buildResSDataBlock(pReader, pReader->pSchemaWrapper, pReader->pColIdList);
|
||||||
TSDB_CHECK_CODE(code, line, END);
|
TSDB_CHECK_CODE(code, line, END);
|
||||||
pBlock = pReader->pResBlock;
|
pBlock = pReader->pResBlock;
|
||||||
|
*pRes = pBlock;
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t numOfRows = 0;
|
int32_t numOfRows = 0;
|
||||||
|
|
Loading…
Reference in New Issue