Merge recent trunk enhancements into the apple-osx branch.

FossilOrigin-Name: 4dd06d8ba1548552a4fc781207efda810cf34e55

diff --cc Makefile.in
index 2352ebc4f588f442fb629d27831124cc239e007f,424d8397509423aa192498bb7a257052a6707ffb..edd9820dd73d82d4b803ece5e430888fb0508acb
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -575,12 -569,13 +582,12 @@@ libsqlite3.la:  $(LIBOBJ
  libtclsqlite3.la:     tclsqlite.lo libsqlite3.la
        $(LTLINK) -no-undefined -o $@ tclsqlite.lo \
                libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
 -              -rpath "$(TCLLIBDIR)" \
 -              -version-info "8:6:8" \
 -              -avoid-version
 +                -rpath "$(TCLLIBDIR)/sqlite3" \
 +              -version-info "8:6:8"
  
- sqlite3$(TEXE):       $(TOP)/src/shell.c libsqlite3.la sqlite3.h $(TOP)/ext/misc/json1.c
-       $(LTLINK) $(READLINE_FLAGS) -DSQLITE_ENABLE_JSON1 -o $@ \
-               $(TOP)/src/shell.c $(TOP)/ext/misc/json1.c libsqlite3.la \
+ sqlite3$(TEXE):       $(TOP)/src/shell.c libsqlite3.la sqlite3.h $(JSON1_DEP)
+       $(LTLINK) $(READLINE_FLAGS) $(JSON1_OPT) -o $@ \
+               $(TOP)/src/shell.c $(JSON1_SRC) libsqlite3.la \
                $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
  
  sqldiff$(TEXE):       $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h

diff --cc main.mk
Simple merge

diff --cc manifest
index 747ed30695936f82dc56e8d2698e5da4c90ce676,54da3e34203fed26268a36e564bb8b0320598d9c..ed3c18e31b3b3b1702b2ec216deac51883483d87
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\strunk\senhancements\sinto\sthe\sapple-osx\sbranch.
- D 2015-09-15T17:20:41.231
 -C Strengthen\sthe\simplementations\sof\sxShmMemoryBarrier\son\sboth\sthe\sunix\sand\nwindows\sVFSes,\sso\sthat\sthey\slikely\swork\seven\sif\sSQLITE_THREADSAFE=0\sis\sused.
 -D 2015-09-24T12:40:43.573
++C Merge\srecent\strunk\senhancements\sinto\sthe\sapple-osx\sbranch.
++D 2015-09-24T14:43:42.823
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 3d5c779460045b6fcc3179f46c27c4ab8716a189
 -F Makefile.in e1afa6fb2de2bddd50e0ddae8166c2ee9d69b301
++F Makefile.in 17b57b12d0128ab89a994674aee4c04265ad3966
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc b268d8be2e800b9d35f074b1ed6b2f698deebdd6
+ F Makefile.msc f090cdf036f3c07fb13aa2f4494e388c0b1ed1e4
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -264,7 -261,7 +264,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk dd4f04d634c006db1eacb93507336fe158f1da79
 -F main.mk d12601118f1d1dadebe1329a53a6d5c512b36d44
++F main.mk 1bb261f467edb039f8b33a72490bbff69c5fce51
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -282,10 -279,10 +282,10 @@@ F src/alter.c 4911e1f18fc11b60edbc64106
  F src/analyze.c 4c308880cf53c558070cb8513bdff4ffb1a38a77
  F src/attach.c e944d0052b577703b9b83aac1638452ff42a8395
  F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
- F src/backup.c 4d9134dc988a87838c06056c89c0e8c4700a0452
+ F src/backup.c c3a9c4209439b806c44cf30daf466955727bf46c
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 1fd5b28b3922ec5df5eee544f54e20fb75bbe099
 -F src/btree.c 164583151135a3764672c2c25aa8e4fa06bdb12b
++F src/btree.c a6b7433b1429d33b2d160f028fb883444d57c0aa
  F src/btree.h 40189aefdc2b830d25c8b58fd7d56538481bfdd7
  F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
  F src/build.c 8a86f4203ac8a9ac0734f242a96f043edffb6018
@@@ -327,29 -324,28 +327,29 @@@ F src/os.c 5822c2b843a77219bba1e28887cd
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 61841d3b4fee28918fb4206edafca7e0183f068b
- F src/os_win.c 8a586f1f7e829e361a41a45fd6cf6a7cc44e7314
 -F src/os_unix.c fc93d55f96bb978f0b0168c6ea7d6fc60b0e172c
 -F src/os_win.c 1716291e5ec2dbfc5a1fe0b32182030f1f7d8acf
++F src/os_unix.c 5d735a657897109af9fffb6e5144de2d091b96f0
++F src/os_win.c 1666013b5b107c70f703abece20e0e2f2137d6bd
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c d4444e61dddd83f0ebf8488c1ec0118623d1b9b6
- F src/pager.h c2471a089cd23dc7e0a9aebb8800ccfd693928a1
 -F src/pager.c 2fbeeba28f4e6d08a15bc106f36c43346a81f09e
 -F src/pager.h ac213f8143ebfee6a8bfb91cf4ca02c9a83343c5
++F src/pager.c 8b1c29e65628361a95f7648789aa8e69f22f2d1b
++F src/pager.h 9c77ab70c5f0becfa3002016de99a73aa7b148b4
  F src/parse.y f599aa5e871a493330d567ced93de696f61f48f7
  F src/pcache.c 24be750c79272e0ca7b6e007bc94999700f3e5ef
  F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
- F src/pcache1.c a0c0bb29f7bd720743a16a95eb5dedba3ade15bc
+ F src/pcache1.c e822007159d53a7ea7aa040d6e28964ddb6de083
 -F src/pragma.c d71b813e67bf03f3116b9dd5164fbfd81ec673a2
 +F src/pragma.c a6b01c318f5cc9723ee4df1b212bffbfc4697d3a
  F src/pragma.h 631a91c8b0e6ca8f051a1d8a4a0da4150e04620a
 -F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
 +F src/prepare.c 176b060bcf36041193c2807f2b045dce1effa4bb
  F src/printf.c 0c4bcdd1c2e2521024f0a69cb5eb334f86b3652a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 3126f7694b8ce0f97282d7dd3a5198b8fa18dce9
+ F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c c17613385bc6b095c421b1f30548814f5fd8a9b2
+ F src/select.c 36ee14d729e182cd8b6796f980b7ab3fc9bcee72
  F src/shell.c 6332ef06db1390ef812cfdff1fc97b4fd76cdd42
- F src/sqlite.h.in 2b58a85a29a93adbee2d2b79523ed05c975b42bd
 -F src/sqlite.h.in 4e06cb5fed36736242c66237991db6f3e2395eb9
++F src/sqlite.h.in f2a9d6ce5db7c2d5777cebfc96054c8abcb8ddfd
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
 -F src/sqliteInt.h 5afc6e50402be1e0a870f28e1cd8b32eb9db590f
 +F src/sqliteInt.h c53f35e3c4622f5c560f078b0e0330faec2313e9
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -407,25 -403,25 +407,25 @@@ F src/update.c eb7ab3ff2928628692a4f14b
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 5048103aa6bc9c01bf1a4620729256d1e873bb6c
 +F src/vdbe.c cc4a5aeb2f3037134c70127a019086aa969f7401
  F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
  F src/vdbeInt.h 8b867eac234e28627ffcace3cd4b4b79bbec664b
- F src/vdbeapi.c 1e25aab83d2a0f4119e8e4c28cc640637430e11c
 -F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c fd00b489ab3f44f2dca1e4344faf289b7bfcf649
++F src/vdbeapi.c b13f483b1375467c367de486edf2be05234e27bb
 +F src/vdbeaux.c f1f5d5acac493d77c8b4240a5bc5c8b6aa7c1227
  F src/vdbeblob.c 1d7b97115e7bbac4c318db416d2ca83fc779544a
  F src/vdbemem.c 19b3036aa4d676e7103b0fb5efd6327da455f915
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2ecfe020c10e0a0c7b078203fdba2fae844744bc
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
 -F src/wal.c 18b0ed49830cf04fe2d68224b41838a73ac6cd24
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 929c1d7e2da94dda41e5c2fa71a919fff91ad04b
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c 882fb44b36201fafc32dd7d59366f852806b7e70
+ F src/where.c d5eed2584542e7f3bc78ddef7809a9d76d14d811
  F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
- F src/wherecode.c 186b493599000e640203be0a441223b395dabd24
+ F src/wherecode.c 7660e1ad16817a921b099af553f3e1349352d16f
  F src/whereexpr.c 2473e4350e30f9b55d1c6a8f66ca23c689f23f1d
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
@@@ -910,10 -906,10 +911,10 @@@ F test/orderby5.test 8f08a54836d21fb7c7
  F test/orderby6.test 8b38138ab0972588240b3fca0985d2e400432859
  F test/orderby7.test 3d1383d52ade5b9eb3a173b3147fdd296f0202da
  F test/orderby8.test 23ef1a5d72bd3adcc2f65561c654295d1b8047bd
- F test/orderby9.test 88a330ea5fc7bed7e407b28beb0d2b79485ae2cc
+ F test/orderby9.test 87fb9548debcc2cd141c5299002dd94672fa76a3
  F test/oserror.test 14fec2796c2b6fe431c7823750e8a18a761176d7
  F test/ovfl.test 4f7ca651cba5c059a12d8c67dddd49bec5747799
 -F test/pager1.test 1acbdb14c5952a72dd43129cabdbf69aaa3ed1fa
 +F test/pager1.test 1c39b52a036afd0813fdd47c9d2ebc83dec8fd90
  F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
  F test/pager4.test a122e9e6925d5b23b31e3dfef8c6a44bbf19590e
@@@ -1032,12 -1028,12 +1033,12 @@@ F test/speed4p.explain 6b5f104ebeb34a03
  F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
  F test/speedtest1.c 857439869d1cb4db35e1c720ee9c2756eb9ea2a0
  F test/spellfix.test 0597065ff57042df1f138e6a2611ae19c2698135
- F test/spellfix2.test e5f2bc1dae046dbdd8008f2a84ed7749ff9b325e
+ F test/spellfix2.test 1ff48bb65b6198d21674ae24d19bb136e547585a
  F test/sqldiff1.test 8f6bc7c6a5b3585d350d779c6078869ba402f8f5
- F test/sqllimits1.test e05786eaed7950ff6a2d00031d001d8a26131e68
+ F test/sqllimits1.test 89b3d5aad05b99f707ee3786bdd4416dccf83304
 -F test/stat.test 8de91498c99f5298b303f70f1d1f3b9557af91bf
 +F test/stat.test d7607786af4054f277f6d48b2465f27b61f380f7
  F test/statfault.test f525a7bf633e50afd027700e9a486090684b1ac1
 -F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
 +F test/stmt.test 78a6764439cfa5abdcbf98d4d084739e81eeec4f
  F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
  F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
@@@ -1271,33 -1267,33 +1272,33 @@@ F test/vtabF.test fd5ad376f5a34fe0891df
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test ea8778d5b0df200adef2ca7c00c3c37d4375f772
 -F test/wal.test dbfc482e10c7263298833bb1fc60b3ac9d6340a1
 -F test/wal2.test 1f841d2048080d32f552942e333fd99ce541dada
 -F test/wal3.test 2ab8e490afe0164bfc89b185c8b2572e0d821f23
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 88b5d9a6a3d1532497ee9f4296f010d66f07e33c
 -F test/wal6.test 4421cd5a2fa99d29cc91ef12fb23bed171ed3a4c
 +F test/wal.test cfbc6bbd2cc519f6cc5c01ae7744ef78785b0957
 +F test/wal2.test 703b87c21c1e3e169d607158de414c7c2655b93e
- F test/wal3.test d7d2f20a26f0277b22f96cd631cd13d23e0545c9
++F test/wal3.test d10d42349df5e42cc930c0a85932cb566dddcc34
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 03043461be964ff80df96d629a7f8db1a95e1b37
 +F test/wal6.test c7d532c76f9e16aec657e529184c52a6e834dae4
  F test/wal64k.test 163655ecd2cb8afef4737cac2a40fdd2eeaf20b8
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test 75c42e1bc4545c277fed212f8fc9b7723cd02216
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
 +F test/wal8.test c35dd183708148120928dca908641c361f58062c
  F test/wal9.test 378e76a9ad09cd9bee06c172ad3547b0129a6750
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test 67339b9e54db0cdaaf21287349bc8056e2919f96
 +F test/walbig.test 3ca3d94751b80054eed5bda20a1339ae1f619483
  F test/walblock.test be48f3a75eff0b4456209f26b3ce186c2015497d
 -F test/walcksum.test 9afeb96240296c08c72fc524d199c912cfe34daa
 -F test/walcrash.test 451d79e528add5c42764cea74aa2750754171b25
 -F test/walcrash2.test a0edab4e5390f03b99a790de89aad15d6ec70b36
 -F test/walcrash3.test e426aa58122d20f2b9fbe9a507f9eb8cab85b8af
 -F test/walfault.test 1f8389f7709877e9b4cc679033d71d6fe529056b
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 -F test/walro.test 34422d1d95aaff0388f0791ec20edb34e2a3ed57
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/walcksum.test 932d12a2a36fb2765560d35e7eaa1e5f0b198385
 +F test/walcrash.test 011e05e9170da888851cb9ec4276bb1894ad32e3
 +F test/walcrash2.test 6eb6842d34cc5955726264c80566963c32a9cbea
 +F test/walcrash3.test 279640ffafa23f7564529ccd69bfb97849ccae9d
 +F test/walfault.test f4160abd02d583d06d7ea9554e7a3f749f6b3410
 +F test/walhook.test 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test aa45339b4afa435dde5d88e71a95459cc221a3f4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
 +F test/walro.test 256ea9380825a34be43e8ff02bd1e240f1f62e8c
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 658066419a92d3bd85be71a11ce477af4ffe9153
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
  F test/where.test 66d4c107e82dfe86c01a96277b77e7a8809aff0b
  F test/where2.test af78c55589cbc82d793449493adba0dc3d659f23
  F test/where3.test 1ad55ba900bd7747f98b6082e65bd3e442c5004e
@@@ -1392,7 -1388,7 +1393,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P d01658adf8680f3d128bb42ea8cc2f1acf46a569 1d018c35b9e81982df036f5e62a4a42219b54e02
- R 5d96cb7a2ad2fb6fd3a3e3a2b0864252
 -P c2fcb03299f2872d7f97a540ea145519f8b2e5cc
 -R 48a05a5fcfc27e989d0482f8603455ad
++P f12b8a0f7958260cb8e6b9be1aaa583cf383b39c c6ab807b72ddfc1462f61aa91442b6fac04ace8a
++R 65ab11fbe3da33745104bdda3062f9ad
  U drh
- Z c2f9ee1b623dafc86e7ced74f3b0b7ce
 -Z 5529d899992d962be9e3269522b69c12
++Z 45e3b9e1f8092f1218dc84c03fca4c89

diff --cc manifest.uuid
index fc4ef5f8d3b538f72be92691e15556396a617cec,8b729d01057956f78a2459a7938f39d39643f4c2..c217cc7b12b6460d0b4c1554f27e7e6bdcdcc1c8
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f12b8a0f7958260cb8e6b9be1aaa583cf383b39c
 -c6ab807b72ddfc1462f61aa91442b6fac04ace8a
++4dd06d8ba1548552a4fc781207efda810cf34e55

diff --cc src/btree.c
Simple merge

diff --cc src/os_unix.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pager.h
Simple merge

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

diff --cc src/vdbeapi.c
Simple merge

diff --cc test/wal3.test
Simple merge