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

Merge in the latest changes from trunk.

Browse Source 
FossilOrigin-Name: 69d5bed017bda3e184857febcc8b6f6bed6ad228
This commit is contained in:
drh
2013-08-06 14:52:27 +00:00
parent 7fb30bd0dd 2d463113f0
commit 700a7fdf83
28 changed files with 380 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vdbe.c
View File

@@ -565,7 +565,7 @@ int sqlite3VdbeExec(
int iCompare = 0; /* Result of last OP_Compare operation */
unsigned nVmStep = 0; /* Number of virtual machine steps */
#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
unsigned nProgressLimit; /* Invoke xProgress() when nVmStep reaches this */
unsigned nProgressLimit = 0;/* Invoke xProgress() when nVmStep reaches this */
#endif
Mem *aMem = p->aMem; /* Copy of p->aMem */
Mem *pIn1 = 0; /* 1st input operand */