xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/slguan' of https://github.com/taosdata/TDengine into feature/slguan

This commit is contained in:
slguan 2020-02-01 13:50:01 +08:00
parent 8d4b992f16 298d3e31ab
commit cacfba83c8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/detail/src/mgmtMeter.c
View File

@ -1186,6 +1186,8 @@ int mgmtRetrieveMetricMeta(SConnObj *pConn, char **pStart, SMetricMetaMsg *pMetr
int32_t * tagLen = calloc(1, sizeof(int32_t) * pMetricMetaMsg->numOfMeters); int32_t * tagLen = calloc(1, sizeof(int32_t) * pMetricMetaMsg->numOfMeters);
if (result == NULL || tagLen == NULL) { if (result == NULL || tagLen == NULL) {
tfree(result);
tfree(tagLen);
return -1; return -1;
} }

2
src/util/src/version.c
View File

@ -1,4 +1,4 @@
char version[64] = "1.6.5.1"; char version[64] = "1.6.5.3";
char compatible_version[64] = "1.6.1.0"; char compatible_version[64] = "1.6.1.0";
char gitinfo[128] = "751fa0239baa49c3aaa9b49e15f7812b17519800"; char gitinfo[128] = "751fa0239baa49c3aaa9b49e15f7812b17519800";
char gitinfoOfInternal[128] = ""; char gitinfoOfInternal[128] = "";