Merge in fixes (including the corrupt-database crash fix) and

performance enhancements from trunk.

FossilOrigin-Name: fc8ca1a87e7127bd28f32fd809aec3e24355fbfa

diff --cc manifest
index 7940274fe1d431d29af7279f9fbc4be466bec919,fed419c7cfc775d80ac3d0bbc8fd987c421ccdd8..aaca6b665e4a544cad008f84e469204e850933e8
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Bump\sthe\sversion\snumber\sto\s3.8.4.1.,\sto\sconform\swith\strunk.
- D 2014-03-12T10:03:13.582
 -C Add\san\sextra\stest\scase\sfor\sthe\spotential\sbuffer\soverread\spatched\sby\s[28ddecff04].
 -D 2014-03-26T15:14:59.762
++C Merge\sin\sfixes\s(including\sthe\scorrupt-database\scrash\sfix)\sand\nperformance\senhancements\sfrom\strunk.
++D 2014-03-26T19:43:30.427
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 +F Makefile.in e4ee6d36cdf6136aee0158675a3b24dd3bf31a5a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19
 +F Makefile.msc b448317831d9c364bf501538becce5cc1f0a0f8b
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
- F VERSION c3b0d47c3c5cf25c5bd4ff9e6f3af2f9d7934ea6
+ F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -186,8 -172,8 +186,8 @@@ F src/callback.c 174e3c8656bc29f91d710a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
  F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
 -F src/delete.c cdd57149543bb28304d8f717c243f2a86b1fc280
 +F src/delete.c 19df05f1ab55f021605e1c7a3c0a3851876fb3c7
- F src/expr.c 014b8087a15c4c314bdd798cb1cb0b32693f8b40
+ F src/expr.c da2b3cb41081af6b56e95e7c9e95949564ce2e21
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 5269ef07b100763134f71b889327c333bd0989cf
  F src/func.c 2945bb2c4cdc0ac43733046285a4434310be1811
@@@ -200,7 -186,7 +200,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c d247f4de4af161edf1a7abbbe78a281c1b9710c9
 -F src/main.c 691b25754bef596108fe60ff1bcbe8445369c9db
++F src/main.c 81453a961f9096bf0eb76a48d82c0f0509d62bf0
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -231,12 -217,12 +231,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 0adf172d33cc610ff5ffe26edfd2ba67c3551655
- F src/shell.c bab4de12b441369491812ecc93212ff4deda68fa
+ F src/select.c 269c3e31a450fce642a10569221a49180348c88e
+ F src/shell.c cee9f46f2688a261601b1fd3d7f4b3cddf9b5cdf
 -F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80
 +F src/sqlite.h.in a31c8b7782a0388b4bd823ed3a3a3e4b93b0cf42
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 00c7411fe2311279ff525b5e1c1b791696a4ab3b
 -F src/sqliteInt.h afbf39e96736ceb85e1d896b281ba2406dd70aa0
++F src/sqliteInt.h b0fa7a8b72fceda6bf989fba2699b5208c861cbc
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -292,14 -278,14 +292,14 @@@ F src/update.c 7bb549d61efc6853f5cc708c
  F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
  F src/util.c c46c90459ef9bdc0c6c73803cf4c55425b4771cf
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c a088d1688e6e0aeb69ffccb4ba740dfd77b44420
 -F src/vdbe.c 74c7386e83eee56f921a17bb4a0396c9551f5bc7
 -F src/vdbe.h fb2c48c198300a7c632f09fc940011d2ad2fc2ae
 -F src/vdbeInt.h 2b9a6849166d0014c843ae3fd83a062be4efa325
 -F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 -F src/vdbeaux.c f81ef920dcf76aceaa1ce77081e9fc5d7a0993dd
 -F src/vdbeblob.c 15377abfb59251bccedd5a9c7d014a895f0c04aa
++F src/vdbe.c 99f878d003314340d6a1e8a8bb185b60ced628df
 +F src/vdbe.h e8e1219a7fd7395deb7a9824f9b7757d642fcf1a
- F src/vdbeInt.h aa52feb8bfc05ea29ea262a9ce4050715c57ad5a
++F src/vdbeInt.h faadf45c5a0c32a251228222fed380ab1389202e
 +F src/vdbeapi.c d3c662762b62e330a03f29de8e2ac7098ef78030
- F src/vdbeaux.c 1d0dad087b4d35ead04ebcc30e73ae7a172ad80f
++F src/vdbeaux.c 74aa0e2e9c87b2e9c9cdea501dbf9243d7b7759b
 +F src/vdbeblob.c 2d1f0fdb0f5b72118520980360a594b1c30cbdd8
  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
@@@ -1171,7 -1159,7 +1174,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 917c410808756e1697bd628f4c9c57dd13d08ce7 018d317b1257ce68a92908b05c9c7cf1494050d0
- R e68197dcbd06a01cc0babf7d0b8eab3d
 -P 2b28e8d582cf10936fa1faca04a16ca2eeead66f
 -R 76c12b0a4284d7654cb2771b2fc9c8eb
 -U dan
 -Z 22c3e1f8cdae5a20dae420dc313d8edd
++P 42c9d8fc5fe4f0250bfa1f977c7cc63e5741408f f585f5d7a0f9bf8c590388654a3638231eba8892
++R fc3fab040eeffed1a38e67c3557fec70
 +U drh
- Z 3a53fa1abef24a75acc8baf089565dfb
++Z 657de079eefd6dd1d0e2ef048fcceef3

diff --cc manifest.uuid
index d79a80f2c68c48d81b5f3078b420da779ae72d24,bdc4496d4e10f77b7d1074fc03e7c092a646a504..bf4c73b05e96156fa66165b7d7650914fbe2588c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 42c9d8fc5fe4f0250bfa1f977c7cc63e5741408f
 -f585f5d7a0f9bf8c590388654a3638231eba8892
++fc8ca1a87e7127bd28f32fd809aec3e24355fbfa

diff --cc src/main.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge