From: drh <drh@noemail.net>
Date: Tue, 21 Dec 2010 20:36:45 +0000 (+0000)
Subject: Merge into the trunk the experimental enhancements to sqlite3_db_status()
X-Git-Tag: version-3.7.5~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e0a55f443bdb7f90046ef4b87112a0231b868051;p=thirdparty%2Fsqlite.git

Merge into the trunk the experimental enhancements to sqlite3_db_status()
for measuring lookaside memory allocator performance.

FossilOrigin-Name: 8c3b06c299554759b67437e09ee7ef6420dacafc
---

e0a55f443bdb7f90046ef4b87112a0231b868051
diff --cc manifest
index 3df97295bb,c423fa11b3..79050bc92a
--- a/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
  -----BEGIN PGP SIGNED MESSAGE-----
  Hash: SHA1
  
- C Remove\sthe\sobsolete\scompile-time\soption\sSQLITE_THREAD_OVERRIDE_LOCK\nfrom\sthe\sautoconf\smakefile.\s\sNeeded\sonly\sfor\sLinuxThreads,\swhich\swe\sno\nlonger\ssupport.
- D 2010-12-21T00:20:54
 -C Add\sadditional\sDBSTATUS\soptions\sfor\smeasuring\sthe\shit\sand\smiss\srates\sagainst\nthe\slookaside\smemory\spool\s-\sinformation\suseful\sin\stuning\sthe\slookaside\ssize.\nCurrently\sexperimental\spending\sanalysis\sof\sperformance\simpact.
 -D 2010-12-20T15:51:59
++C Merge\sinto\sthe\strunk\sthe\sexperimental\senhancements\sto\ssqlite3_db_status()\s\nfor\smeasuring\slookaside\smemory\sallocator\sperformance.
++D 2010-12-21T20:36:46
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
 +F Makefile.in de6498556d536ae60bb8bb10e8c1ba011448658c
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -179,11 -179,11 +179,11 @@@ F src/resolve.c 1c0f32b64f8e3f555fe1f73
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c 8a7ba246b0b4bb45df7fbc52681728a0e3deaaa7
  F src/shell.c 9afa9bdd62142e254b4581a77b43080d3ffd4ef4
- F src/sqlite.h.in 2d24126d553904fa0d9207e2424109ae2369a707
 -F src/sqlite.h.in 2f1fd40e8ba7c0a51eb755e0b6af236ce692325b
++F src/sqlite.h.in 54dd12d0dd8b6a4afd7b3d5a03d36ec64a67b641
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h b96d5ddb8b419a2ed7cf69a7778b53872d73e8a7
+ F src/sqliteInt.h 3ef5fc89a4c9755a08a68de107493785a284e27c
  F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
- F src/status.c 496913d4e8441195f6f2a75b1c95993a45b9b30b
+ F src/status.c 4997380fbb915426fef9e500b4872e79c99267fc
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c 77c5c4b8ac7b2d94ee480e1ad626fbd921d948e4
  F src/test1.c 397809a3069c171a507a49b6f6edfc4255b0afbc
@@@ -897,14 -897,18 +897,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 39bbd35599e735b32f7ed18143073165b805dd98
- R 80b3317d427aed8936aa381a5ad6ed6c
 -P 74fff692345fed4b247e2b34c1e63b4d50cddfd4
 -R 5082873d15f794ab949991323071e42f
 -T *bgcolor * #c0ffc0
 -T *branch * experimental
 -T *sym-experimental *
 -T -sym-trunk *
++P 09f6c053ff9239c22ecf527ae579446c6e21e550 34613f1dc54c638531ca2f5907b71fbe8841233e
++R 70bb859101c53c246dfc4f574be27803
  U drh
- Z 50f3f1b11bd7b6b561a6a28e34c75c73
 -Z d0e19bf0b71d36c4c32d327aba382999
++Z a58574a5d2655de53c943a82d61ee0c4
  -----BEGIN PGP SIGNATURE-----
  Version: GnuPG v1.4.6 (GNU/Linux)
  
- iD8DBQFND/LpoxKgR168RlERAjN/AJ9GW7kKHV8mhDRU/MIZoIFYemwlJQCfS21P
- RmgCdBRtWA88sFD1ddbbF+c=
- =PAHS
 -iD8DBQFND3uioxKgR168RlERAirTAJ0bHLsmerXov5fiom51y80kBrhKkACfXfos
 -ossaFA/wslQt5YU5JPaXj1I=
 -=Q2Je
++iD8DBQFNEQ/hoxKgR168RlERAlduAKCC7Lj51Ln8aN6aJlGCTwPg8olPygCghFCt
++2eqZ3E29sKKFSCheCCAI7u0=
++=jBul
  -----END PGP SIGNATURE-----
diff --cc manifest.uuid
index beb1ad79d5,dfd9a9a2d1..e97834e992
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 09f6c053ff9239c22ecf527ae579446c6e21e550
 -34613f1dc54c638531ca2f5907b71fbe8841233e
++8c3b06c299554759b67437e09ee7ef6420dacafc