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

src/client/src/tscSQLParserImpl.c

@@ -861,11 +861,15 @@ void setAlterUserSQL(SSqlInfo *pInfo, int16_t type, SSQLToken *pName, SSQLToken*
   if (pPwd != NULL) {
     pUser->passwd = *pPwd;
 //    pUser->hasPasswd = true;
+  } else {
+    pUser->passwd.type = TSDB_DATA_TYPE_NULL;
   }
   
   if (pPrivilege != NULL) {
     pUser->privilege = *pPrivilege;
 //    pUser->hasPrivilege = true;
+  } else {
+    pUser->privilege.type = TSDB_DATA_TYPE_NULL;
   }
 }
 

src/client/src/tscServer.c

@@ -2124,10 +2124,18 @@ int32_t tscBuildDropTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 
   SSqlCmd *pCmd = &pSql->cmd;
 
-  pMsg = doBuildMsgHeader(pSql, &pStart);
+  //pMsg = doBuildMsgHeader(pSql, &pStart);
+  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
+
+  pMsg   = pCmd->payload + tsRpcHeadSize;
+  pStart = pMsg;
+
+  SMgmtHead *pMgmt = (SMgmtHead *)pMsg;
+  tscGetDBInfoFromMeterId(pMeterMetaInfo->name, pMgmt->db);
+  pMsg += sizeof(SMgmtHead);
+
   pDropTableMsg = (SDropTableMsg *)pMsg;
 
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
   strcpy(pDropTableMsg->meterId, pMeterMetaInfo->name);
 
   pDropTableMsg->igNotExists = pInfo->pDCLInfo->existsCheck ? 1 : 0;