From: drh <drh@noemail.net>
Date: Fri, 15 Nov 2013 03:30:07 +0000 (+0000)
Subject: Merge EXPLAIN fixes from trunk.
X-Git-Tag: version-3.8.2~84^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c89bed6219b5fc94dfe668d52b91b12655a533d;p=thirdparty%2Fsqlite.git

Merge EXPLAIN fixes from trunk.

FossilOrigin-Name: cd579727b107a07140b94f5839d193959d29e6db
---

7c89bed6219b5fc94dfe668d52b91b12655a533d
diff --cc manifest
index f7ec2db29b,f194ea4c79..22cb55c85f
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Rework\sthe\slogic\sthat\sfactors\sconstant\sexpressions\sout\sof\sinner\sloops,\smaking\nit\sboth\ssimpler\sand\sfaster.
- D 2013-11-15T01:10:18.507
 -C Fix\sa\stypo\sin\sthe\s"synopsis"\sfor\sthe\sOP_Lt\sopcode\sthat\scauses\san\s\nincorrect\scomment\sto\sbe\sadded\sto\sEXPLAIN\soutput.
 -D 2013-11-15T03:21:43.898
++C Merge\sEXPLAIN\sfixes\sfrom\strunk.
++D 2013-11-15T03:30:07.899
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 8a07bebafbfda0eb67728f4bd15a36201662d1a1
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1139,10 -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 ea141a9b87dbb5fa1402bf7f6e36e89cc9de3cb3
- R ea4290df34dfa387f06721fb8b8fabb6
- T *branch * expr-codegen-enhancement
- T *sym-expr-codegen-enhancement *
- T -sym-trunk *
 -P cbe85cc2a991d89a6cca391ffa1be0582a684e49
 -R 0c746aa4efd05e48b97b713c68a5a0db
++P 8dc5c76c766828d7c28090bec30ff48227e7b140 d99a30a25d6102c389f1fb5ec389c137168615e9
++R 55f9276a49bf042aa3fa36f2f4c874b2
  U drh
- Z 42026cbf90dc1d9e1d914e786ac618c6
 -Z 51d93302282dc3095ac1b627e9f3a079
++Z d11ec7b7307706d351f4407390565b7b
diff --cc manifest.uuid
index 95628cd332,cbca5b1319..4b7d29ed45
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8dc5c76c766828d7c28090bec30ff48227e7b140
 -d99a30a25d6102c389f1fb5ec389c137168615e9
++cd579727b107a07140b94f5839d193959d29e6db