Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/TD-31599

This commit is contained in:
54liuyao 2024-08-22 11:07:17 +08:00
commit 7f6ed40bec
2 changed files with 3 additions and 5 deletions

View File

@ -98,11 +98,6 @@
# enable/disable system monitor # enable/disable system monitor
# monitor 1 # monitor 1
# enable/disable audit log
# audit 1
# enable/disable audit create table
# auditCreateTable 1
# The following parameter is used to limit the maximum number of lines in log files. # The following parameter is used to limit the maximum number of lines in log files.
# max number of lines per log filters # max number of lines per log filters

View File

@ -2368,6 +2368,9 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow, bool *pIgnoreEarlie
if (!state->pIndexList) { if (!state->pIndexList) {
state->pIndexList = taosArrayInit(1, sizeof(SBrinBlk)); state->pIndexList = taosArrayInit(1, sizeof(SBrinBlk));
if (!state->pIndexList) {
TAOS_CHECK_GOTO(TSDB_CODE_OUT_OF_MEMORY, &lino, _err);
}
} else { } else {
taosArrayClear(state->pIndexList); taosArrayClear(state->pIndexList);
} }