diff --git a/source/dnode/mnode/impl/src/mndGrant.c b/source/dnode/mnode/impl/src/mndGrant.c index c97d4dd807..15aa55ef83 100644 --- a/source/dnode/mnode/impl/src/mndGrant.c +++ b/source/dnode/mnode/impl/src/mndGrant.c @@ -14,12 +14,13 @@ */ #define _DEFAULT_SOURCE -#ifndef _GRANT #include "os.h" #include "taoserror.h" #include "mndGrant.h" #include "mndInt.h" +#ifndef _GRANT + int32_t mndInitGrant(SMnode *pMnode) { return TSDB_CODE_SUCCESS; } void mndCleanupGrant() {} void grantParseParameter() { mError("can't parsed parameter k"); } @@ -30,4 +31,4 @@ void grantRestore(EGrantType grant, uint64_t value) {} #endif -void parseGrantParameter() { parseGrantParameter(); } \ No newline at end of file +void parseGrantParameter() { grantParseParameter(); } \ No newline at end of file diff --git a/source/dnode/mnode/impl/src/mndUser.c b/source/dnode/mnode/impl/src/mndUser.c index e2b1725d9c..054bff466c 100644 --- a/source/dnode/mnode/impl/src/mndUser.c +++ b/source/dnode/mnode/impl/src/mndUser.c @@ -652,24 +652,26 @@ static int32_t mndRetrieveUsers(SNodeMsg *pReq, SShowObj *pShow, SSDataBlock* pB if (pShow->pIter == NULL) break; cols = 0; - - SColumnInfoData* pColInfo = taosArrayGet(pBlock->pDataBlock, cols++); + SColumnInfoData* pColInfo = taosArrayGet(pBlock->pDataBlock, cols); char name[TSDB_USER_LEN + VARSTR_HEADER_SIZE] = {0}; STR_WITH_MAXSIZE_TO_VARSTR(name, pUser->user, pShow->bytes[cols]); colDataAppend(pColInfo, numOfRows, (const char*) name, false); - pColInfo = taosArrayGet(pBlock->pDataBlock, cols++); + cols++; + pColInfo = taosArrayGet(pBlock->pDataBlock, cols); const char* src = pUser->superUser? "super":"normal"; char b[10+VARSTR_HEADER_SIZE] = {0}; STR_WITH_SIZE_TO_VARSTR(b, src, strlen(src)); colDataAppend(pColInfo, numOfRows, (const char*) b, false); - pColInfo = taosArrayGet(pBlock->pDataBlock, cols++); + cols++; + pColInfo = taosArrayGet(pBlock->pDataBlock, cols); colDataAppend(pColInfo, numOfRows, (const char*) &pUser->createdTime, false); + cols++; pColInfo = taosArrayGet(pBlock->pDataBlock, cols); STR_WITH_MAXSIZE_TO_VARSTR(name, pUser->acct, pShow->bytes[cols]); colDataAppend(pColInfo, numOfRows, (const char*) name, false);