Merge all recent trunk fixes and enhancements into the apple-osx branch.

FossilOrigin-Name: b2449d67768f4d3d83877d9c45e5b4b17bb6a551

diff --cc manifest
index ca429ce80a8a7813da0a2e95a8dd6d7d0e0b1075,3c7339464d431be47e186a60af9643c59b88cfc4..fc24938947cc885c147b53fa372bf515c37142d3
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sincrement\sblob\sI/O\sfixes\sfrom\strunk.
- D 2015-02-07T15:30:08.313
 -C Make\ssure\sthe\sprepared\sstatement\sauto-resets\son\sextended\serror\scodes\nof\sSQLITE_BUSY\sand\sSQLITE_LOCKED\seven\swhen\scompiled\susing\nSQLITE_OMIT_AUTORESET.
 -D 2015-02-13T12:05:56.027
++C Merge\sall\srecent\strunk\sfixes\sand\senhancements\sinto\sthe\sapple-osx\sbranch.
++D 2015-02-13T12:13:43.557
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46
 +F Makefile.in e1f1fce0d47e29ffae67c92834d0e6e1c699743e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc fc6b0b233b5621f3e56298e4d6a0b3f6c936c520
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@@ -184,11 -181,11 +184,11 @@@ F src/callback.c 7b44ce59674338ad48b0e8
  F src/complete.c 198a0066ba60ab06fc00fba1998d870a4d575463
  F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
  F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
- F src/delete.c bd1a91ddd247ce13004075251e0b7fe2bf9925ef
- F src/expr.c abe930897ccafae3819fd2855cbc1b00c262fd12
+ F src/delete.c 37964e6c1d73ff49cbea9ff690c9605fb15f600e
+ F src/expr.c 3ef111b88ae2941b84b6b6ea4be8d501ba1af0cb
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e0444b61bed271a76840cbe6182df93a9baa3f12
 -F src/func.c 6d3c4ebd72aa7923ce9b110a7dc15f9b8c548430
 +F src/func.c e331a645ae437de0089d9789f678073a114c804d
  F src/global.c 12561d70a1b25f67b21154622bb1723426724f75
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
@@@ -217,29 -214,28 +217,29 @@@ F src/os.c 5822c2b843a77219bba1e28887cd
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 -F src/os_unix.c aefeaf915aaef9f81aa2645e0d5d06fa1bd83beb
 -F src/os_win.c 8223e7db5b7c4a81d8b161098ac3959400434cdb
 +F src/os_unix.c 06e10d7aaf6b06947d9da35b38ff05000bf5058f
 +F src/os_win.c 1d1ef630b3e3859b7399952909e10d3a4d43fc77
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 4120a49ecd37697e28f5ed807f470b9c0b88410c
 -F src/pager.h c3476e7c89cdf1c6914e50a11f3714e30b4e0a77
 +F src/pager.c 694caffb16891a96608193968d7c9a8fa9a71240
 +F src/pager.h 5ead19acf64a16b7b663476bd36c60d26f03a696
- F src/parse.y c5d0d964f9ac023e8154cad512e54b0b6058e086
+ F src/parse.y 0f8e7d60f0ab3cb53d270adef69259ac307d83a8
  F src/pcache.c d210cf90d04365a74f85d21374dded65af67b0cb
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
  F src/pcache1.c 1e77432b40b7d3288327d9cdf399dcdfd2b6d3bf
 -F src/pragma.c ea0be138a99784b14e87bd4522fea40e7b979e9c
 +F src/pragma.c f5c1ba06527a2d72955637e46075a85765f4ad6e
  F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
 -F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9
 +F src/prepare.c 01740b0d6b8f5c6da421a86c300464ff5b53e167
  F src/printf.c 05edc41450d0eb2c05ef7db113bf32742ae65325
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
+ F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 30da05ba96c2b096a809b0d078fc4d0826e030d0
- F src/shell.c 82c25508dac802b32198af6f5256ca1597c6a1af
 -F src/select.c e46cef4c224549b439384c88fc7f57ba064dad54
++F src/select.c 66c2fce5d5a413915c2c3d989e2bc00e5e905f00
+ F src/shell.c 6276582ee4e9114e0bb0795772414caaf21c0f8e
 -F src/sqlite.h.in 54678c21401909f72b221344dd560d285a1ba5eb
 +F src/sqlite.h.in 886a2a306f811f06ede879493731dfe991224a6e
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 82a4ddf7b38835c3062adff3b9db0c784312e134
 -F src/sqliteInt.h 57a405ae6d2ed10fff52de376d18f21e04d96609
++F src/sqliteInt.h 399d21875c6ae7b03b09b8e97ff639719fccc095
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -297,11 -293,11 +297,11 @@@ F src/update.c 3c4ecc282accf12d39edb8d5
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
  F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
 -F src/vdbe.c ddfc977981cd6324668aa6b114045eb1c677421a
 +F src/vdbe.c 0fa93ce5135f2083abcb28e854be3b4b49477eac
  F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
- F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78
- F src/vdbeapi.c ad6b1bde19d27ec5b278af4a8182ff60fdae5bc3
+ F src/vdbeInt.h bb56fd199d8af1a2c1b9639ee2f70724b4338e3a
 -F src/vdbeapi.c 3d88089b10f71750b019a806224f0277d371a072
 -F src/vdbeaux.c 97911edb61074b871ec4aa2d6bb779071643dee5
++F src/vdbeapi.c 855e0c2f6635b185d59e4f1ee5f66e2ae98d61fb
 +F src/vdbeaux.c 7069b951a45fb7eafed15bd358ae2f35356f33ad
  F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
  F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
  F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2
@@@ -867,10 -862,10 +867,10 @@@ F test/shell1.test ca88b14a8fc8b1f3543a
  F test/shell2.test 12b8bf901b0e3a8ac58cf5c0c63a0a388d4d1862
  F test/shell3.test 5e8545ec72c4413a0e8d4c6be56496e3c257ca29
  F test/shell4.test 8a9c08976291e6c6c808b4d718f4a8b299f339f5
- F test/shell5.test 81aba4793fa7441b1300daae1aec4f7e4b5741c1
+ F test/shell5.test c04e9f9f948305706b88377c464c7f08ce7479f9
  F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
  F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
 -F test/shrink.test 8c70f62b6e8eb4d54533de6d65bd06b1b9a17868
 +F test/shrink.test 41ab166b276af4812bcaf6f1b99c53fab4e706d0
  F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
  F test/skipscan1.test 2ddfe5d168462170c4487f534e2a99fb006b2076
  F test/skipscan2.test d1d1450952b7275f0b0a3a981f0230532743951a
@@@ -1244,7 -1239,7 +1244,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 44711921fea2bb2d804d57b23872ab84156a04ba 5df02f50f8348dfde4fc15126abc7b7ef7803e69
- R bf408e4200aee94ecf190da2131a7d82
 -P 9c5bcad1f7d04c16f3ec7fc483280059ae93961b
 -R af13864c4a0da0631b5572a97e90dd3a
++P 292cf68b4c934c3a666d938d3857f6bd8a484044 3c6ca414879feb1f5d31d5fd95a1737530aca624
++R a4fa39fbad77fa7c6da67fa195c3d3cd
  U drh
- Z bf0e591007dbe516c8487da180fde0bc
 -Z e7512897192b3651fafc4db87dc1b0b1
++Z bc5e67442896497a9aecc645041a623e

diff --cc manifest.uuid
index 43889d1b60df3e047c5164223280656f0af77d73,741fd57b6fdfdfb082adb779986051112b9dc5d6..a7e731fb3ffbe2b19b0e6d220087648e725c5493
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 292cf68b4c934c3a666d938d3857f6bd8a484044
 -3c6ca414879feb1f5d31d5fd95a1737530aca624
++b2449d67768f4d3d83877d9c45e5b4b17bb6a551

diff --cc src/select.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbeapi.c
Simple merge