diff options
| author | drh <drh@noemail.net> | 2016-03-07 17:49:17 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-03-07 17:49:17 +0000 |
| commit | c5c67abb9ab2c58d41f75a41a1693e4b30e00bd5 (patch) | |
| tree | 27752830b165d06e6980a19a1a95291599818886 /src/util.c | |
| parent | 2606aca80f35c4672c7834e90786d737679fa35b (diff) | |
| parent | 8c71a98ce13ce3169e6533dd05fce3c2cac2926a (diff) | |
| download | sqlite-c5c67abb9ab2c58d41f75a41a1693e4b30e00bd5.tar.gz sqlite-c5c67abb9ab2c58d41f75a41a1693e4b30e00bd5.zip | |
Merge the virtual table query planner enhancement, the RTREE cost estimate
fix, and the statement journal spill delay enhancement from trunk.
FossilOrigin-Name: 17fd8f3cf0ec565e08403dc8e10a1cffc2bbe165
Diffstat (limited to 'src/util.c')
| -rw-r--r-- | src/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util.c b/src/util.c index 81274260f..6aead47fa 100644 --- a/src/util.c +++ b/src/util.c @@ -1093,7 +1093,7 @@ u8 sqlite3GetVarint32(const unsigned char *p, u32 *v){ */ int sqlite3VarintLen(u64 v){ int i; - for(i=1; (v >>= 7)!=0; i++){ assert( i<9 ); } + for(i=1; (v >>= 7)!=0; i++){ assert( i<10 ); } return i; } @@ -1408,7 +1408,7 @@ LogEst sqlite3LogEstFromDouble(double x){ } #endif /* SQLITE_OMIT_VIRTUALTABLE */ -#if defined(SQLITE_ENABLE_STMT_SCANSTAT) || \ +#if defined(SQLITE_ENABLE_STMT_SCANSTATUS) || \ defined(SQLITE_ENABLE_STAT3_OR_STAT4) || \ defined(SQLITE_EXPLAIN_ESTIMATED_ROWS) /* |