Merge branch 'master' into develop

# Conflicts:
#	src/client/src/tscSQLParser.c

src/client/src/tscSQLParser.c

@@ -5340,7 +5340,7 @@ static int32_t checkUpdateTagPrjFunctions(SSqlCmd* pCmd) {
 
   for (int32_t i = 0; i < pCmd->fieldsInfo.numOfOutputCols; ++i) {
     int16_t functionId = tscSqlExprGet(pCmd, i)->functionId;
-    if (functionId == TSDB_FUNC_TAGPRJ || functionId == TSDB_FUNC_PRJ || functionId == TSDB_FUNC_TS ||
+    if (functionId == TSDB_FUNC_TAGPRJ || functionId == TSDB_FUNC_PRJ || functionId == TSDB_FUNC_TS || 
         functionId == TSDB_FUNC_ARITHM) {
       continue;
     }

src/util/src/version.c

 char version[64] = "1.6.4.2";
 char compatible_version[64] = "1.6.1.0";
-char gitinfo[128] = "e6445addc77e8c96dcb57221fa6ab5dcde0458f7";
-char buildinfo[512] = "Built by ubuntu at 2019-12-06 13:59";
+char gitinfo[128] = "b9a62d60dc1d4a41452a9bc94e3a0924485c3a75";
+char gitinfoOfInternal[128] = "e6445addc77e8c96dcb57221fa6ab5dcde0458f7";
+char buildinfo[512] = "Built by root at 2019-12-10 10:31";