database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-18 10:21:03 +03:00
Code Activity

Merge the latest trunk changes into the sessions branch.

Browse Source 
FossilOrigin-Name: 45f20261720dcd73eb887f7e3df100723000418b
This commit is contained in:
drh
2011-04-05 22:13:49 +00:00
parent c94f31236e fcd71b6010
commit d7162fa64e
21 changed files with 164 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.c
View File

@@ -891,7 +891,7 @@ static int sqliteDefaultBusyCallback(
{ 1, 2, 5, 10, 15, 20, 25, 25, 25, 50, 50, 100 };
static const u8 totals[] =
{ 0, 1, 3, 8, 18, 33, 53, 78, 103, 128, 178, 228 };
# define NDELAY (sizeof(delays)/sizeof(delays[0]))
# define NDELAY ArraySize(delays)
sqlite3 *db = (sqlite3 *)ptr;
int timeout = db->busyTimeout;
int delay, prior;