Merge all recent trunk enhancements and fixes into the ota-update branch.

FossilOrigin-Name: 9bd3e4453d4ad416f7e3f08f0bd283d34f1c319c

diff --cc main.mk
Simple merge

diff --cc manifest
index 1fb355c6557ddd51a67e98ad728e334aba2fc4cd,7337ec76734d5be15625dc7c61a39e62813940e2..fdc31f4e444e8e88b3bdc6f86e7ea126e00b099d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\sall\schanges\sfor\sversion\s3.8.9\sinto\sthe\sota-update\sbranch.
- D 2015-04-08T14:01:07.788
 -C Remove\san\sincorrect\sassert()\sstatement\sfrom\ssqlite3Fts3Dequote().
 -D 2015-04-15T09:16:39.633
++C Merge\sall\srecent\strunk\senhancements\sand\sfixes\sinto\sthe\sota-update\sbranch.
++D 2015-04-15T14:26:04.771
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 00d12636df7a5b08af09116bcd6c7bfd49b8b3b4
+ F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc a8d817fa486d8c88dfbd19ae6a6567d9d350de39
+ F Makefile.msc 0078f5781538e07ea38683439f38d5f5ab79ab6e
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
- F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
+ F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -170,9 -152,9 +170,9 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 19443a29765ee87f4a4dca28818c6bbff34f738d
 -F main.mk ddffac494a82d42772df9fe30d3a78acf4f7cb41
++F main.mk 95e9c8295b3ce06c0cbe6977b2b3ed8407cfe217
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
- F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
+ F mkopcodeh.awk d5e22023b5238985bb54a72d33e0ac71fe4f8a32
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -241,19 -223,19 +241,19 @@@ F src/parse.y 1299c66e7b1707322ccd8af43
  F src/pcache.c 10539fb959849ad6efff80050541cab3d25089d4
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
  F src/pcache1.c 69d137620a305f814398bd29a0c998038c0695e9
- F src/pragma.c ac4f3f856b4234e85f55b0f069698a4766011100
+ F src/pragma.c 3965ae4e82bed39fb97ce04c5fe18c9bc3ee6a88
  F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
  F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9
- F src/printf.c 8ae1fa9d30c1200a9268a390ba9e9cea9197b27a
+ F src/printf.c 08fa675c200aac29e561c6153f91f909ed17612f
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 41aa91af56d960e9414ce1d7c17cfb68e0d1c6cb
+ F src/resolve.c 66cfe49a9c3b449ef13b89a8c47036a4ed167eab
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c c28c52e353287434fac8473e56ee4be848d12c9d
+ F src/select.c 93260bc9e7e0e6dfe1b7cb8815b0ed4cad8be9e3
  F src/shell.c 84a1593bd86aaa14f4da8a8f9b16fbc239d262aa
- F src/sqlite.h.in 2814e6b51c5a6176eecae4a7d5b7bfaf142283c8
 -F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f
++F src/sqlite.h.in 3be4d9a7d38ef83fadd4aadd7ef3c6039e165da7
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 107b02ed6c64162b653acc2368e982de529e14f6
+ F src/sqliteInt.h 90b7bfd89d7307cd0750663da419ba4bb81e7379
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -310,23 -292,23 +310,23 @@@ F src/trigger.c 69a91bed7c94e46223e37ff
  F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
- F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec
- F src/vdbe.c 86ae6f4774410868af41bd839b72b7081ff03e78
- F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
+ F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
+ F src/vdbe.c 3f3afd12d4794cb51fe13dc948b1172a5eb71a94
+ F src/vdbe.h 7e538ecf47dccb307ea2d087c3ddc2dd8d70e79d
  F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61a94337a3a035d08a0
  F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
- F src/vdbeaux.c 413dc496248ac18eb0c19e35e86bb1ffd47b8907
+ F src/vdbeaux.c a20504ae52392459fa08402fda3f195f19d7c79d
  F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
  F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
- F src/vdbesort.c 919717d7599fa31d343ec28bffd0f9e91a4ff5f6
+ F src/vdbesort.c 2e7f683464fd5db3be4beaa1ff2d39e24fcb64b8
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
- F src/vtab.c 62d49237bd8f3be4863815a39387b0f9897fa5e1
+ F src/vtab.c 9ca557215e8591ceb66e0b7c0a579c6df1e54b2d
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
- F src/wal.c 878c8e1a51cb2ec45c395d26b7d5cd9e1a098e4a
+ F src/wal.c 753995db83247f20361a8e8a874990b21a75abd9
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c bc7276b6e7d4d50055e17cba1d495f804737f872
 -F src/where.c 8ba8ff31dc9bf1b69fe771d35d8764d5a1efd310
 -F src/whereInt.h cbe4aa57326998d89e7698ca65bb7c28541d483c
++F src/where.c 7e5d9a5690e71c39bfc4afea9f351766299dbf2f
 +F src/whereInt.h 1fca2f8c649f0ee38fd52332659d0e7deb11d428
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
@@@ -812,8 -793,8 +812,8 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
 -F test/permutations.test f9cc1dd987986c9d4949211c7a4ed55ec9aecba1
 +F test/permutations.test 0e2dc2aab7b1043bd2b4404f51651c31da007e52
- F test/pragma.test ad99d05e411c7687302124be56f3b362204be041
+ F test/pragma.test e6605ce89c66db930aef561e43a22281a09ffc66
  F test/pragma2.test f624a496a95ee878e81e59961eade66d5c00c028
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
@@@ -1268,7 -1250,7 +1269,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 4e8796af7d40d6ca423e07c68877035e4aa2485c 8a8ffc862e96f57aa698f93de10dee28e69f6e09
- R 5f5852d5f7f1cc470ab35b77b2f9115f
 -P fa0956edf866f48f448967836709a3ad822ff917
 -R ae90fdb352a7af37163dde65a0adec8a
 -U dan
 -Z a5cd9462fba20ef05f7047cbd877b3d9
++P ec9d907a57fcea72c8a64e521e8a1b5777d67568 bd06eeb8d06237dc2d54d8a03e8bf525cb811c9e
++R 6f95f9c15975aab2be755a8183ba89a7
 +U drh
- Z 0c6fb869959322b1de7ded76db4a0dc3
++Z 38e5b36fa5e6d50108fc54dc3af0e0b9

diff --cc manifest.uuid
index 6f06cede7777c6f414fdd078096b84992bd5fa49,6c106f0137fb94ad57d6eae52953f8cbc5dcafb1..3e070661f9448430cefaf34e5bbfc95113acce71
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ec9d907a57fcea72c8a64e521e8a1b5777d67568
 -bd06eeb8d06237dc2d54d8a03e8bf525cb811c9e
++9bd3e4453d4ad416f7e3f08f0bd283d34f1c319c

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

diff --cc src/where.c
Simple merge