Merge the latest trunk changes into the apple-osx branch.

FossilOrigin-Name: 696dc935f78dc883faf98cf446f75ce4028e98f8

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 42f40670a5d57509c4a56708adfe17496c87c1e4,58fd42dc62e006e4549243c7b6782ea285eb5a17..c2ae14126d52d2c5556b4c9f6437a727bd199e4c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\srecent\sperformance\senhancements\sand\sthe\sCAST\soperator\senhancements\ninto\sthe\sapple-osx\sbranch.
- D 2014-08-26T02:02:40.589
 -C Update\scomments\sin\sthe\sANALYZE\scommand\sthat\sdescribe\show\sthe\sStat4Accum\nobjecct\sis\spassed\saround\swithin\sthe\sVDBE.\s\sNo\schanges\sto\sfunctional\scode.
 -D 2014-09-01T23:06:44.401
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2014-09-02T15:57:35.887
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in c1a047f376270fb6f201ca44640b43e690bc3db0
 -F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
++F Makefile.in bf041d20aeed250922fb1ba4bd13d34d3fa470e9
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
+ F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 53a0b870e7f16d3b06623c31d233a304c163a6af
@@@ -150,7 -147,7 +150,7 @@@ F ext/sqlrr/sqlrr.h 09e4f8929ad9bc26387
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 2a0146389fdfdfe73f9119828519d6009e7ca25d
 -F main.mk 9b5ccf1097050b1f16681f7d4beeea4f7f7ac2c3
++F main.mk a16b400916a463d2e563225a66df3e55b703d520
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -171,29 -168,29 +171,29 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c ec9d3f1295dafeb278c3830211cc5584132468f4
- F src/btree.c 85855eafcbabe0d75081153d1d72a0724c1f7c61
 -F src/btree.c 2a483a8045118faa99867a8679da42754b532318
++F src/btree.c 1e5bb10be0676d206c2608ce81251df2d4952c63
  F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
  F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
- F src/build.c 058e3aadb1376521ff291735237edf4c10f438fb
+ F src/build.c c26b233dcdb1e2c8f468d49236c266f9f3de96d8
  F src/callback.c b97d0695ffcf6a8710ee445ffe56ee387d4d8a6f
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
  F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
  F src/delete.c 5adcd322c6b08fc25d215d780ca62cebce66304d
- F src/expr.c 358634f4ddeeb4e69643cb6db5819104a7834c60
+ F src/expr.c e1691ab0fe6be7247ef073b0038fb8ecd9944fad
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 8d81a780ad78d16ec9082585758a8f1d6bf02ca3
 -F src/func.c bbb724b74ed96ca42675a7274646a71dd52bcda7
 +F src/func.c 7a252bf7a52b4229462d2d89639d0f4f134dca40
  F src/global.c 1e4bd956dc2f608f87d2a929abc4a20db65f30e4
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c d1a104e67b33314d4cc5c1356147446086ab9fc8
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c 87c92f4a08e2f70220e3b22a9c3b2482d36a134a
 +F src/legacy.c 4d9ad7daba0d8a20fa3ecf5e54fe7ff53e2e0a49
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 31c2122b7dd05a179049bbf163fd4839f181cbab
- F src/main.c 56070be69f574e9d6b9c45cab9dcf905849f8e69
 -F src/main.c d2ef03a45552e11813c68326d5edfda992e319d4
++F src/main.c b3d19f5a1a7341fac59fcdd5ddcdb0619fe98107
  F src/malloc.c 954de5f998c23237e04474a3f2159bf483bba65a
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -211,33 -208,32 +211,33 @@@ F src/os.c 25df79baf4bec87f75a2c4e995d6
  F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c cd50269688fd37b3ce0fe204b61e9be8ec2cfcc0
- F src/os_win.c 85795ec876dd2782b4bc68313d31a574fdf26986
 -F src/os_unix.c 8525ca79457c5b4673a5fda2774ee39fe155f40f
 -F src/os_win.c 2aa8aa7780d7cf03e912d2088ab2ec5c32f33dc5
++F src/os_unix.c 187835e09c26c5070d563b7a73f14a86d33f0d8c
++F src/os_win.c 07c936447222ab5333d300736265c929dd0930f3
  F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
- F src/pager.c cf19f9200a96a18d81fbb5659805b1179c3e6cc0
 -F src/pager.c 3e732d2bbdd8d8d95fed0c5ae7e718d73153c4c5
 -F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
++F src/pager.c 919d4e7eaf27646c290b45c9d6e0ae109f562b3d
 +F src/pager.h 8feb18f845951ab37e1f65a319b2da24185173ac
  F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
- F src/pcache.c da602c5447051705cab41604bf3276815eb569d0
- F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
+ F src/pcache.c 3b3791297e8977002e56b4a9b8916f2039abad9b
+ F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a
  F src/pcache1.c c5af6403a55178c9d1c09e4f77b0f9c88822762c
- F src/pragma.c 0fc087e3b26808051805e147022d6e19603b9453
 -F src/pragma.c 14bcdb504128a476cce5bbc086d5226c5e46c225
 -F src/prepare.c 3842c1dfc0b053458e3adcf9f6efc48e03e3fe3d
++F src/pragma.c 4865f1a42ce4eee35a4f6de290387f2fd9bd8e50
 +F src/prepare.c 8b6e247b5f574e35170ba6fa43b2f649b3add9a1
  F src/printf.c 00986c86ddfffefc2fd3c73667ff51b3b9709c74
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 0ea356d32a5e884add23d1b9b4e8736681dd5697
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
- F src/select.c 13588d2cb2b7193525185f1a040b85b5d50fc71d
- F src/shell.c 728d2226594d356bf4fbdbdfd08538fd78fd06f3
- F src/sqlite.h.in bcae3b0cca0756a57e467500346cc6f2fa81d6c1
 -F src/select.c 89e569b263535662f54b537eb9118b2c554ae7aa
++F src/select.c fa6b6845b09cf4407c1e5019c14a0dbfab54263f
+ F src/shell.c 713cef4d73c05fc8e12f4960072329d767a05d50
 -F src/sqlite.h.in 43852c8b68b4c579948cb37182918078836c5c06
++F src/sqlite.h.in b31477789bbb5bcbfcecf0afcb334240c41ea6a6
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h de747e3ec920064dd8f5cbf377c5bbbc01d3ab05
 -F src/sqliteInt.h 6244ee9052752e26d1275ab20c9b774385aa57d2
++F src/sqliteInt.h 439ad3b98d2342862ce11955ab35948a8e82a052
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c 7d100e2e7aad614bb3d7026a41a0e3827dbaaebc
- F src/test1.c c0fb8033b1a2cf1de32bf02ed73bd7f99bbf162e
 -F src/test1.c 363a5089230a92cf0aaa7a2945da7f2bf3b0a8d3
++F src/test1.c b7d7add79fc86c113c2ed5f1ec1206476e680819
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -248,9 -244,9 +248,9 @@@ F src/test8.c 54ccd7b1df5062f0ecbf50a8f
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
 -F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
 +F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c 581fcfe3069a9eb43ab6b40a279779eea5a8df50
 -F src/test_config.c d5f00627c4f47515a57f905806558153cccd7253
++F src/test_config.c 129629e3735088f58f275ca4d59a284ecc8cbb0b
  F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -288,22 -285,22 +289,22 @@@ F src/update.c ea336ce7b8b3fc5e316ba8f0
  F src/utf.c 77abb5e6d27f3d236e50f7c8fff1d00e15262359
  F src/util.c 068dcd26354a3898ccc64ad5c4bdb95a7a15d33a
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 4a9e8ed75a6654f9a02744497ce08697e3524f9d
 -F src/vdbe.c 90db7ad740b6d3f7ab446e6244dbc17ce495cca6
++F src/vdbe.c 0c353a885a413ce7239610587b637e7124b2ca48
  F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
- F src/vdbeInt.h df58400454823954cfb241e5858f07f37fc1fd78
- F src/vdbeapi.c 785377415e1244b24071ec5746b4735fd1214400
- F src/vdbeaux.c bfde24b04e1edd98f40b0b0a79e9cd05dfcf1189
+ F src/vdbeInt.h cdc8e421f85beb1ac9b4669ec5beadab6faa15e0
 -F src/vdbeapi.c 09677a53dd8c71bcd670b0bd073bb9aefa02b441
 -F src/vdbeaux.c cef5d34a64ae3a65b56d96d3fd663246ec8e1c36
++F src/vdbeapi.c b0122a0326a576a14350f7715873facee427acb3
++F src/vdbeaux.c 5ad6f1a20be8285c13ca15bc1a9af6679afa29db
  F src/vdbeblob.c 848238dc73e93e48432991bb5651bf87d865eca4
- F src/vdbemem.c 4e08ea087aea367dae7c45129b75487e0056e819
- F src/vdbesort.c f7f5563bf7d4695ca8f3203f3bf9de96d04ed0b3
+ F src/vdbemem.c 921d5468a68ac06f369810992e84ca22cc730a62
+ F src/vdbesort.c 02646a9f86421776ae5d7594f620f9ed669d3698
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 019dbfd0406a7447c990e1f7bd1dfcdb8895697f
 -F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 785b8a1fdd5600f2265b57691708329cae9acbad
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
- F src/where.c 4e2770a1914b8ce30f3e44ad954b720eca3b5efd
+ F src/where.c d9eae96b2cbbe4842eac3ee156ccd1b933d802c4
  F src/whereInt.h 923820bee9726033a501a08d2fc69b9c1ee4feb3
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -674,15 -671,14 +675,15 @@@ F test/lock.test 87af515b0c4cf928576d0f
  F test/lock2.test 5242d8ac4e2d59c403aebff606af449b455aceff
  F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00
  F test/lock4.test e175ae13865bc87680607563bafba21f31a26f12
 -F test/lock5.test 5ad6a1f536036ff1be915cfdd41481aeafda3273
 -F test/lock6.test ad5b387a3a8096afd3c68a55b9535056431b0cf5
 +F test/lock5.test 71d0ba9cd23212b5ce1a433107c806203fa6d5f9
 +F test/lock6.test 83434ae8ca1d1c5e2eaf74d4e44aa24ab62b291c
  F test/lock7.test 49f1eaff1cdc491cc5dee3669f3c671d9f172431
  F test/lock_common.tcl 0c270b121d40959fa2f3add382200c27045b3d95
 +F test/lock_proxy.test 95be9c32d79be25cf643b4e41a0aa0e53aa21621
  F test/lookaside.test 93f07bac140c5bb1d49f3892d2684decafdc7af2
 -F test/main.test 39c4bb8a157f57298ed1659d6df89d9f35aaf2c8
 +F test/main.test 3991157c720c2b2b9ec27254d940f06ab81aab84
  F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
- F test/malloc.test 4eb83876dfe4915766c179b687b8640437f14abf
+ F test/malloc.test 96939d2d1a6f39667bbebe5bc27c6525f2ab614e
  F test/malloc3.test e3b32c724b5a124b57cb0ed177f675249ad0c66a
  F test/malloc4.test 957337613002b7058a85116493a262f679f3a261
  F test/malloc5.test fafce0aa9157060445cd1a56ad50fc79d82f28c3
@@@ -757,11 -753,11 +758,11 @@@ F test/pagerfault2.test caf4c7facb914fd
  F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8
  F test/pageropt.test 6b8f6a123a5572c195ad4ae40f2987007923bbd6
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
 -F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
 +F test/pcache.test 488061b5dd685df2234d690370285c9b4813377b
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
- F test/permutations.test bc474bafb022cc5014ef3a9c3d5ab61d6d6f587c
+ F test/permutations.test cef25f5e8499a15846eccd06785f17f4180407ab
 -F test/pragma.test 19d0241a007bcdd77fc2606ec60fc60357e7fc8b
 +F test/pragma.test 5e4805a9535d46d5be677075c9663941fc40615a
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/printf2.test bed79b4c3e5da08ba88ad637c0bf62586843cfb1
@@@ -851,11 -851,11 +856,11 @@@ F test/speed3.test d32043614c08c53eafdc
  F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
  F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
  F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
- F test/speedtest1.c d29c8048beb7ea9254191f3fde9414709166a920
+ F test/speedtest1.c 83f6b3318f7ee60e52b978b5a5e5dd7e83dfb7ee
  F test/spellfix.test 24f676831acddd2f4056a598fd731a72c6311f49
  F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
 -F test/stat.test 76fd746b85459e812a0193410fb599f0531f22de
 -F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
 +F test/stat.test 1e5faf39649a0bb368770f780f926847520ea3f4
 +F test/stmt.test 78a6764439cfa5abdcbf98d4d084739e81eeec4f
  F test/subquery.test 666fdecceac258f5fd84bed09a64e49d9f37edd9
  F test/subquery2.test 91e1e364072aeff431d1f9689b15147e421d88c7
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
@@@ -868,10 -868,10 +873,10 @@@ F test/table.test 2a1d2fa52c531de5915f2
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
  F test/tclsqlite.test 37a61c2da7e3bfe3b8c1a2867199f6b860df5d43
 -F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 +F test/tempdb.test 3263e5c3f0604e54d307481e8587327c54544d18
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl c1355a09c24c0588e8324b95283e8406d92048f2
 -F test/tester.tcl ed77454e6c7b40eb501db7e79d1c6fbfd3eebbff
++F test/tester.tcl a173ad0b6bedc17b5f0445af9ff302bff4885ced
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1158,10 -1158,10 +1163,10 @@@ F tool/logest.c eef612f8adf4d0993dafed0
  F tool/mkautoconfamal.sh 5dc5010e2e748a9e1bba67baca5956a2c2deda7b
  F tool/mkkeywordhash.c dfff09dbbfaf950e89af294f48f902181b144670
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl 78a77b2c554d534c6f2dc903130186ed15715460
+ F tool/mkpragmatab.tcl cce51d8f60c7f145d8fccabe6b5dfdedf31c5f5c
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
- F tool/mksqlite3c-noext.tcl 1712d3d71256ca1f297046619c89e77a4d7c8f6d
- F tool/mksqlite3c.tcl 071ff81a618ca48c89662c0c38284d96887d09c3
+ F tool/mksqlite3c-noext.tcl 88a1e3b0c769773fb7a9ebb363ffc603a4ac21d8
 -F tool/mksqlite3c.tcl e72c0c97fe1a105fa9616483e652949be2199fe6
++F tool/mksqlite3c.tcl 863ce7cee875efae65aafef4a1a7cd14faee46d0
  F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
  F tool/mksqlite3internalh.tcl b6514145a7d5321b47e64e19b8116cc44f973eb1
  F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105
@@@ -1193,7 -1193,7 +1198,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 b91fcb3b1b6d383e023bd0818a2075018fd33b98 af364cce9da0961593ef876b646197f82df08ad5
- R ff2e9252ac4253564e17f67ec3659ed3
 -P 4cae93f8ae8fb3fe38fd5dc7d3a5ea0d11552841
 -R fe37d23fb1f96547febf2ff7c0ba49b9
++P 5c273111058fcb3a1707ea0f3c7ac4b04525aeb0 9779c7a9eb1e2bd36e9286331a9314f064014d80
++R 912a9b080065865a0e00bf5ab38071d4
  U drh
- Z 4280c7da513bf52dc30f227e2f1e37f3
 -Z 29e2a2847ff584a00093c5b89ffca704
++Z d40b462fc9fb4d58e62829bccf3196e6

diff --cc manifest.uuid
index 000d0cc8b1d0c9d80c3a6212d2610ac2501a8e04,af2604f4696f4a9b8a470ab79489620f469f18b6..212bfd8c97ff643f4e9782b7944125d068a4e0d5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5c273111058fcb3a1707ea0f3c7ac4b04525aeb0
 -9779c7a9eb1e2bd36e9286331a9314f064014d80
++696dc935f78dc883faf98cf446f75ce4028e98f8

diff --cc src/btree.c
Simple merge

diff --cc src/main.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/pragma.c
Simple merge

diff --cc src/select.c
Simple merge

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

diff --cc src/sqliteInt.h
index 4a13f10068bb83a773a10d42ebf595c8e64b7301,7fd999d9ee6e1a813ee3ac43cf5bfae7b21bce9f..efae6687afdbaf9e1a12dab01b184e0a45ef3977
--- 1/src/sqliteInt.h
--- 2/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@@ -3713,29 -3726,12 +3736,36 @@@ SQLITE_EXTERN void (*sqlite3IoTrace)(co
  #define MEMTYPE_PCACHE     0x08  /* Page cache allocations */
  #define MEMTYPE_DB         0x10  /* Uses sqlite3DbMalloc, not sqlite_malloc */
  
- 
 +#if (SQLITE_ENABLE_APPLE_SPI>0) && defined(__APPLE__)
 +
 +/*
 +** An instance of the following structure is used to hold the process ID
 +** and return-by-reference lockstate value.  The SQLITE_FCNTL_LOCKSTATE_PID
 +** requires the 4th argument to sqlite3_file_control to be a pointer to an
 +** instance of LockstatePID initialized with a LockstatePID.pid value equal
 +** to a process ID to be tested, or the special value SQLITE_LOCKSTATE_ANYPID
 +** The Lockstate.state value is always set to one of the following values
 +** when sqlite3_file_control returns:
 +** 
 +**   SQLITE_LOCKSTATE_OFF    no active sqlite file locks match the specified pid
 +**   SQLITE_LOCKSTATE_ON     active sqlite file locks match the specified pid
 +**   SQLITE_LOCKSTATE_NOTADB path points to a file that is not an sqlite db file
 +**   SQLITE_LOCKSTATE_ERROR  path was not vaild or was unreadable
 +*/
 +typedef struct LockstatePID LockstatePID;
 +struct LockstatePID {
 +  pid_t pid;                 /* Process ID to test */
 +  int state;                 /* The state of the lock (return value) */
 +};
 +
++#endif /* (SQLITE_ENABLE_APPLE_SPI>0) && defined(__APPLE__) */
++
+ /*
+ ** Threading interface
+ */
+ #if SQLITE_MAX_WORKER_THREADS>0
+ int sqlite3ThreadCreate(SQLiteThread**,void*(*)(void*),void*);
+ int sqlite3ThreadJoin(SQLiteThread*, void**);
  #endif
  
  #endif /* _SQLITEINT_H_ */

diff --cc src/test1.c
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/vdbeaux.c
Simple merge

diff --cc test/tester.tcl
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge