From e7a6dae6e997f2c76c23b3a5c92c9a03733fdae9 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 6 Jul 2021 23:44:35 +0800
Subject: [PATCH] [td-225] merge develop.

---
 src/client/src/tscUtil.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index ee69111900..f19c6e8368 100644
--- 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;
-- 
GitLab