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

FossilOrigin-Name: 71b6f507f1c5feb897b8162c468ecf2547a3d50e

diff --cc Makefile.in
index f35687974398a12fd185e6024c2f5b79ccc568dd,2177488f9b033a5d70957128ac3b8ee2b0ccec44..cd1238406f51c7893ae9e96783c98fc98668acba
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -1072,12 -1059,12 +1072,12 @@@ install:     sqlite3$(BEXE) lib_install sql
        $(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir)
  
  pkgIndex.tcl:
-       echo 'package ifneeded sqlite3 $(RELEASE) [list load [file join \$dir libtclsqlite3.so] Tclsqlite3]' > $@
+       echo 'package ifneeded sqlite3 $(RELEASE) [list load $(TCLLIBDIR)/libtclsqlite3$(SHLIB_SUFFIX) sqlite3]' > $@
  tcl_install:  lib_install libtclsqlite3.la pkgIndex.tcl
 -      $(INSTALL) -d $(DESTDIR)$(TCLLIBDIR)
 -      $(LTINSTALL) libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)
 -      rm -f $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.a
 -      $(INSTALL) -m 0644 pkgIndex.tcl $(DESTDIR)$(TCLLIBDIR)
 +      $(INSTALL) -d $(DESTDIR)$(TCLLIBDIR)/sqlite3
 +      $(LTINSTALL) libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)/sqlite3
 +      rm -f $(DESTDIR)$(TCLLIBDIR)/sqlite3/libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)/sqlite3/libtclsqlite3.a
 +      $(INSTALL) -m 0644 pkgIndex.tcl $(DESTDIR)$(TCLLIBDIR)/sqlite3
  
  clean:        
        rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la

diff --cc main.mk
Simple merge

diff --cc manifest
index a7c001f686aae16b084dee0a419b8139ebffaae0,83880531e829f6771240242212505d3f7255e885..667000facd6afaacc9f8578a677a9ccf48870c3f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\slatest\strunk\senhancements,\sand\sespecially\sthe\sfix\sfor\sthe\sinfinite\nloop\son\sa\sDROP\sTABLE\sin\sa\scorrupt\sdatabase,\sinto\sthe\sapple-osx\sbranch.
- D 2015-03-30T23:52:57.709
 -C Improved\sdetection\sand\ssuppression\sof\sendless\sloops\sin\sclearDatabasePage().
 -D 2015-04-01T13:21:33.901
++C Merge\sall\srecent\strunk\sfixes\sand\senhancements\sinto\sthe\sapple-osx\sbranch.
++D 2015-04-01T16:13:35.905
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in e1da335f215ba86fe687f4d963a45156f3da603e
 -F Makefile.in 00d12636df7a5b08af09116bcd6c7bfd49b8b3b4
++F Makefile.in 4cab9a06c126df8330e76b95d890f99cf20e0de6
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 23e6eaa84569829c3e7f409513caa136e5bcaf2a
+ F Makefile.msc a8d817fa486d8c88dfbd19ae6a6567d9d350de39
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
@@@ -155,7 -152,7 +155,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 3a1f3f34519d0a71d25e946171d4df91bf20bec8
 -F main.mk 997eee18387a3e69394f2f948c9c6ccf079655a4
++F main.mk fb0e6c19ec6e151a8627605aab7d146ec6c459dc
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -176,9 -173,9 +176,9 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 24cc28c8a1508f8650d4f0da75977dbb5884d07b
 -F src/btree.c 2caf598165f3608fde8abac2b243826616ce54b7
++F src/btree.c a6b1c0efbdaffccc1ac8ecf768c59f440baf5581
  F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
- F src/btreeInt.h 2bfefc01875d8da066504c233ec259fcb3b2ef72
+ F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4
  F src/build.c 0419bba592c22f6d00e6d57a2ca7136720d02c1a
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c 198a0066ba60ab06fc00fba1998d870a4d575463
@@@ -217,11 -214,11 +217,11 @@@ 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 a4dadbc2da41599e99093e91e276c38c17a73b89
 -F src/os_win.c 03d27be3a20048ef52a648d5f0a15f5edda9f2a3
 +F src/os_unix.c 895648d4453400e599aa13f5547b96931264ac84
- F src/os_win.c c93a12edf5384bde1fa3c0a8bf9b3f58ca87d098
++F src/os_win.c 93f8662844dc935280a1851d15c823f1e6857408
  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 1299c66e7b1707322ccd8af43a359b8fb0d46d72
  F src/pcache.c 10539fb959849ad6efff80050541cab3d25089d4
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
@@@ -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 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec
- F src/vdbe.c f2c639806aeb71bdc6559450c4d93c8004ede064
 -F src/vdbe.c 86ae6f4774410868af41bd839b72b7081ff03e78
++F src/vdbe.c f76aaab78172a258ff134f3e427ff95faaec362d
  F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
  F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61a94337a3a035d08a0
 -F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
 -F src/vdbeaux.c 413dc496248ac18eb0c19e35e86bb1ffd47b8907
 +F src/vdbeapi.c 36861a49fcb11325e2fce937418b06ce1e3de1a8
 +F src/vdbeaux.c ca50e73011987cee061f7615df920a48a33f3299
  F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
  F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
  F src/vdbesort.c 919717d7599fa31d343ec28bffd0f9e91a4ff5f6
@@@ -344,10 -340,10 +344,10 @@@ F test/async3.test d73a062002376d7edc1f
  F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a
  F test/async5.test 383ab533fdb9f7ad228cc99ee66e1acb34cc0dc0
  F test/atof1.test 08a61df9365c341f334a65f4348897312d8f3db7
- F test/attach.test 63033baa59be42c811ef0d4e73ebd2d6dba4805c
 -F test/attach.test 437107943f14d131cf5efc2ae5305a94d7cb1d58
++F test/attach.test 1e7275728d68631627ab3b81fa48d1fef22796ef
  F test/attach2.test 0ec5defa340363de6cd50fd595046465e9aaba2d
  F test/attach3.test 359eb65d00102cdfcef6fa4e81dc1648f8f80b27
 -F test/attach4.test 53bf502f17647c6d6c5add46dda6bac8b6f4665c
 +F test/attach4.test faaaf33fa51f986b414520cb03cecdc7999df108
  F test/attachmalloc.test 3a4bfca9545bfe906a8d2e622de10fbac5b711b0
  F test/auth.test 855233ef26eb3601b6886567ea4e326c72959360
  F test/auth2.test 264c6af53cad9aba5218c68bbe18036e39007bfa
@@@ -1253,7 -1248,7 +1253,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 a2bd81e575321e23f08d8dc56d4682adb44a513b 395bb3e677a6551b06ba96fc58c393132b93d1e8
- R b8de4eeddf9736bf1b0c979bad0cb527
 -P a828e73dc1ae50189bdf73f60caeb7308738ad7a
 -R 9ae26e7b05df4833a239ec9186729882
++P 4d42bf5e18485be302cf5a3f81d900d7921b4315 30011ad2f55cfcacaf23a58ebcc17b17a7b9355e
++R 49944d24f9d93632056be499ef9e2452
  U drh
- Z 14259944a639eb4c04d55ec65a29a73e
 -Z b113a7338e765a6278a4e0ffd57f1cf8
++Z 990ae49055e64b21819fb2da01d2e197

diff --cc manifest.uuid
index edaf672ac8a64eb399aefaff1a75f4d967fe006d,925ee38b4d35dbf4727abe9f14bac2ed8919a160..ce872e1a432b4c649072a39aca3e0ac65504d54e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4d42bf5e18485be302cf5a3f81d900d7921b4315
 -30011ad2f55cfcacaf23a58ebcc17b17a7b9355e
++71b6f507f1c5feb897b8162c468ecf2547a3d50e

diff --cc src/btree.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/attach.test
Simple merge