Merge orderby-planning with this branch.

FossilOrigin-Name: d9549de31741239ece060e448b592ce8fc5b8042

diff --cc main.mk
Simple merge

diff --cc manifest
index 1b2b4c23fbb9f8c86863b306adfc17c8616fa56e,8fd72b4b86c32d2081c345f9f9d020cc65f4f685..ac820ac5a9a95dc00d78938cd0adff0782e3ab08
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Fix\ssome\sbroken\sasserts\sin\sbtree.c\sand\svdbeaux.c\sthat\smay\sfail\sfollowing\san\sOOM\serror.
- D 2014-05-02T17:12:41.912
 -C Simplify\sassert()\sstatements\sused\sto\sverify\scorrect\soperation\sof\s\nrecord\scomparison\sroutines.
 -D 2014-05-02T17:33:16.279
++C Merge\sorderby-planning\swith\sthis\sbranch.
++D 2014-05-02T18:05:38.568
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 +F Makefile.in ad0921c4b2780d01868cf69b419a4f102308d125
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19
 +F Makefile.msc 153eb9b9725bc7b8e4dbe963219298e0c4a644b0
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
@@@ -143,7 -144,7 +144,7 @@@ F ext/rtree/viewrtree.tcl eea6224b35535
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt f439556c5ce01ced70987e5ee86549a45165d9ff
- F main.mk 4b30dd2a6cb441db688972496b45a6c3abef8b20
 -F main.mk 9546867b42992c554e7af8672549ba13afaadade
++F main.mk 97673939d94f210b7218a8236df6c8799d4a0da6
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -164,10 -165,10 +165,10 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
 -F src/btree.c 6c9b51abd404ce5b78b173b6f2248e8cb824758c
 +F src/btree.c e14daeed62b5b1499835a6523f9a47d660c297c8
  F src/btree.h d79306df4ed9181b48916737fe8871a4392c4594
  F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
- F src/build.c 9ea11e29230d8f454580870465354c707bd42851
 -F src/build.c 02665ca158431a0926b10cbd7d8178a4c9fc4a22
++F src/build.c 9c522b6e5af1485c38b12a55f9d946e66fca61b6
  F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
@@@ -217,12 -218,12 +218,12 @@@ F src/printf.c e5a0005f8b3de21f85da6a70
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
- F src/select.c 1a229278810ac02b9cb58687c3aa8cdc304d4dcf
+ F src/select.c a5ed3fdc82ebab5b9b095ea1971515a7f8a303d2
 -F src/shell.c 2afe7a7154e97be0c74c5feacf09626bda8493be
 -F src/sqlite.h.in bde98816e1ba0c9ffef50afe7b32f4e5a8f54fe0
 +F src/shell.c 6946aea9f21af551fa84bc6b2a8de55d93bf0004
 +F src/sqlite.h.in 579aebacdea59386d9cdf01fd4a16f4cafbb248f
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h cc6486a5cc3071948e880297b0de07c07e6612c8
 -F src/sqliteInt.h b2947801eccefd7ba3e5f14e1353289351a83cf3
++F src/sqliteInt.h 76bd7ba54008909d9e437807565a54b1075983dc
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -270,23 -271,22 +271,23 @@@ F src/test_syscall.c 2e21ca7f7dc54a028f
  F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
  F src/test_thread.c 1e133a40b50e9c035b00174035b846e7eef481cb
  F src/test_vfs.c e72f555ef7a59080f898fcf1a233deb9eb704ea9
- F src/test_vfstrace.c 3a0ab304682fecbceb689e7d9b904211fde11d78
+ F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 +F src/threads.c e35de159f9ced746266ff4b2129b7a828e59119c
  F src/tokenize.c 6da2de6e12218ccb0aea5184b56727d011f4bee7
  F src/trigger.c 66f3470b03b52b395e839155786966e3e037fddb
  F src/update.c 5b3e74a03b3811e586b4f2b4cbd7c49f01c93115
  F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
- F src/util.c c46c90459ef9bdc0c6c73803cf4c55425b4771cf
+ F src/util.c 2b5fb283a190aacdb286f7835a447c45b345b83c
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c b50cd3009a2e3067746c73dce36153f19df2e42e
 -F src/vdbe.c b3510cc71f706beffc66e2aa4bbda54bcd5e9668
++F src/vdbe.c 89ab2ded5123e823b47293aedd7931a4742fb6bd
  F src/vdbe.h 394464909ed682334aa3d5831aae0c2fe2abef94
 -F src/vdbeInt.h e6d83e5bfd62fc6685ba1ed6153f7099f82de9f7
 +F src/vdbeInt.h c78ace64dc37495806dd50596eded1f6cd2b5a64
  F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
- F src/vdbeaux.c 6e6993fa4be39ab96bdd565994bee8ec3bef06ab
 -F src/vdbeaux.c c9a8c917776c941af99285594d5c30d99e21c99a
++F src/vdbeaux.c f651c4de1193326597b3da2b8f91d993e8a6e97b
  F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
  F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
 -F src/vdbesort.c 6bcf73fb160ee5bb8ce8a8ec61fda268b081dbb7
 +F src/vdbesort.c 0095545ae3786d00c9104d036f5d092953a1e2d3
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
  F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@@ -814,13 -817,10 +818,13 @@@ F test/show_speedtest1_rtree.tcl 32e6c5
  F test/shrink.test 8c70f62b6e8eb4d54533de6d65bd06b1b9a17868
  F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
  F test/skipscan1.test bed8cbe9d554c8c27afb6c88500f704c86a9196f
- F test/skipscan2.test 5a4db0799c338ddbacb154aaa5589c0254b36a8d
+ F test/skipscan2.test d77f79cdbba25f0f6f35298136cff21a7d7a553a
  F test/soak.test 0b5b6375c9f4110c828070b826b3b4b0bb65cd5f
  F test/softheap1.test 40562fe6cac6d9827b7b42b86d45aedf12c15e24
 -F test/sort.test cb76a6e9db897b6871ef4dbc206ebc6dbc033bf4
 +F test/sort.test 79dc647c4e9b123a64e57b7080b7f9a2df43f87a
 +F test/sort2.test 04e99d0d028b469c6cfab2c647c6c28755504063
 +F test/sort3.test c3f88d233452a129de519de311d109a0ad0da0af
 +F test/sortfault.test 2e2337aa5db6ab5cd546368cf2410676c11cb577
  F test/speed1.test f2974a91d79f58507ada01864c0e323093065452
  F test/speed1p.explain d841e650a04728b39e6740296b852dccdca9b2cb
  F test/speed1p.test b180e98609c7677382cf618c0ec9b69f789033a8
@@@ -829,7 -829,7 +833,7 @@@ F test/speed3.test d32043614c08c53eafdc
  F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
  F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
  F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
- F test/speedtest1.c bd150a4c29e26ff4ddbdd505e0a0d96347ffca51
 -F test/speedtest1.c d29c8048beb7ea9254191f3fde9414709166a920
++F test/speedtest1.c f452891e50571627f7060c0e1262359127055717
  F test/spellfix.test 61309f5efbec53603b3f86457d34a504f80abafe
  F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
  F test/stat.test 76fd746b85459e812a0193410fb599f0531f22de
@@@ -1165,7 -1166,7 +1170,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 d95d68aa1d14b750888d50068380cc107f9070df
- R 2642a9b7016b11d8b125fe44a5d1acd4
 -P d4d396387d373bd1e82eda2c7c2e7ca35ec099c4
 -R defe6572bf21263fd4b2b33706bcd8e7
 -U drh
 -Z 26e6dec065eafceab8263c10d377378f
++P e15f47064bef431c0afd8bf93eb4e160c23ad562 3300d62dcbe74842cf86ca436959fe4e77a89f84
++R 6fa5ff1df255fa8dfad56d587950c625
 +U dan
- Z 60595d854f9f1dca901aef6c64df6a77
++Z 63362d13bfcb7640057f1ca0f3721e45

diff --cc manifest.uuid
index 7ac8504d07ca51d14f482aee2d05fd534ce8a629,ea44721a8e46fd5c8f00ac4d70de247cee0a9156..55e5e7ae819ae2abb9258b31f94581dc254d5ba9
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e15f47064bef431c0afd8bf93eb4e160c23ad562
 -3300d62dcbe74842cf86ca436959fe4e77a89f84
++d9549de31741239ece060e448b592ce8fc5b8042

diff --cc src/build.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/speedtest1.c
index 7d38b37b0daea2b740a816852bc94ccb130e6b06,383f5809a98583817271b1849c46178f01667b1d..5fb9917f9b02172115f8b177f1666fa6d9d79ba3
--- 1/test/speedtest1.c
--- 2/test/speedtest1.c
+++ b/test/speedtest1.c
@@@ -27,9 -27,9 +27,10 @@@ static const char zHelp[] 
    "  --stats             Show statistics at the end\n"
    "  --testset T         Run test-set T\n"
    "  --trace             Turn on SQL tracing\n"
 +  "  --threads N         Use up to N threads for sorting\n"
    "  --utf16be           Set text encoding to UTF-16BE\n"
    "  --utf16le           Set text encoding to UTF-16LE\n"
+   "  --verify            Run additional verification steps.\n"
    "  --without-rowid     Use WITHOUT ROWID where appropriate\n"
  ;