Merge all recent trunk changes.

FossilOrigin-Name: abfef254721ca29b653f24bfe80e88adaa92dc6c

diff --cc manifest
index 001d216d17cbdb431348f5fa197812311a71b0d4,993d89e6582670861317fe1717021e696801122d..0618241b5d75ab04cd585967ea059608c69c523b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\slatest\senhancements\sfrom\strunk.
- D 2014-10-01T01:52:42.892
 -C Allow\sFTS\stokenizers\sto\schoose\swhether\sor\snot\sto\sconsider\sthe\s"*"\scharacter\spart\sof\stokens\sor\snot.\sThis\srestores\sthe\spre-[e21bf7a2ad]\sbehaviour.\sAlso\sfix\sa\sproblem\scausing\sFTS\sto\sinterpret\stokens\sbeginning\swith\s"*"\scharacters\sas\sEOF.
 -D 2014-10-09T15:08:17.615
++C Merge\sall\srecent\strunk\schanges.
++D 2014-10-10T12:56:35.492
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 +F Makefile.in dd5f245aa8c741bc65845747203c8ce2f3fb6c83
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
 +F Makefile.msc 35808af7f8d999176ed5b38fb482a87a129ee3e1
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 53a0b870e7f16d3b06623c31d233a304c163a6af
@@@ -196,8 -180,8 +196,8 @@@ F src/callback.c 7b44ce59674338ad48b0e8
  F src/complete.c 535183afb3c75628b78ce82612931ac7cdf26f14
  F src/ctime.c bb434068b5308a857b181c2d204a320ff0d6c638
  F src/date.c 57a7f9ba9f6b4d5268f5e411739066a611f99036
 -F src/delete.c fae81cc2eb14b75267d4f47d3cfc9ae02aae726f
 +F src/delete.c de3d07d6602b90ae6e8bdebeb7b3265bb846377f
- F src/expr.c 46a8ca93361d09f2ec6d9b7d524751510569d737
+ F src/expr.c fc204d08af06437ddaffe5a1b1f1f6f9e1a55d6d
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c da985ae673efef2c712caef825a5d2edb087ead7
  F src/func.c ba47c1671ab3cfdafa6e9d6ee490939ea578adee
@@@ -210,11 -194,11 +210,11 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c de741e66e5ddc1598d904d7289239696e40ed994
- F src/main.c c603e28922b78643c4e0747cac356cfb23d599b9
- F src/malloc.c 5bb99ee1e08ad58e457063cf79ce521db0e24195
 -F src/main.c bbe872b0ac0007bed0ebe1936fc493b039ad4f51
++F src/main.c c67be3c356abdf33d00b2345e653c41b4049bee1
+ F src/malloc.c 3c3ac67969612493d435e14b6832793209afd2ec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
- F src/mem2.c dce31758da87ec2cfa52ba4c5df1aed6e07d8e8f
+ F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c 61eeb90134f9a5be6c2e68d8daae7628b25953fb
  F src/memjournal.c 3eb2c0b51adbd869cb6a44780323f05fa904dc85
@@@ -244,16 -228,16 +244,16 @@@ F src/random.c d10c1f85b6709ca97278428f
  F src/resolve.c a3466128b52a86c466e47ac1a19e2174f7b5cf89
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c f11533162b57ed5ed37f549add34cbcdf51f6712
 -F src/shell.c 38f627b0885191357f55902a3ac199de90d79715
 -F src/sqlite.h.in 4a5e5158c189d2bcd45c7c4607c2c0eb6d25c153
 +F src/shell.c 801af09adf9bc64dea59b62880bfb72b42c5f5f2
- F src/sqlite.h.in 2d5eca136aeac3126da4fb3051bb000c6625047b
++F src/sqlite.h.in 514eeb7b0845840c132736e714ddd98ab9216e6c
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h c0e679f9be4081a88c734a357986fe6ffe2fcab7
 -F src/sqliteInt.h 6ac5e34a590ad7ea22af91d190bdb212b12107be
++F src/sqliteInt.h eaacd377fa2eb4761dbad3b762b0483886f76565
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
- F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
+ F src/status.c 961d5926e5a8fda611d385ec22c226b8635cd1cb
  F src/table.c 2e99ef7ef16187e17033d9398dc962ce22dab5cb
 -F src/tclsqlite.c c67d310c833046cccc192125d64ad422ab882684
 +F src/tclsqlite.c 684c317b85f4729de12909bfad80d3f5500357cf
- F src/test1.c 523cd70ded28db71af9a30ec184cbe0957de9575
+ F src/test1.c 518db4305d76b29dd9da3f022ca899c8fcdf9fc7
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -266,7 -250,7 +266,7 @@@ F src/test_async.c 21e11293a2f72080eda7
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
  F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c 5a2a9a580f9c2dfd2ffd52966fd361f2148909d1
 -F src/test_config.c a4cdebe093474c02eecc5e4008b1a22198edf975
++F src/test_config.c 6ff73defc3db475059a9d7ca8023f05f99242c8e
  F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -305,13 -289,13 +305,13 @@@ F src/update.c b9e5295d3a78e96b7c2978c4
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 4006c01772bd8d8ac4306d523bbcee41d3e392d8
  F src/vacuum.c 59f03f92bcff57faa6a8ca256eb29ccddfb0614a
- F src/vdbe.c a96171a2d025cf3dfcea4f0d94232f4bfa192f34
 -F src/vdbe.c fee8286ff026bb9cf96ce87971b60aba53863b78
 -F src/vdbe.h 09f5b4e3719fa454f252322b1cdab5cf1f361327
 -F src/vdbeInt.h 0b97a3190f8fbf460655985a9183019f5a702754
 -F src/vdbeapi.c 37a6c6ae284a97bcace365f2f0a225680c0499d9
 -F src/vdbeaux.c 5b687d7b5beaaa5b97189edf25cf08c311834933
 -F src/vdbeblob.c 848238dc73e93e48432991bb5651bf87d865eca4
 -F src/vdbemem.c 481327f50d9da330053aa7456702ce46d0a4e70f
++F src/vdbe.c 10880af9bbd7e19eda4db1ed7a3f2dd1b645f858
 +F src/vdbe.h d61daeffed696e21630759de9e135ee298ad9573
 +F src/vdbeInt.h 6d4bf3fd28699b5c81a68398e9d23720da58fcd8
- F src/vdbeapi.c cdded67e36d2a20f6d1c7d56f008a646557d2bf0
++F src/vdbeapi.c 30a1c991147fdf4334900b5fed8a312ae7678707
 +F src/vdbeaux.c ea20bde8cad7b15198879255af849f105daa2fa0
 +F src/vdbeblob.c d65b01f439df63911ac3d7a9a85c15503965f2c3
- F src/vdbemem.c 5096fe50a1bd12bc2294a8b27ca6e6d1b15ef607
++F src/vdbemem.c 1731e1db2b71e62243cf825b920d14adefaba3c7
  F src/vdbesort.c 5c1bacf90578d22b630fbf6ed98ccf60d83435ef
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c 019dbfd0406a7447c990e1f7bd1dfcdb8895697f
@@@ -1217,7 -1203,7 +1220,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 1f44bfdc237ee6304f4aa56e5c5d1c0d74fcc944 5ce05757aac80b99c3b2141cd301809f8e28e661
- R 7b6778125f5d37e90ebb0b670b3bd514
 -P bae36d544676c90e337381a83f4513b4d925ab05
 -R f3cda043ab8d3408ba2f57353f2b5a88
 -U dan
 -Z 374021995a45280d12595d646a4004c7
++P 2695772c984c215649a16e1e3e18a8048a6a60dd 49dfee7cd1c9ab2901b8a871a6cd00b2ead76801
++R 0a03cea1a4d1a941b11aa663569e1d01
 +U drh
- Z 7aa260299f51330d2234a568308a124e
++Z 20a722d001f64c3e0f0d27d851d3747e

diff --cc manifest.uuid
index 1498f103ae505fa65e5cbeb83544bc2c6f561007,f52ad1a7cee0c23ba581e65da3fcc7cc1f0f77e6..5aa4866bdc4129eba1734f58252594817da06843
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2695772c984c215649a16e1e3e18a8048a6a60dd
 -49dfee7cd1c9ab2901b8a871a6cd00b2ead76801
++abfef254721ca29b653f24bfe80e88adaa92dc6c

diff --cc src/main.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbemem.c
Simple merge