Merge support for large files on Android from trunk.

FossilOrigin-Name: c2885c6bb24cc55178467e57e77bf71df58b3b13

diff --cc manifest
index 33b9992ce775fea3ee4fb252c9ff50821c7ce645,ccd849754b93f376f5f665fa940c84dc5fbadd33..df9dd11580212e7b4c0f016e53bb52d958177adb
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\slatest\strunk\schanges,\sincluding\sthe\smulti-threaded\ssorter,\sinto\nthe\ssessions\sbranch.
- D 2014-09-02T15:49:47.703
 -C Fixes\sto\sos_unix.c\sto\ssupport\sdatabase\s(and\sother)\sfiles\slarger\sthan\s2GiB\son\sAndroid.
 -D 2014-09-06T17:06:13.410
++C Merge\ssupport\sfor\slarge\sfiles\son\sAndroid\sfrom\strunk.
++D 2014-09-08T15:04:24.810
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 +F Makefile.in dd5f245aa8c741bc65845747203c8ce2f3fb6c83
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
 +F Makefile.msc 35808af7f8d999176ed5b38fb482a87a129ee3e1
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 53a0b870e7f16d3b06623c31d233a304c163a6af
@@@ -183,73 -167,73 +183,73 @@@ F src/attach.c 3801129015ef59d76bf23c95
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
  F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
- F src/btmutex.c ec9d3f1295dafeb278c3830211cc5584132468f4
- F src/btree.c 2a483a8045118faa99867a8679da42754b532318
+ F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
+ F src/btree.c b1c1cd1cc3ae2e433a23b9a6c9ab53805707d8cd
  F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
- F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
- F src/build.c c26b233dcdb1e2c8f468d49236c266f9f3de96d8
- F src/callback.c b97d0695ffcf6a8710ee445ffe56ee387d4d8a6f
- F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
+ F src/btreeInt.h e0ecb5dba292722039a7540beb3fc448103273cc
+ F src/build.c 8cb237719c185eec7bd8449b2e747491ded11932
+ F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
+ F src/complete.c 535183afb3c75628b78ce82612931ac7cdf26f14
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
- F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
- F src/delete.c cb7a757eb829ebb046c66f6399435c6636fe1314
- F src/expr.c e1691ab0fe6be7247ef073b0038fb8ecd9944fad
+ F src/date.c 57a7f9ba9f6b4d5268f5e411739066a611f99036
 -F src/delete.c fae81cc2eb14b75267d4f47d3cfc9ae02aae726f
++F src/delete.c de3d07d6602b90ae6e8bdebeb7b3265bb846377f
+ F src/expr.c 441a7e24e2f7bea9475778fa8acce9e8a69ca8f0
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 8d81a780ad78d16ec9082585758a8f1d6bf02ca3
- F src/func.c bbb724b74ed96ca42675a7274646a71dd52bcda7
- F src/global.c 1e4bd956dc2f608f87d2a929abc4a20db65f30e4
+ F src/fkey.c da985ae673efef2c712caef825a5d2edb087ead7
+ F src/func.c 0517037766e18eff7dce298e6b3a8e6311df75ec
+ F src/global.c 5110fa12e09729b84eee0191c984ec4008e21937
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 3d41db1398a5863c4a1c064d2082d0dc43274628
 -F src/insert.c 0b073fade178d9dbd990bbb32b4438e50b884a06
++F src/insert.c 92e955206fadb4d1184161d00894b32c90879e86
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c 87c92f4a08e2f70220e3b22a9c3b2482d36a134a
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 31c2122b7dd05a179049bbf163fd4839f181cbab
- F src/main.c 20a0c78f2b9f66766402d2a6563ffe047c64a8be
 -F src/main.c e48517e3da289d93ad86e8b7b4f68078df5e6e51
++F src/main.c faf3629e61ba31912b474316c02f173878ddd566
  F src/malloc.c 954de5f998c23237e04474a3f2159bf483bba65a
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
- F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
+ F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
  F src/mem2.c dce31758da87ec2cfa52ba4c5df1aed6e07d8e8f
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
- F src/mem5.c 74670012946c4adc8a6ad84d03acc80959c3e529
- F src/memjournal.c 0683aac6cab6ec2b5374c0db37c0deb2436a3785
+ F src/mem5.c 61eeb90134f9a5be6c2e68d8daae7628b25953fb
+ F src/memjournal.c 3eb2c0b51adbd869cb6a44780323f05fa904dc85
  F src/mutex.c 84a073c9a23a8d7bdd2ea832522d1730df18812c
- F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea
+ F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
  F src/mutex_noop.c f3f09fd7a2eb4287cfc799753ffc30380e7b71a1
  F src/mutex_unix.c 1b10d5413dfc794364a8adf3eb3a192926b43fa3
  F src/mutex_w32.c 06bfff9a3a83b53389a51a967643db3967032e1e
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
  F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
- F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
+ F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 8525ca79457c5b4673a5fda2774ee39fe155f40f
- F src/os_win.c 2aa8aa7780d7cf03e912d2088ab2ec5c32f33dc5
+ F src/os_unix.c addd023b26c623fec4dedc110fc4370a65b4768c
+ F src/os_win.c 0a4042ef35f322e86fa01f6c8884c5e645b911e7
  F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
- F src/pager.c 3e732d2bbdd8d8d95fed0c5ae7e718d73153c4c5
+ F src/pager.c 31da9594ad4c3b5851bb6fe1a95c33835ab7ddce
  F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
  F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
- F src/pcache.c 3b3791297e8977002e56b4a9b8916f2039abad9b
+ F src/pcache.c 2048affdb09a04478b5fc6e64cb1083078d369be
  F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a
- F src/pcache1.c c5af6403a55178c9d1c09e4f77b0f9c88822762c
+ F src/pcache1.c dab8ab930d4a73b99768d881185994f34b80ecaa
  F src/pragma.c 14bcdb504128a476cce5bbc086d5226c5e46c225
  F src/prepare.c 3842c1dfc0b053458e3adcf9f6efc48e03e3fe3d
- F src/printf.c 00986c86ddfffefc2fd3c73667ff51b3b9709c74
+ F src/printf.c e74925089a85e3c9f0e315595f41c139d3d118c2
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
- F src/resolve.c 0ea356d32a5e884add23d1b9b4e8736681dd5697
- F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
- F src/select.c 89e569b263535662f54b537eb9118b2c554ae7aa
+ F src/resolve.c 0d1621e45fffe4b4396477cf46e41a84b0145ffb
+ F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
+ F src/select.c b4457526cee73c0b69fad42f799f619b1d5a8a8a
 -F src/shell.c 713cef4d73c05fc8e12f4960072329d767a05d50
 -F src/sqlite.h.in 64a77f2822f1325b12050972003184f99b655a0f
 +F src/shell.c ec6d5f630ed617dc80cbc35d9e45fe47f07923db
- F src/sqlite.h.in 49c501f66e0d6591ebe7588edddf0c4b06c8b9e9
++F src/sqlite.h.in 70de5c9e5ac117363db78d144c7e6f1f65d007a1
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
- F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 465b40ebe68a1a4127e33740550ac53976172652
+ F src/sqlite3ext.h 1f40357fb9b12a80c5a3b2b109fd249b009213d4
 -F src/sqliteInt.h 4d1b0488f097aa7be346176c4d5e3cc1e25d99da
++F src/sqliteInt.h 4d6c5c87324c2b6218c01a0895c0d298fffb5aff
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
- F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 30d8f4ba516061832cfe10d7c71d84e17bff1918
- F src/test1.c 363a5089230a92cf0aaa7a2945da7f2bf3b0a8d3
+ F src/table.c 4e28a53e66bad8d014a510ef0205f5497c712b08
 -F src/tclsqlite.c 8d6d6833c0053f0b3b1aeb1c5c7a7eeff0ad4d3f
++F src/tclsqlite.c 9d0073dda76ab2508c8fde50950f4556fe2fdafb
+ F src/test1.c 22bfe1ce9f2f3746d682093a475ec0a33e0e55d8
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -295,27 -279,27 +295,27 @@@ F src/test_vfs.c f84075a388527892ff1849
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 22dded4283dc4b25422f6444cdcb8d6b1ea0b5ff
- F src/tokenize.c ae45399d6252b4d736af43bee1576ce7bff86aec
- F src/trigger.c 4bddd12803275aa98f1c7ce0118fceb02b2167f6
- F src/update.c b0f38fda25d532343d54b7dc49f55ab73e92ca45
+ F src/tokenize.c 722872c816887fd66931333c59570ebd9622a95f
+ F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
 -F src/update.c 729f6f18fc27740591d085e1172cebe311144bf0
++F src/update.c b9e5295d3a78e96b7c2978c4f9d224d06880f031
  F src/utf.c 77abb5e6d27f3d236e50f7c8fff1d00e15262359
- F src/util.c 068dcd26354a3898ccc64ad5c4bdb95a7a15d33a
- F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 591bd4a84f1c37d004f545f8e805b7e597afc87f
+ F src/util.c 4006c01772bd8d8ac4306d523bbcee41d3e392d8
+ F src/vacuum.c 59f03f92bcff57faa6a8ca256eb29ccddfb0614a
 -F src/vdbe.c 9a45dcbcc967fc0cb9248c75ba245d1d47de3e78
 -F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
 -F src/vdbeInt.h b4843c35c3ba533b69d4250f550b5bacf2fb013d
 -F src/vdbeapi.c e43a6b98f853d8064cc096e349ce47e63d4c72d2
 -F src/vdbeaux.c 91fd1e0c54a765838dc61fcf79f31acce035ce38
 -F src/vdbeblob.c 848238dc73e93e48432991bb5651bf87d865eca4
++F src/vdbe.c 16b7d573a683e70a1e502332c5f90dd48fa34736
 +F src/vdbe.h ca3b6df299adce6e2f499c57e42ae54f142ae823
- F src/vdbeInt.h 872d39f632bfd12897a6ab184ad4c1df5c38eb7a
- F src/vdbeapi.c 6b14e76648bbd10a95a2f3963ee09a8d06658f5e
- F src/vdbeaux.c 3118c164becbbf5a017d04826bbd93559ab9e190
++F src/vdbeInt.h 0dec00acd7e490a456a0ebaa6f478de94da7b52d
++F src/vdbeapi.c d63985095b5d24b522fc206c547df1683a4e73ee
++F src/vdbeaux.c 264284931ecd079076ab40a71522570107b8e723
 +F src/vdbeblob.c d65b01f439df63911ac3d7a9a85c15503965f2c3
- F src/vdbemem.c 921d5468a68ac06f369810992e84ca22cc730a62
- F src/vdbesort.c 02646a9f86421776ae5d7594f620f9ed669d3698
- F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
+ F src/vdbemem.c dc36ea9fe26c25550c50085f388167086ef7d73a
+ F src/vdbesort.c ab39574ec6e0c6213bd2a5c09cca9f9f8ba98450
+ F src/vdbetrace.c 16d39c1ef7d1f4a3a7464bea3b7b4bdd7849c415
  F src/vtab.c 019dbfd0406a7447c990e1f7bd1dfcdb8895697f
- F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
+ F src/wal.c 10e7de7ce90865a68153f001a61f1d985cd17983
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
- F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
- F src/where.c d9eae96b2cbbe4842eac3ee156ccd1b933d802c4
- F src/whereInt.h 923820bee9726033a501a08d2fc69b9c1ee4feb3
+ F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
+ F src/where.c 839b5e1db2507e221ad1c308f148a8519ed750be
+ F src/whereInt.h 124d970450955a6982e174b07c320ae6d62a595c
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@@ -1210,7 -1193,7 +1210,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 08ae974ac80fabe53f515bbbd93ccf55de8ee671 9779c7a9eb1e2bd36e9286331a9314f064014d80
- R 11d01aea9d4869c03771e6bed22886b5
 -P e62aab5e9290503869e1f4d5e0fefd2b4dee0a69 9dca7ce55797b3eb617859f6189c1a2ec6f66566
 -R 4eacabb789e62917f709201f03eadd53
 -U dan
 -Z f60ed4f30cad7188918c7dd18fc1b985
++P d4cce2c71e64ab7b6a65a81b88b69445ed859351 ad7063aa1a0db32cdbe71815545b2edca57d3bcc
++R 4a5cc1720b7ac28a8c5dae667ce4d5c3
 +U drh
- Z 5223b9b83d8a079e78fcc2500add2ce8
++Z 6dac05eb8bc8db62f0a6dc6a2d623660

diff --cc manifest.uuid
index 89f6e35640ae1eb3661f1b98f30dc04930e50222,fc5888a5d9b2d382136a6cd4e42580c874eaa07c..fefc26aff6b45e96b71b1728e54aced82f684798
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d4cce2c71e64ab7b6a65a81b88b69445ed859351
 -ad7063aa1a0db32cdbe71815545b2edca57d3bcc
++c2885c6bb24cc55178467e57e77bf71df58b3b13

diff --cc src/delete.c
Simple merge

diff --cc src/insert.c
Simple merge

diff --cc src/main.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/tclsqlite.c
Simple merge

diff --cc src/update.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge