Merge in the latest changes and fixes from trunk.

FossilOrigin-Name: f6211540c9d66a08dc580dd733e4f4a98968ae30

diff --cc manifest
index 751024e85734aad4d2bd658a0599b6222ed4056f,887bb92f5b790741bb2a8b547326460580ca4d3f..1266012e4a48198c81386066e9695e8d5c746e06
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Only\suse\sthe\sdirect-overflow-read\soptimization\sif\sall\sdata\sfrom\sthe\soverflow\spage\sin\squestion\sis\sbeing\sread.
- D 2014-03-20T18:56:35.309
 -C Avoid\sa\s(harmless)\sbuffer\soverread\sthat\sis\spossible\son\san\sOOM\swhen\nMEMSYS5\sis\sengaged.
 -D 2014-03-31T13:42:42.977
++C Merge\sin\sthe\slatest\schanges\sand\sfixes\sfrom\strunk.
++D 2014-03-31T22:03:32.269
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -164,9 -164,9 +164,9 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 0384d399cfb12b3767edec355f00996658bb093e
- F src/btree.h 6b0c1a3f0937f9852ec727c820e71dbdd4bd0b27
 -F src/btree.c a59a199f21338ae1847d69f5db87c3e8ef1b1578
 -F src/btree.h 232836cb51753f2e96aa8ce0f052c6df850f76ba
 -F src/btreeInt.h 0be66063468a520e4d66b80c7a1dc26d04ee6ea4
++F src/btree.c 33338d61b912b5219fc5b466db8e0d7385c0b18b
++F src/btree.h d79306df4ed9181b48916737fe8871a4392c4594
 +F src/btreeInt.h d1784d1e17d08d29e890190dbb9836fa64573381
  F src/build.c 0d50ef95aad63f4c4fc47f3fa2670d4557c45db0
  F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
@@@ -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 5f0fffa9bf49a90c05dc3d46d8217603fd0ee00e
- F src/vdbe.h fb2c48c198300a7c632f09fc940011d2ad2fc2ae
- F src/vdbeInt.h e54fc4f289fce48e81b3371128446033d097733b
+ F src/vdbe.c 74c7386e83eee56f921a17bb4a0396c9551f5bc7
+ F src/vdbe.h 394464909ed682334aa3d5831aae0c2fe2abef94
+ F src/vdbeInt.h e6d83e5bfd62fc6685ba1ed6153f7099f82de9f7
  F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
- F src/vdbeaux.c e45e3f9daf38c5be3fd39e9aacc1c9066af57a06
+ F src/vdbeaux.c 1153175fb57a8454e1c8cf79b59b7bf92b26779d
 -F src/vdbeblob.c 15377abfb59251bccedd5a9c7d014a895f0c04aa
 +F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
  F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
- F src/vdbesort.c 46801acb342e5e4c07ba1777fe58880c143abb59
+ F src/vdbesort.c 4abb7c0f8f19b7d7d82f4558d5da1a30fdf9ea38
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
  F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@@ -1156,7 -1159,7 +1159,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 f500e87d6ec6fa43c13f4e94edf32789f36e4233
- R 97d65ef8b8853428f883a03b9234ff63
- U dan
- Z c025d7be55b561d9bf0252bb6230f9e0
 -P 27deb6e49bcc76714dbdc61b34748603155ac770
 -R 74e3f11f049d7792447568e00e413b7f
++P d8e1f75ddf10f3c0b21acd5455f90fdcea54a948 b3296267fb67b9f59719a37093253062edde3746
++R 6014daa58aba2f75bf5f17a4d16cbf23
+ U drh
 -Z 4989508149fff1b415b46911a02fce9e
++Z 6a8ee270f5925545ed8c5f82edf09850

diff --cc manifest.uuid
index 16aed852aa15fddfefc47e40a4df5d1547374cb2,70f95ac337735ea816e874fbc39c69931863a868..36c381c508f7539c62c46d84063d43932234ac5a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d8e1f75ddf10f3c0b21acd5455f90fdcea54a948
 -b3296267fb67b9f59719a37093253062edde3746
++f6211540c9d66a08dc580dd733e4f4a98968ae30

diff --cc src/btree.c
Simple merge

diff --cc src/btree.h
Simple merge