diff options
| author | drh <drh@noemail.net> | 2013-07-11 15:31:57 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-07-11 15:31:57 +0000 |
| commit | 6f855952d07e32967b84c790201da4b45d849722 (patch) | |
| tree | 61ad985a23e7575c56506c7c905f2965ea508715 /src/main.c | |
| parent | 07001c45a1cfe57cab888ddee16288d23f5fd344 (diff) | |
| parent | b1eaa718fdc61f87395ea92919be13e203754382 (diff) | |
| download | sqlite-6f855952d07e32967b84c790201da4b45d849722.tar.gz sqlite-6f855952d07e32967b84c790201da4b45d849722.zip | |
Merge recent trunk changes (such as the query_only PRAGMA, the
defer_foreign_keys PRAGMA, and the SQLITE_DBSTATUS_DEFERRED_FKS parameter
to sqlite3_db_status()) into the sessions branch.
FossilOrigin-Name: 8dfc0b78c38e519b64a796243ff7c0aff688ff36
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c index b25c43be3..263921aba 100644 --- a/src/main.c +++ b/src/main.c @@ -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; |