diff options
| author | drh <drh@noemail.net> | 2012-09-27 12:11:25 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2012-09-27 12:11:25 +0000 |
| commit | cec320fb0e09e1b7f0bb1ecefb67066aa2d14095 (patch) | |
| tree | 9066972047542eae935ced24bd0f2f07b4c69a36 /src/main.c | |
| parent | 4d85fa760f28582b4482e98878f7777f8d1fa873 (diff) | |
| parent | 50610df8ae1a03d971d732685549443c6a6c26d3 (diff) | |
| download | sqlite-cec320fb0e09e1b7f0bb1ecefb67066aa2d14095.tar.gz sqlite-cec320fb0e09e1b7f0bb1ecefb67066aa2d14095.zip | |
Merge the "PRAGMA busy_timeout" change into trunk.
FossilOrigin-Name: 1a679a1ef3b4f2d898c8cd83432d2b4c12bd93fa
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c index 466dee551..66ef9fc4f 100644 --- a/src/main.c +++ b/src/main.c @@ -1121,6 +1121,7 @@ int sqlite3_busy_handler( db->busyHandler.xFunc = xBusy; db->busyHandler.pArg = pArg; db->busyHandler.nBusy = 0; + db->busyTimeout = 0; sqlite3_mutex_leave(db->mutex); return SQLITE_OK; } @@ -1158,8 +1159,8 @@ void sqlite3_progress_handler( */ int sqlite3_busy_timeout(sqlite3 *db, int ms){ if( ms>0 ){ - db->busyTimeout = ms; sqlite3_busy_handler(db, sqliteDefaultBusyCallback, (void*)db); + db->busyTimeout = ms; }else{ sqlite3_busy_handler(db, 0, 0); } |