database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-10 01:02:56 +03:00
Code Activity

Merge recent trunk changes (such as the query_only PRAGMA, the

Browse Source 
defer_foreign_keys PRAGMA, and the SQLITE_DBSTATUS_DEFERRED_FKS parameter
to sqlite3_db_status()) into the sessions branch.

FossilOrigin-Name: 8dfc0b78c38e519b64a796243ff7c0aff688ff36
This commit is contained in:
drh
2013-07-11 15:31:57 +00:00
parent 07001c45a1 b1eaa718fd
commit 6f855952d0
9 changed files with 135 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.c
View File

@@ -1300,7 +1300,7 @@ void sqlite3_progress_handler(
sqlite3_mutex_enter(db->mutex);
if( nOps>0 ){
db->xProgress = xProgress;
db->nProgressOps = nOps;
db->nProgressOps = (unsigned)nOps;
db->pProgressArg = pArg;
}else{
db->xProgress = 0;