From: drh <drh@noemail.net>
Date: Mon, 17 Sep 2012 19:26:02 +0000 (+0000)
Subject: Merge recent trunk changes into the fullscan-covering-index branch.
X-Git-Tag: version-3.7.15~125^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee4b21e9f3b775b4e20f2b71eff2b8bf052d2518;p=thirdparty%2Fsqlite.git

Merge recent trunk changes into the fullscan-covering-index branch.

FossilOrigin-Name: 1c0bf0305ce9528a0d07c86a390c5872e16bdb57
---

ee4b21e9f3b775b4e20f2b71eff2b8bf052d2518
diff --cc manifest
index d4a4939a51,423fd99e01..ace53db22c
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Attempt\sto\suse\sa\scovering\sindex\seven\son\sa\sfull\stable\sscan,\sunder\sthe\stheory\nthat\sthe\sindex\swill\sbe\ssmaller\sand\srequire\sless\sdisk\sI/O\sand\sthus\sbe\sfaster.
- D 2012-09-15T18:45:54.834
 -C Remove\sobsolete\sbits\sfrom\sthe\sbitvector\sthat\sdefines\sdisabled\soptimizations\nin\sthe\sSQLITE_TESTCTRL_OPTIMIZATIONS\sverb\sof\ssqlite3_test_control().
 -D 2012-09-17T19:12:39.992
++C Merge\srecent\strunk\schanges\sinto\sthe\sfullscan-covering-index\sbranch.
++D 2012-09-17T19:26:02.587
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1013,10 -1013,7 +1013,7 @@@ F tool/vdbe-compress.tcl d70ea6d8a19e35
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
- P 8711a8447d28275602287faf533de3d6e50d535d
- R 2846d857dac01099378b7c9963f9bce9
- T *branch * fullscan-covering-index
- T *sym-fullscan-covering-index *
- T -sym-trunk *
 -P 8b962c94a2f829f71efdd0ca770469b02feea3e1
 -R 67168a23b15c492a24fe7dbe4ad81c6a
++P cfaa7bc12847a7006ccc93815f2395ad5259744a 4c21ee2d26466f83dec525153e2b1506bd956701
++R 3fd45fd88344b4ac62768e374c7ae8ba
  U drh
- Z 9efee896d171017e16fb900a826f2665
 -Z 95f03cf63c4263171e5518be35ff05c6
++Z 9e1f7223ea78afc960fb1c0adce4036d
diff --cc manifest.uuid
index 88bb4d6dd1,d1f3d5acfc..cc97eda3af
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- cfaa7bc12847a7006ccc93815f2395ad5259744a
 -4c21ee2d26466f83dec525153e2b1506bd956701
++1c0bf0305ce9528a0d07c86a390c5872e16bdb57