提交 37a250de 编写于 作者: P Ping Xiao

Merge branch '2.6' into cases/TS-841

...@@ -7,7 +7,6 @@ LFLAGS = '-Wl,-rpath,/usr/local/taos/driver/' -ltaos -lpthread -lm -lrt ...@@ -7,7 +7,6 @@ LFLAGS = '-Wl,-rpath,/usr/local/taos/driver/' -ltaos -lpthread -lm -lrt
CFLAGS = -O3 -g -Wall -Wno-deprecated -fPIC -Wno-unused-result -Wconversion \ CFLAGS = -O3 -g -Wall -Wno-deprecated -fPIC -Wno-unused-result -Wconversion \
-Wno-char-subscripts -D_REENTRANT -Wno-format -D_REENTRANT -DLINUX \ -Wno-char-subscripts -D_REENTRANT -Wno-format -D_REENTRANT -DLINUX \
-Wno-unused-function -D_M_X64 -I/usr/local/taos/include -std=gnu99 \ -Wno-unused-function -D_M_X64 -I/usr/local/taos/include -std=gnu99 \
-I../../../deps/cJson/inc \
-Wno-unused-function -D_M_X64 -I/usr/local/taos/include -std=gnu99 \ -Wno-unused-function -D_M_X64 -I/usr/local/taos/include -std=gnu99 \
-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment
......
...@@ -76,12 +76,21 @@ elif echo $osinfo | grep -qwi "debian"; then ...@@ -76,12 +76,21 @@ elif echo $osinfo | grep -qwi "debian"; then
elif echo $osinfo | grep -qwi "Kylin"; then elif echo $osinfo | grep -qwi "Kylin"; then
# echo "This is Kylin system" # echo "This is Kylin system"
os_type=1 os_type=1
elif echo $osinfo | grep -qwi "Red"; then
# echo "This is Red Hat system"
os_type=1
elif echo $osinfo | grep -qwi "centos"; then elif echo $osinfo | grep -qwi "centos"; then
# echo "This is centos system" # echo "This is centos system"
os_type=2 os_type=2
elif echo $osinfo | grep -qwi "fedora"; then elif echo $osinfo | grep -qwi "fedora"; then
# echo "This is fedora system" # echo "This is fedora system"
os_type=2 os_type=2
elif echo $osinfo | grep -qwi "Linx"; then
# echo "This is Linx system"
os_type=1
service_mod=0
initd_mod=0
service_config_dir="/etc/systemd/system"
else else
echo " osinfo: ${osinfo}" echo " osinfo: ${osinfo}"
echo " This is an officially unverified linux system," echo " This is an officially unverified linux system,"
......
Subproject commit 9cb71e3c4c0474553aa961cbe19795541c29b5c7 Subproject commit bd496f76b64931c66da2f8b0f24143a98a881cde
...@@ -97,9 +97,11 @@ typedef struct SIntervalVal { ...@@ -97,9 +97,11 @@ typedef struct SIntervalVal {
SStrToken offset; SStrToken offset;
} SIntervalVal; } SIntervalVal;
typedef struct tSqlExpr tSqlExprTimestamp;
typedef struct SRangeVal { typedef struct SRangeVal {
void *start; tSqlExprTimestamp *start;
void *end; tSqlExprTimestamp *end;
} SRangeVal; } SRangeVal;
typedef struct SSessionWindowVal { typedef struct SSessionWindowVal {
......
...@@ -1183,6 +1183,10 @@ void destroySqlNode(SSqlNode *pSqlNode) { ...@@ -1183,6 +1183,10 @@ void destroySqlNode(SSqlNode *pSqlNode) {
pSqlNode->fillType = NULL; pSqlNode->fillType = NULL;
tSqlExprDestroy(pSqlNode->pHaving); tSqlExprDestroy(pSqlNode->pHaving);
tSqlExprDestroy(pSqlNode->pRange.start);
tSqlExprDestroy(pSqlNode->pRange.end);
free(pSqlNode); free(pSqlNode);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册