From: drh <drh@noemail.net>
Date: Wed, 16 Nov 2011 18:08:07 +0000 (+0000)
Subject: Merge the PCACHE2 changes into trunk.
X-Git-Tag: mountain-lion~9^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=870c0178f7d350203c13754eeb5b5d1a8fc7f3f1;p=thirdparty%2Fsqlite.git

Merge the PCACHE2 changes into trunk.

FossilOrigin-Name: 457513f21f2438c61b1a214716e338a4e3eeaafa
---

870c0178f7d350203c13754eeb5b5d1a8fc7f3f1
diff --cc manifest
index fc9815ffc5,2988a3c3a3..18ce75562b
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Remove\scode\smade\sobsolete\sby\sthe\schanges\sto\sindex\sprocessing\sthat\sallow\nrange\ssearch\son\sthe\srowid.
- D 2011-11-16T16:23:15.780
 -C Add\sa\sversion\snumber\sto\sthe\ssqlite3_pcache_methods2\sobject.\s\sOther\sPCACHE2\ndocumentation\simprovements.
 -D 2011-11-13T21:44:03.995
++C Merge\sthe\sPCACHE2\schanges\sinto\strunk.
++D 2011-11-16T18:08:07.023
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -125,10 -125,10 +125,10 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c 4368158da74d4711888e03264105c5c527d76caf
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 80ea65224512884bb72976c93810d2dcaecc1353
+ F src/btree.c 149cccf2134f555583d0825e47b17104aa06cb84
  F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce
  F src/btreeInt.h ea863a819224d3e6845ad1e39954d41558b8cd8b
 -F src/build.c 8af67a08a852ff4c63701963cb1ab7166f577814
 +F src/build.c 8915bb6d72ead998f94c2756ea8d143c77709b70
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33
@@@ -181,10 -181,10 +181,10 @@@ F src/random.c cd4a67b3953b88019f8cd4cc
  F src/resolve.c 365ab1c870e38596d6869e76fb544fe6e4ffc809
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c 80f3ac44a8514b1d107b80f5df4a424ae059d2b6
- F src/shell.c 6d2ad7f80adc9c8c3195412879af36eb3196c1b6
- F src/sqlite.h.in b7a4e8d428e467d820cbb4c1d275fdda88b4d7ab
+ F src/shell.c 29812a900a780eb0f835c4bc65e216272689def8
+ F src/sqlite.h.in 557f4113a649f15d13e566aaa85820509b4daa52
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h ce631f204a67ae35b817928e3931484bda0963bc
 -F src/sqliteInt.h f87f241b9821a9d466c2711b7345d30ef3624249
++F src/sqliteInt.h f412e020e1009163c74be56eaac1bf7f6c0a4515
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -219,7 -219,7 +219,7 @@@ F src/test_multiplex.h e99c571bc4968b7a
  F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e
  F src/test_onefile.c 40cf9e212a377a6511469384a64b01e6e34b2eec
  F src/test_osinst.c 62b0b8ef21ce754cc94e17bb42377ed8795dba32
- F src/test_pcache.c 335285416eb7a5c3a0f4daffb796912011ebbf6e
 -F src/test_pcache.c a07e9c1222e964ea20d49e6e0b6e23aa6ae8b6da
++F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00
  F src/test_quota.c a391c866217e92986c6f523f05b08aa6956c8419
  F src/test_rtree.c 6d06306e29946dc36f528a3a2cdc3add794656f1
  F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
@@@ -592,7 -592,7 +592,7 @@@ F test/manydb.test 28385ae2087967aa05c3
  F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
  F test/memdb.test 708a028d6d373e5b3842e4bdc8ba80998c9a4da6
  F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
- F test/memsubsys1.test c0db8a1e99f4fa07cb858900c55bad9547899aa8
 -F test/memsubsys1.test 5b3f39b452f4c0b3cd884fc2fd2246f8f960d313
++F test/memsubsys1.test a8f9e37567453a5d1d9d37ec102d4d88ab6be33f
  F test/memsubsys2.test 3a1c1a9de48e5726faa85108b02459fae8cb9ee9
  F test/minmax.test 722d80816f7e096bf2c04f4111f1a6c1ba65453d
  F test/minmax2.test 33504c01a03bd99226144e4b03f7631a274d66e0
@@@ -975,7 -974,7 +975,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 888b09dd8fc0a31b69852a2c10eebb5f31fe35de
- R e9cdc1916fc67db6e66156ee2c102eee
 -P ceee03c79a55ea39866758aa76b78b10e5f4246d
 -R d08ae8acf53f2cb149aeb898f50b49c8
++P a5418c7fc216a30abf7b2fa8c579aee586393a91 9f839ac05a9f3cfe587d2ccdccd50dac41baedbe
++R e41a73511b92616ee76fa30eb271c907
  U drh
- Z 65f4e24eecf20b0f9a407d4be4414918
 -Z af6f24cf5b51e20dd59385851602a05e
++Z e97a12a6137cafdd18edeb6857a80579
diff --cc manifest.uuid
index 426ffad767,140730cf5c..eb4dd66704
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a5418c7fc216a30abf7b2fa8c579aee586393a91
 -9f839ac05a9f3cfe587d2ccdccd50dac41baedbe
++457513f21f2438c61b1a214716e338a4e3eeaafa
diff --cc test/memsubsys1.test
index 894a554789,e58ef7df26..e14a1b3c2c
--- a/test/memsubsys1.test
+++ b/test/memsubsys1.test
@@@ -68,7 -68,7 +68,7 @@@ proc reset_highwater_marks {} 
    sqlite3_status SQLITE_STATUS_PARSER_STACK 1
  }
  
--set xtra_size 272
++set xtra_size 290
  
  # Test 1:  Both PAGECACHE and SCRATCH are shut down.
  #