From c7ae4f57893a4e3af2b511b9ad0cac9d9b937ee2 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 29 Jul 2021 10:47:09 +0800
Subject: [PATCH] [td-5600]<fix>: fix fill caused crashed in join query.

---
 src/client/src/tscUtil.c             | 1 +
 src/os/src/detail/osTimer.c          | 2 +-
 tests/script/general/parser/join.sim | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 9dc541b1a6..b9a9333fd7 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -3190,6 +3190,7 @@ static void freeQueryInfoImpl(SQueryInfo* pQueryInfo) {
   }
   
   pQueryInfo->tsBuf = tsBufDestroy(pQueryInfo->tsBuf);
+  pQueryInfo->fillType = 0;
 
   tfree(pQueryInfo->fillVal);
   tfree(pQueryInfo->buf);
diff --git a/src/os/src/detail/osTimer.c b/src/os/src/detail/osTimer.c
index c381b3e825..618df8a8ba 100644
--- a/src/os/src/detail/osTimer.c
+++ b/src/os/src/detail/osTimer.c
@@ -38,7 +38,7 @@ static void *taosProcessAlarmSignal(void *tharg) {
 
   struct sigevent sevent = {{0}};
 
-  setThreadName("alarmSignal");
+  setThreadName("tmr");
 
   #ifdef _ALPINE
     sevent.sigev_notify = SIGEV_THREAD;
diff --git a/tests/script/general/parser/join.sim b/tests/script/general/parser/join.sim
index 2c14a86c3a..e2132589bd 100644
--- a/tests/script/general/parser/join.sim
+++ b/tests/script/general/parser/join.sim
@@ -444,6 +444,10 @@ if $rows != $val then
   return -1
 endi
 
+print ================>TD-5600
+sql select first(join_tb0.c8),first(join_tb0.c9) from join_tb1 , join_tb0 where join_tb1.ts = join_tb0.ts and join_tb1.ts <= 100002 and join_tb1.ts>=100000 interval(1s) fill(linear);
+
+
 #===============================================================
 sql select first(join_tb0.c8),first(join_tb0.c9) from join_tb1 , join_tb0 where join_tb1.ts = join_tb0.ts and join_tb1.ts <= 100002 and join_tb0.c7 = true
 
-- 
GitLab