Merge recent trunk changes into the orderby-planning branch.

FossilOrigin-Name: 8d8609d6c619e02e3e832e3b2256b8dccb8c21de

diff --cc manifest
index 8fd72b4b86c32d2081c345f9f9d020cc65f4f685,bec4a2d4fe13372f44a1f9f1f0108c791bdbc0e6..73e86de9856b4131a40069ef9f66a49daf3ca32d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Simplify\sassert()\sstatements\sused\sto\sverify\scorrect\soperation\sof\s\nrecord\scomparison\sroutines.
- D 2014-05-02T17:33:16.279
 -C Include\ssqlite3rtree.h\sin\sthe\stsrc/\spile\sof\ssource\sfiles\sduring\ntarget_source\sin\sthe\smain.mk\smakefile.
 -D 2014-05-07T21:16:56.524
++C Merge\srecent\strunk\schanges\sinto\sthe\sorderby-planning\sbranch.
++D 2014-05-09T17:17:37.740
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
+ F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19
- F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
+ F Makefile.msc 7e6c495d9a145054a09f518781916c7503f7a8e9
+ F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -218,9 -220,9 +220,9 @@@ F src/printf.c e5a0005f8b3de21f85da6a70
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
 -F src/select.c 089c4d46f067a5cccae93524c6377f981ba99bd9
 +F src/select.c a5ed3fdc82ebab5b9b095ea1971515a7f8a303d2
  F src/shell.c 2afe7a7154e97be0c74c5feacf09626bda8493be
- F src/sqlite.h.in bde98816e1ba0c9ffef50afe7b32f4e5a8f54fe0
+ F src/sqlite.h.in 564fc23db33870b5096b20d72df7491ce0b8b74f
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
  F src/sqliteInt.h b2947801eccefd7ba3e5f14e1353289351a83cf3
@@@ -1165,8 -1169,8 +1169,8 @@@ F tool/vdbe-compress.tcl 0cf56e9263a152
  F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
- F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P d4d396387d373bd1e82eda2c7c2e7ca35ec099c4
- R defe6572bf21263fd4b2b33706bcd8e7
+ F tool/win/sqlite.vsix a94fb9b1b1ef06efc2898975cdfcfa9643731f5e
 -P 68766f837491cb89c2103f2627eb9e23ab326a68
 -R 1b75d6e5e9a19ccc14f8e59e21c749f6
++P 3300d62dcbe74842cf86ca436959fe4e77a89f84 116bed5af664899a73b46dca528ac0c021fc50c3
++R 5413162d0868a0f16aff12e41234e8bf
  U drh
- Z 26e6dec065eafceab8263c10d377378f
 -Z 3528e73d8f87faaf66e6658213b6d573
++Z d2a1dc17f4e656ec9e031956ee80b95a

diff --cc manifest.uuid
index ea44721a8e46fd5c8f00ac4d70de247cee0a9156,150ca3781017ca77e9c4542a0189d2f516daf99d..9e567a938f65bedbdd92df49944332db719dbfb1
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3300d62dcbe74842cf86ca436959fe4e77a89f84
 -116bed5af664899a73b46dca528ac0c021fc50c3
++8d8609d6c619e02e3e832e3b2256b8dccb8c21de