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/sqliteLimit.h | |
| 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/sqliteLimit.h')
| -rw-r--r-- | src/sqliteLimit.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/sqliteLimit.h b/src/sqliteLimit.h index 75cad1274..4b5ddaade 100644 --- a/src/sqliteLimit.h +++ b/src/sqliteLimit.h @@ -102,12 +102,12 @@ ** the main database table and for temporary tables. ** ** IMPLEMENTATION-OF: R-31093-59126 The default suggested cache size -** is 2000 pages. +** is 2000*1024 bytes. ** IMPLEMENTATION-OF: R-48205-43578 The default suggested cache size can be ** altered using the SQLITE_DEFAULT_CACHE_SIZE compile-time options. */ #ifndef SQLITE_DEFAULT_CACHE_SIZE -# define SQLITE_DEFAULT_CACHE_SIZE 2000 +# define SQLITE_DEFAULT_CACHE_SIZE -2000 #endif /* @@ -120,8 +120,9 @@ /* ** The maximum number of attached databases. This must be between 0 -** and 62. The upper bound on 62 is because a 64-bit integer bitmap -** is used internally to track attached databases. +** and 125. The upper bound of 125 is because the attached databases are +** counted using a signed 8-bit integer which has a maximum value of 127 +** and we have to allow 2 extra counts for the "main" and "temp" databases. */ #ifndef SQLITE_MAX_ATTACHED # define SQLITE_MAX_ATTACHED 10 @@ -156,7 +157,7 @@ ** The default size of a database page. */ #ifndef SQLITE_DEFAULT_PAGE_SIZE -# define SQLITE_DEFAULT_PAGE_SIZE 1024 +# define SQLITE_DEFAULT_PAGE_SIZE 4096 #endif #if SQLITE_DEFAULT_PAGE_SIZE>SQLITE_MAX_PAGE_SIZE # undef SQLITE_DEFAULT_PAGE_SIZE |