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

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

This commit is contained in:
hjxilinx 2020-01-16 16:38:48 +08:00
parent 18fd1c6c26 dc87eda7c4
commit 5212e36e11
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/src/tscSQLParserImpl.c
View File

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

12
src/client/src/tscServer.c
View File

@ -2124,10 +2124,18 @@ int32_t tscBuildDropTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
SSqlCmd *pCmd = &pSql->cmd; 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; pDropTableMsg = (SDropTableMsg *)pMsg;
SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
strcpy(pDropTableMsg->meterId, pMeterMetaInfo->name); strcpy(pDropTableMsg->meterId, pMeterMetaInfo->name);
pDropTableMsg->igNotExists = pInfo->pDCLInfo->existsCheck ? 1 : 0; pDropTableMsg->igNotExists = pInfo->pDCLInfo->existsCheck ? 1 : 0;