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

Merge trunk 3.8.8 beta changes into the sessions branch

Browse Source 
FossilOrigin-Name: 0ba124540b5b2a9ceda0f4f4a46e6be54edad813
This commit is contained in:
drh
2015-01-14 17:16:23 +00:00
parent f7af7a17b9 068a251d99
commit 7a20f698df
52 changed files with 791 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.c
View File

@@ -1350,7 +1350,7 @@ static int sqliteDefaultBusyCallback(
void *ptr, /* Database connection */
int count /* Number of times table has been busy */
){
#if SQLITE_OS_WIN || (defined(HAVE_USLEEP) && HAVE_USLEEP)
#if SQLITE_OS_WIN || HAVE_USLEEP
static const u8 delays[] =
{ 1, 2, 5, 10, 15, 20, 25, 25, 25, 50, 50, 100 };
static const u8 totals[] =
@@ -3161,7 +3161,7 @@ int sqlite3_table_column_metadata(
char *zErrMsg = 0;
Table *pTab = 0;
Column *pCol = 0;
int iCol;
int iCol = 0;
char const *zDataType = 0;
char const *zCollSeq = 0;