Merge all recent changes from trunk.

FossilOrigin-Name: a0910079adde95245680dee59b43613b60903f10

diff --cc manifest
index 1e7716c432d1fd06d52a3725ea63c9c2b4672a5d,4bcee0a83236fd028ad302916096542b9beaa065..b7536a4c10b290e6eb7e21c2f6b816a6d8051672
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Fix\san\sinteger\soverflow\sproblem\sin\sthe\ssorter.
- D 2014-04-03T16:25:29.778
 -C Use\sOP_Copy\sinstead\sof\sOP_SCopy\swhen\smoving\sresults\sout\sof\sa\ssubquery,\nto\sprevent\sthe\ssubquery\sresults\sfrom\schanging\sout\sfrom\sunder\sthe\souter\nquery.\s\sFix\sfor\sticket\s[1e64dd782a126f48d78].
 -D 2014-04-03T16:29:31.330
++C Merge\sall\srecent\schanges\sfrom\strunk.
++D 2014-04-03T16:42:21.478
  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
@@@ -217,12 -217,12 +217,12 @@@ F src/printf.c e5a0005f8b3de21f85da6a70
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 -F src/select.c 269c3e31a450fce642a10569221a49180348c88e
 -F src/shell.c 5260f2ada8dd06e9f5ae0a448c8c01e7a75dd881
 -F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80
 +F src/select.c 20055cf917222e660c4222fea306bd13a0623caa
- F src/shell.c a08060750f92461fc462b4f767e3b0d19d6b832e
++F src/shell.c afc0b1a5a646d287142ef0c9a2a6e3139d57cba2
 +F src/sqlite.h.in 81221c50addbf698c3247154d92efd1095bfd885
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 -F src/sqliteInt.h cc9582a91b2910404ccda7b7e198815ea0f75948
 +F src/sqliteInt.h 78c89401120b062660427c7b642de4de7673bc46
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -279,14 -278,14 +279,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 eed2230017ca8ac5ca8fc221b38be036bba48499
 -F src/vdbe.c e811a0081149fb90db367026d154cd7efb3c7098
++F src/vdbe.c 9f3d1b35b5fe8c7f3a4f734bd524d0df844a2576
  F src/vdbe.h 394464909ed682334aa3d5831aae0c2fe2abef94
 -F src/vdbeInt.h e6d83e5bfd62fc6685ba1ed6153f7099f82de9f7
 +F src/vdbeInt.h ba1069627d0ab75e9ddb8f9c10958b86cdbd333d
  F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 -F src/vdbeaux.c 1153175fb57a8454e1c8cf79b59b7bf92b26779d
 +F src/vdbeaux.c d8dc38965507a34b0e150c0d7fc82b02f8cf25ea
  F src/vdbeblob.c 15377abfb59251bccedd5a9c7d014a895f0c04aa
  F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
 -F src/vdbesort.c 4abb7c0f8f19b7d7d82f4558d5da1a30fdf9ea38
 +F src/vdbesort.c 252d7ab7620649945b53289510a172bc73133f17
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
  F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@@ -1161,7 -1159,8 +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 0561272abf357a2f4709f6c02866e570d19cd344
- R 8288f2959bddd3667c4349a94ca23e0f
- U dan
- Z 4eb0e7377049f06d09d1ea7ce591ab92
 -P 48ecdd4aff03741f96c070dced69c3c273b652cb
 -Q +ec6a06246e04eee5f25f1c28507df73b697099c0
 -R b6a2fefa5b61ea0e64da4db2aaa10286
++P 9d3351b8d713232133dad149c73fb2a27c72abb1 d5513dfa23baa0b0a095aaf17d19aacd30dcef61
++R 6137d1586a278eeecb535398f89aa582
+ U drh
 -Z f1f1ceb5f31f4e26d736a13a2a5aca0f
++Z 41afe239279763eb22b85c89d966d688

diff --cc manifest.uuid
index cdc8213641985405dc3346b345ba7f5e077feb57,601b0b4f2e891d4aa1718821a9d0c7e8b00bc155..701e5c70e7afb352575ed4c50d83519903622352
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9d3351b8d713232133dad149c73fb2a27c72abb1
 -d5513dfa23baa0b0a095aaf17d19aacd30dcef61
++a0910079adde95245680dee59b43613b60903f10

diff --cc src/shell.c
Simple merge

diff --cc src/vdbe.c
Simple merge