database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-11 01:42:22 +03:00
Code Activity

Merge fixes from trunk into the jsonb branch.

Browse Source 
FossilOrigin-Name: a760bd7bcc63aac41c989bb5f4fbc927f9a93fe9c0aa18da2f0131483ec3f189
This commit is contained in:
drh
2023-10-12 17:47:50 +00:00
parent 7d1c9da62d 5d9a6c6734
commit c7ad9f65fa
10 changed files with 213 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/malloc.c
View File

@@ -896,5 +896,5 @@ int sqlite3ApiExit(sqlite3* db, int rc){
if( db->mallocFailed || rc ){
return apiHandleError(db, rc);
}
return rc & db->errMask;
return 0;
}

2
src/pager.c
View File

@@ -7369,7 +7369,7 @@ int sqlite3PagerSetJournalMode(Pager *pPager, int eMode){
}
assert( state==pPager->eState );
}
}else if( eMode==PAGER_JOURNALMODE_OFF ){
}else if( eMode==PAGER_JOURNALMODE_OFF || eMode==PAGER_JOURNALMODE_MEMORY ){
sqlite3OsClose(pPager->jfd);
}
}

6
src/shell.c.in
View File

@@ -8772,8 +8772,10 @@ static int do_meta_command(char *zLine, ShellState *p){
"SELECT rowid FROM sqlite_schema"
" WHERE name GLOB 'sqlite_stat[134]'",
-1, &pStmt, 0);
doStats = sqlite3_step(pStmt)==SQLITE_ROW;
sqlite3_finalize(pStmt);
if( rc==SQLITE_OK ){
doStats = sqlite3_step(pStmt)==SQLITE_ROW;
sqlite3_finalize(pStmt);
}
}
if( doStats==0 ){
raw_printf(p->out, "/* No STAT tables available */\n");