Reopen the orderby-planning branch and merge in the latest trunk enhancements

and fixes.

FossilOrigin-Name: 6077ddcd93318e24b9756adaaf293ba9fb3cedf7

diff --cc manifest
index e6d729925dbb1b79cf7a423e3e9a1313777942d2,7f4e9189fddf062f6a3aad64aa6a514bfd7ef0e3..0187e055108721ba74fa1a5e57327141df728ff2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\scompiler\swarning\sand\san\safter-OOM\smemory\sleak.
- D 2014-03-28T19:47:19.372
 -C Comment\stweaks\son\sthe\stest\scase\sfor\sthe\s[b75a9ca6b0]\sbug\sfix.
 -D 2014-04-21T13:36:54.639
++C Reopen\sthe\sorderby-planning\sbranch\sand\smerge\sin\sthe\slatest\strunk\senhancements\nand\sfixes.
++D 2014-04-24T15:06:25.003
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -216,13 -216,13 +216,13 @@@ F src/prepare.c 677521ab7132615a8a26107
  F src/printf.c e5a0005f8b3de21f85da6a709d2fbee76775bf4b
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
- F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c 20055cf917222e660c4222fea306bd13a0623caa
- F src/shell.c cee9f46f2688a261601b1fd3d7f4b3cddf9b5cdf
- F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80
+ F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
 -F src/select.c bc7feff0fb4c4a1b9d655b717bef166846b48e33
++F src/select.c 1a229278810ac02b9cb58687c3aa8cdc304d4dcf
+ F src/shell.c 2afe7a7154e97be0c74c5feacf09626bda8493be
+ F src/sqlite.h.in bde98816e1ba0c9ffef50afe7b32f4e5a8f54fe0
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h cc9582a91b2910404ccda7b7e198815ea0f75948
+ F src/sqliteInt.h 03e2f60ccb0745fa2d3a072cb4f75fa29251d2ee
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -278,14 -278,14 +278,14 @@@ F src/update.c 5b3e74a03b3811e586b4f2b4
  F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
  F src/util.c c46c90459ef9bdc0c6c73803cf4c55425b4771cf
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 02f2de0b2f3b198438e3e64a2ceba9407bb8348b
 -F src/vdbe.c bf284edea1cee0508dc93c79a73498e0f317edb7
++F src/vdbe.c 59ad2f4c62178dcce4acef516e00290a7a58dd39
  F src/vdbe.h 394464909ed682334aa3d5831aae0c2fe2abef94
  F src/vdbeInt.h e6d83e5bfd62fc6685ba1ed6153f7099f82de9f7
  F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
- F src/vdbeaux.c 1153175fb57a8454e1c8cf79b59b7bf92b26779d
- F src/vdbeblob.c 15377abfb59251bccedd5a9c7d014a895f0c04aa
+ F src/vdbeaux.c e493f38758c4b8f4ca2007cf6a700bd405d192f3
+ F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
  F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
 -F src/vdbesort.c 4abb7c0f8f19b7d7d82f4558d5da1a30fdf9ea38
 +F src/vdbesort.c ad0f9f717a73b870c12c0a0f47781b8b042a5348
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
  F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@@ -1159,7 -1161,7 +1161,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 3047a25f1c41e83f0b4772f7c36fbfec0f12dc7e
- R 911f6d7d99d9350a186d106d9b5cf527
 -P de9a490f594183f337a2ec9e0f87792eac83548b
 -R ce888b84132e0cad3bcca115a32951d3
++P 58f7ca29303c280229f86d01f418e1de5f5aebba 65d2544af9adc1e2f1d193e57f8be0422fb0d5eb
++R b46cdf624d79e68eb1974021b4d3f992
  U drh
- Z 55f6b91a865b632e99503eb67df5d777
 -Z cf9f241149456ab1fa24984e95a412d2
++Z d3c484ede684435a1175d26a414ba92a

diff --cc manifest.uuid
index cf96f017070565b5213d0d8582876e9848a65750,a2761a597be17902e9abe6d6358bda6ee495daa3..4866c44be098999faf8f92b23bbf73dbe40c2167
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 58f7ca29303c280229f86d01f418e1de5f5aebba
 -65d2544af9adc1e2f1d193e57f8be0422fb0d5eb
++6077ddcd93318e24b9756adaaf293ba9fb3cedf7

diff --cc src/select.c
Simple merge

diff --cc src/vdbe.c
Simple merge