From: drh <drh@noemail.net>
Date: Wed, 13 Nov 2013 20:46:11 +0000 (+0000)
Subject: Merge the skip-scan enhancement into trunk.
X-Git-Tag: version-3.8.2~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f57794c923ef4daf37fdd195d415d94ad83d780;p=thirdparty%2Fsqlite.git

Merge the skip-scan enhancement into trunk.

FossilOrigin-Name: b0bb975c0986fe01f1184c1d4888fe397174ad0f
---

1f57794c923ef4daf37fdd195d415d94ad83d780
diff --cc manifest
index 78bd21a267,414ce82414..581e75d42a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C In\sthe\sshell\stool,\sif\san\s"EXPLAIN"\scommand\sis\sexecuted\sin\s".explain\son"\smode,\sattempt\sto\sautomatically\sindent\sthe\sbodies\sof\sloops\sin\sthe\soutput\sVDBE\sprogram.
- D 2013-11-13T18:35:01.894
 -C Import\sthe\s"PRAGMA\svdbe_eqp"\senhancement\sand\sthe\senhanced\sEXPLAIN\sformatting\nthe\sshell\sfrom\strunk.\s\sFix\sa\sbug\sin\sskip-scan\sand\sadd\sa\stest\scase\sto\sprevent\na\sregression.
 -D 2013-11-13T19:01:41.390
++C Merge\sthe\sskip-scan\senhancement\sinto\strunk.
++D 2013-11-13T20:46:11.977
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 8a07bebafbfda0eb67728f4bd15a36201662d1a1
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1138,7 -1139,7 +1139,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 8ce33f4c818e1c785a1c176f6f631b8184e1166b
- R 5d7c6b4eb6f0cadad72d4cdb7ed00f79
- U dan
- Z 87b1c90d92386c54cb5a5e86314bc13e
 -P 0c85d93b52311dee7980d977be6ed0dc70b060c1 e7d34ec6814ed4606a6d5d7f68c218ae4d25e666
++P e7d34ec6814ed4606a6d5d7f68c218ae4d25e666 f668616a29686f3ce532731c534b168e536adbb5
+ R 0f42dd23f60246e0b55a84d51974156a
+ U drh
 -Z 2c708550c85df0e56ea327d75809b287
++Z e8f824146c4a7790bef9ac829b4cd088
diff --cc manifest.uuid
index e811c26432,29ff9c336f..a213e48cb9
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e7d34ec6814ed4606a6d5d7f68c218ae4d25e666
 -f668616a29686f3ce532731c534b168e536adbb5
++b0bb975c0986fe01f1184c1d4888fe397174ad0f