[td-225] merge develop.

e7a6dae6 · Haojun Liao · 7a37f750 · e7a6dae6
隐藏空白更改
内联并排

Showing with 1 addition and 0 deletion

src/client/src/tscUtil.c src/client/src/tscUtil.c +1 -0

未找到文件。
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -3030,6 +3030,7 @@ int32_t tscQueryInfoCopy(SQueryInfo* pQueryInfo, const SQueryInfo* pSrc) {
  pQueryInfo->numOfTables    = 0;
  pQueryInfo->window         = pSrc->window;
  pQueryInfo->sessionWindow  = pSrc->sessionWindow;
+  pQueryInfo->globalMerge    = pSrc->globalMerge;
  pQueryInfo->pTableMetaInfo = NULL;

  pQueryInfo->bufLen         = pSrc->bufLen;