From: drh <drh@noemail.net>
Date: Fri, 1 Apr 2011 14:26:14 +0000 (+0000)
Subject: Merge the ANALYZE-index enhancement into trunk.
X-Git-Tag: version-3.7.6~67
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=295867bd55ea8b0a1bc999bfce363934417c9cf4;p=thirdparty%2Fsqlite.git

Merge the ANALYZE-index enhancement into trunk.

FossilOrigin-Name: 7e237aea22084416d02b89d5223de4e1ca76882d
---

295867bd55ea8b0a1bc999bfce363934417c9cf4
diff --cc manifest
index f2ec24b889,814dad6c8b..54e008c6ee
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Move\sa\svariable\sdeclaration\sinside\san\s#ifdef\sto\savoid\sa\scompiler\swarning.
- D 2011-04-01T13:29:29.578
 -C Test\scases\sfor\sANALYZE-index.
 -D 2011-04-01T14:04:36.013
++C Merge\sthe\sANALYZE-index\senhancement\sinto\strunk.
++D 2011-04-01T14:26:14.943
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -115,7 -115,7 +115,7 @@@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47
  F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
  F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
  F src/alter.c 6a0c176e64a34929a4436048066a84ef4f1445b3
- F src/analyze.c 6b536214aece5100f4814b715b1a9f096193bf14
 -F src/analyze.c ecc36fc13e5a982ce8136b8d598fc402b3787139
++F src/analyze.c d0a673d303f611690fc7a3293aaefed57cccc5c8
  F src/attach.c 438ea6f6b5d5961c1f49b737f2ce0f14ce7c6877
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
  F src/backup.c 537f89c7ef5021cb580f31f782e556ffffcb2ed1
@@@ -920,7 -921,7 +921,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P ff6dfe6ed74f9ff1669b2bda41d61a01cd0a1bc6
- R d5791c0430fd039b1944fc050ba93b96
 -P c8f9edd962442cbdd848c48f1a134557ab8c6ef5
 -R 1095a96b12af8399e13f3de1ef24664d
++P 7a6d05dfbc36310683dd51a280e9283cef4f9056 365896cb0868fa476e3b4f5a965a1344a2914cc2
++R 7c9526ecaff8bc8061319f5def8d1613
  U drh
- Z dde3d78a013928b388d93ef247b7695b
 -Z a7b9c4ff9eb44077c37bf72bf0e8f05e
++Z 1a31242492e35c93d42d83f1529d907f
diff --cc manifest.uuid
index 1566c86a65,e7c4683363..86580230d4
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7a6d05dfbc36310683dd51a280e9283cef4f9056
 -365896cb0868fa476e3b4f5a965a1344a2914cc2
++7e237aea22084416d02b89d5223de4e1ca76882d