From: drh <drh@noemail.net>
Date: Mon, 15 Nov 2010 14:44:30 +0000 (+0000)
Subject: Merge the EXPLAIN QUERY PLAN changes from experimental into trunk.
X-Git-Tag: version-3.7.4~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f48d644e9d1373a236d7714593f59a0b1f8b3a6;p=thirdparty%2Fsqlite.git

Merge the EXPLAIN QUERY PLAN changes from experimental into trunk.

FossilOrigin-Name: ce27bf38405ce805dad95ec22cbe68ddc7af544a
---

4f48d644e9d1373a236d7714593f59a0b1f8b3a6
diff --cc manifest
index d098337362,7c2d1b53ab..291e0dd776
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,8 @@@
- C Minor\sadditions\sto\svacuum.test.
- D 2010-11-15T11:35:50
 -C Change\sthe\sEXPLAIN\sQUERY\sPLAN\soutput\sto\suse\s"USING\sINDEX"\sinstead\sof\s"BY\sINDEX",\sand\sto\suse\s"SEARCH"\sinstead\sof\s"SCAN"\sfor\sloops\sthat\sare\snot\sfull-table\sscans.
 -D 2010-11-13T16:42:27
++-----BEGIN PGP SIGNED MESSAGE-----
++Hash: SHA1
++
++C Merge\sthe\sEXPLAIN\sQUERY\sPLAN\schanges\sfrom\sexperimental\sinto\strunk.
++D 2010-11-15T14:44:30
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in e7a59672eaeb04408d1fa8501618d7501a3c5e39
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -885,7 -886,7 +889,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 1244ef9f7ef813d86dca6f8e01681fa55ee9eec8
- R 54b348dd27f49361cd996798a2ab23b2
 -P 85fdad850a4da33fd74f5394b921a63ea6b40bdb
 -R db8952c6470eaa949f02eb93faae70b0
--U dan
- Z 9290fe54b110c5363ef458359a63af8a
 -Z ea9cbebbd7abab9a68340ca7a9b4dfcf
++P a397ed162246fef32b8c5db36d995bf9a8005a2e 6611b76b0296875fb9903b25dfaa783a9c12eaa1
++R 1e73ae4c8823ab0663e26456987bae7c
++U drh
++Z b8229a6177e36bec8618f3cb97f45755
++-----BEGIN PGP SIGNATURE-----
++Version: GnuPG v1.4.6 (GNU/Linux)
++
++iD8DBQFM4UdRoxKgR168RlERAqhcAKCDlGd+bkF6B7sQTpZQqbxAI/toQgCfXUHJ
++Rco8nRCLvqh3phYwbsb2VlE=
++=MBq+
++-----END PGP SIGNATURE-----
diff --cc manifest.uuid
index f63a03e803,ea53f06c01..5e7c0ff67c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a397ed162246fef32b8c5db36d995bf9a8005a2e
 -6611b76b0296875fb9903b25dfaa783a9c12eaa1
++ce27bf38405ce805dad95ec22cbe68ddc7af544a