From: drh Date: Fri, 4 Mar 2016 04:01:43 +0000 (+0000) Subject: Change the default cache_size to -2000 (which means 2000*1024 bytes X-Git-Tag: version-3.12.0~109 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94580868f5b9eea4b52710b7304a423006a44f98;p=thirdparty%2Fsqlite.git Change the default cache_size to -2000 (which means 2000*1024 bytes independent of page_size). FossilOrigin-Name: 2682e8e413fadbca0673f242769af17bfd291559 --- diff --git a/manifest b/manifest index 6ef4154770..d39a07ce5c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Change\sthe\sdefault\spage\ssize\sfor\snew\sdatabase\sfiles\sto\s4096\s(from\s1024).\nExcept,\swhen\sbuilding\sthe\stestfixture,\spreserve\sthe\slegacy\spage\ssize.\nAlso\sfix\sa\scomment\son\sSQLITE_MAX_ATTACHED. -D 2016-03-04T03:43:10.844 +C Change\sthe\sdefault\scache_size\sto\s-2000\s(which\smeans\s2000*1024\sbytes\nindependent\sof\spage_size). +D 2016-03-04T04:01:43.190 F Makefile.in ead489fe5d3313b8a2a8d5f3710173a4b50dd2e0 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc d68db8ddac21ea2576ea5b446f12cf9ebe897a03 @@ -355,7 +355,7 @@ F src/sqlite.h.in 57d2a02b14c9ec4f7cb294153eaf62294dc5aa68 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d F src/sqliteInt.h 8aa9992cb35289ede0946f7ba8e993070e040fc4 -F src/sqliteLimit.h 7c17293db62f238ccdec1498dd855fc126fa07a9 +F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24 F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9 F src/tclsqlite.c 54dca4eaf3a9cb0a4b845ef54ffa99225c30a52e @@ -1453,7 +1453,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 82cbf5ad2ed988a006106e188e98096a52e6779d -R 0406775a6be9491c81a210a63da6c171 +P 2e8a9ca9d3d6efddc31f01074d14acae56568c37 +R bce4d7ea1e35eefbc9f3bc83f2294e5c U drh -Z 4f7c554d47a12cc14f56cbfb2a874afa +Z 8be75f8161fe6fe960ec420b19540c0b diff --git a/manifest.uuid b/manifest.uuid index 5cef88240a..0d4fa9e4a9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2e8a9ca9d3d6efddc31f01074d14acae56568c37 \ No newline at end of file +2682e8e413fadbca0673f242769af17bfd291559 \ No newline at end of file diff --git a/src/sqliteLimit.h b/src/sqliteLimit.h index ac06881953..4b5ddaadec 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 /*