diff options
| author | drh <drh@noemail.net> | 2016-03-04 16:42:43 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-03-04 16:42:43 +0000 |
| commit | 2606aca80f35c4672c7834e90786d737679fa35b (patch) | |
| tree | 2a8be85e2e802ad5ba42c4bb8e9102712cb287aa /src/util.c | |
| parent | fd37e67b16d6c6228aa58709299c86ec81a552a5 (diff) | |
| parent | 3298a641a2b1c883b34e9d85541db50d6e2d1ff9 (diff) | |
| download | sqlite-2606aca80f35c4672c7834e90786d737679fa35b.tar.gz sqlite-2606aca80f35c4672c7834e90786d737679fa35b.zip | |
Merge recent enhancements from trunk. Default page size is 4096. Writes
to statement journals are avoided.
FossilOrigin-Name: 456df3365e2df60e34762f2024bb551538b3f72b
Diffstat (limited to 'src/util.c')
| -rw-r--r-- | src/util.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/util.c b/src/util.c index e325a7311..81274260f 100644 --- a/src/util.c +++ b/src/util.c @@ -110,6 +110,14 @@ int sqlite3Strlen30(const char *z){ } /* +** The string z[] is followed immediately by another string. Return +** a poiner to that other string. +*/ +const char *sqlite3StrNext(const char *z){ + return z + strlen(z) + 1; +} + +/* ** Set the current error code to err_code and clear any prior error message. */ void sqlite3Error(sqlite3 *db, int err_code){ @@ -1400,8 +1408,14 @@ LogEst sqlite3LogEstFromDouble(double x){ } #endif /* SQLITE_OMIT_VIRTUALTABLE */ +#if defined(SQLITE_ENABLE_STMT_SCANSTAT) || \ + defined(SQLITE_ENABLE_STAT3_OR_STAT4) || \ + defined(SQLITE_EXPLAIN_ESTIMATED_ROWS) /* ** Convert a LogEst into an integer. +** +** Note that this routine is only used when one or more of various +** non-standard compile-time options is enabled. */ u64 sqlite3LogEstToInt(LogEst x){ u64 n; @@ -1415,3 +1429,4 @@ u64 sqlite3LogEstToInt(LogEst x){ } return (n+8)>>(3-x); } +#endif /* defined SCANSTAT or STAT4 or ESTIMATED_ROWS */ |