Merge in the latest changes from trunk.

FossilOrigin-Name: 6d78a25ddce75f63581be60c34dbc75f34c243df

diff --cc Makefile.in
Simple merge

diff --cc ext/rtree/rtree.c
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 1249b6e1f875d8d0004779cc1ff4f4c20b4a9e71,65800fd981d7d46f373891a777e8a52d6044be8b..e1573bd31731ded8b6b7bf61faa37c953647b6bc
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,7 +1,7 @@@
- -----BEGIN PGP SIGNED MESSAGE-----
- Hash: SHA1
- 
- C This\sis\sa\sversion\sof\sthe\sSQLite\s3.7.5\srelease\swith\sApple's\schanges\sfor\sMacOS.
- D 2011-02-10T01:49:18.286
 -C Move\sthe\sexpired-statement\stest\sfor\sOP_Function\suntil\safter\sall\smemory\shas\nbeen\sfreed.\s\sThe\stest\sis\sstill\scommented\sout,\showever.
 -D 2011-04-04T12:29:20.265
++C Merge\sin\sthe\slatest\schanges\sfrom\strunk.
++D 2011-04-04T13:11:07.058
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 0df5f50f0d224a6265a2922f8922cda77b02c89a
 -F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
++F Makefile.in 46b5d5017359f89b1aa89ca3581d6ec577738d96
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -83,7 -81,7 +81,7 @@@ F ext/icu/README.txt bf8461d8cdc6b8f514
  F ext/icu/icu.c 850e9a36567bbcce6bd85a4b68243cad8e3c2de2
  F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c cc46316fd9ab80a2384e49d3c05ab87cf77ca318
 -F ext/rtree/rtree.c 48705ee892c30cc05cd40006d2509ad192530907
++F ext/rtree/rtree.c 155c420fe9bdfec3e1e974cc1f5fe03cb47208b5
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test dbd4250ac0ad367a262eb9676f7e3080b0368206
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -100,12 -99,9 +99,12 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/sqlrr/README.txt 4239030e73023e72a2e727808cd433577d5bf730
 +F ext/sqlrr/sqlrr.c 8d1e6571cd6a6beabdb5bcdfe3a0e723b914db41
 +F ext/sqlrr/sqlrr.h 09e4f8929ad9bc2638732c0cc0db5eef8c417824
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk bb9f05a55a75ca2aed934bb9fbdb985ae97c6a3e
 -F main.mk bd4e376deea4704b2bd9c77a4e6f0fa3de25c495
++F main.mk 31aab5c567b3426ffecfa57e50937608deeec5c9
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -118,42 -114,42 +117,42 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
  F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
- F src/alter.c 6a0c176e64a34929a4436048066a84ef4f1445b3
- F src/analyze.c a038162344265ac21dfb24b3fcc06c666ebb9c07
- F src/attach.c 252c4f7e36cc219349451ed63e278c60e80b26f3
+ F src/alter.c 280f5c04b11b492703a342222b3de0a999445280
+ F src/analyze.c d0a673d303f611690fc7a3293aaefed57cccc5c8
+ F src/attach.c 438ea6f6b5d5961c1f49b737f2ce0f14ce7c6877
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
- F src/backup.c 6728d6d48d55b449af76a3e51c0808849cb32a2e
+ F src/backup.c 537f89c7ef5021cb580f31f782e556ffffcb2ed1
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
- F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff
- F src/btree.c 9004c98fc576306eee4fc0562ffeb362ef53912c
- F src/btree.h 10f9296bf4edf034f5adce921b7b4383a56a1c90
- F src/btreeInt.h 20f73dc93b1eeb83afd7259fbc6bd7dcf2df7fe4
- F src/build.c 00a327120d81ace6267e714ae8010c997d55de5d
- F src/callback.c a1d1b1c9c85415dff013af033e2fed9c8382d33b
+ F src/btmutex.c 3e595ee1bb99e3a1f16824137b435ffc97c98e5f
+ F src/btree.c 107723ed4f9bdb55213ba6164c30c49af75f4bf9
+ F src/btree.h a840a20c1969391f98ee06960d5ee2dc460186b3
+ F src/btreeInt.h 6714ce2f5e879eb9a904a6a4575dc4faa4f29991
+ F src/build.c 3a8c6c4b1e16798755d46e699b7fcc12b9f27b2b
+ F src/callback.c 5069f224882cbdccd559f591271d28d7f37745bc
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c 7deec4534f3b5a0c3b4a4cbadf809d321f64f9c4
+ F src/ctime.c 52ff72f966cee3087e0138a3ec69371c22be3c01
  F src/date.c 1548fdac51377e4e7833251de878b4058c148e1b
  F src/delete.c 7ed8a8c8b5f748ece92df173d7e0f7810c899ebd
- F src/expr.c 1810f3056b11de99cc10e24629edf00e5fbd3a75
+ F src/expr.c 00817c672af554321fd67c44325afd7cef0e4648
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 17950a28f28b23e8ad3feaac5fc88c324d2f600a
- F src/func.c 343c0bd8579d42ce80915c4f258638c1cebc26ea
+ F src/fkey.c 418b840007c873975fd0d071746d952f8bca20ce
 -F src/func.c 3a8cb2fb2de3e3aed7f39106daf4878d9d17fcce
++F src/func.c b6f0b8433b0eaed5d09102863940c1660223b468
  F src/global.c 02335177cf6946fe5525c6f0755cf181140debf3
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c a4995747c062256582a90b4f87f716e11b067050
+ F src/insert.c 8ffb544ff516669aa84a6f13d05dbf5c93bdb1ea
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 -F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 +F src/legacy.c 015826a958f690302d27e096a68d50b3657e4201
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
  F src/loadext.c 8af9fcc75708d60b88636ccba38b4a7b3c155c3e
- F src/main.c de8fd6a086591cfcdf155a315e607509c293fad0
 -F src/main.c c23c62e53d120c5eee086c0e2cc96cc9a691c50e
++F src/main.c edca4ef636a6f7a99db2349490d443917e259627
  F src/malloc.c 92d59a007d7a42857d4e9454aa25b6b703286be1
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 -F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
 +F src/mem1.c 46095d62b241466ef51970e592aa3a7a87e443e1
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
  F src/mem3.c 9b237d911ba9904142a804be727cc6664873f8a3
- F src/mem5.c 6fe00f46997bebb690397cb029719f711e7640e3
+ F src/mem5.c 72e0bc40f535ac38a11712aed01d0014f9300732
  F src/memjournal.c 0ebce851677a7ac035ba1512a7e65851b34530c6
  F src/mutex.c 6949180803ff05a7d0e2b9334a95b4fb5a00e23f
  F src/mutex.h fe2ef5e1c4dae531d5a544f9241f19c56d26803d
@@@ -165,32 -161,31 +164,32 @@@ F src/notify.c 976dd0f6171d4588e89e874f
  F src/os.c 22ac61d06e72a0dac900400147333b07b13d8e1d
  F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
  F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
- F src/os_os2.c 2e452c9f2ca507623ad351c33a8a8b27849b1863
- F src/os_unix.c 9b2e17514578abddb9b6577424de39577a3e48f0
- F src/os_win.c 9abdcdd925416d854eabb0996c96debd92abfef5
- F src/pager.c b0fcbe3038fd08b111e1cf1deddd5f42418004d8
- F src/pager.h 0ea59db2a33bc6c2c02cae34de33367e1effdf76
+ F src/os_os2.c 2596fd2d5d0976c6c0c628d0c3c7c4e7a724f4cf
 -F src/os_unix.c 32414676594a0a26cfccd7e02656230a3406eee7
++F src/os_unix.c 4cef66b6bc496323b1a05f23f5ad92e70a0843f2
+ F src/os_win.c 24d72407a90551969744cf9bcbb1b4c72c5fa845
+ F src/pager.c 6aa906b60a59664ba58d3f746164bb010d407ce1
+ F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
  F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
  F src/pcache.c 09d38c44ab275db581f7a2f6ff8b9bc7f8c0faaa
  F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
  F src/pcache1.c d548e31beafa792d1994b663a29a5303569efc4e
- F src/pragma.c 3ff495d7f9c51c58d33269dfb8d5bd9f82c3d566
- F src/prepare.c ce4af845101308f785087a7071758bc4449f25b2
- F src/printf.c df2ff3bb5409e8958136933342c46464fbd017e7
 -F src/pragma.c 4221eb822d7cdb1fb69be555b189e15e5a24b6b5
 -F src/prepare.c eb4944d9f7bfa13eb42a7416ed9aaed4de4d0bf3
++F src/pragma.c 7e1eb402cfae98c627e334da56a3015d77105108
++F src/prepare.c cdd214500fd172578ba5672ccf4d1c1e7563db9b
+ F src/printf.c 585a36b6a963df832cfb69505afa3a34ed5ef8a1
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c 8a7ba246b0b4bb45df7fbc52681728a0e3deaaa7
- F src/shell.c 83c6f0cc5a79a081c7b9ddfe4f557b47e0bad976
- F src/sqlite.h.in 76955fcd1c5371268ecc8afe0ce6c49ea750ae38
+ F src/select.c d24406c45dd2442eb2eeaac413439066b149c944
+ F src/shell.c 9dc0b4bb59290c0a35256d278cab0f314987ad6a
+ F src/sqlite.h.in e047f69a61d604d4f8be6cf1d1bdfc68be9ba7e5
 +F src/sqlite3_private.h 2a814d17913732831acf13e7e87860105a3416e4
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h 45926deaf59b1ce3f55d21d5f91a8cecb6a7eb4c
+ F src/sqliteInt.h d45b0b1db417d5308e3bf9c8983aaf2d06e7cd36
  F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
  F src/status.c 4997380fbb915426fef9e500b4872e79c99267fc
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 549859dc2c143f3deb6a92636a2d27973652c164
- F src/test1.c ffc41da99a715c662cad62920106ac8d9aaf32ef
+ F src/tclsqlite.c 501c9a200fd998a268be475be5858febc90b725b
 -F src/test1.c 9ca440e80e16e53920904a0a5ac7feffb9b2c9a1
++F src/test1.c 23a02a6201d2799e2727ce40d93aa04d87fb09e2
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 056093cfef69ff4227a6bdb9108564dc7f45e4bc
  F src/test4.c 0528360b5025688002a5feb6be906ddce52eaaee
@@@ -201,13 -196,14 +200,14 @@@ F src/test8.c 6b1d12912a04fe6fca8c45bb9
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
  F src/test_async.c 0612a752896fad42d55c3999a5122af10dcf22ad
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
 -F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
 +F src/test_backup.c 64fd6173ad99daade1227aa17c3ca0d18fa5e5fa
  F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
- F src/test_config.c 4c093dae195323e9b9a5482d48a34ba912cefd8e
 -F src/test_config.c 62f0f8f934b1d5c7e4cd4f506ae453a1117b47d7
++F src/test_config.c d0711ab7576f65704c53c76ceb18c0e90c03e0f8
  F src/test_demovfs.c 0aed671636735116fc872c5b03706fd5612488b5
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
- F src/test_func.c 13b582345fb1185a93e46c53310fae8547dcce20
- F src/test_hexio.c 1237f000ec7a491009b1233f5c626ea71bce1ea2
+ F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
+ F src/test_fuzzer.c f884f6f32e8513d34248d6e1ac8a32047fead254
+ F src/test_hexio.c c4773049603151704a6ab25ac5e936b5109caf5a
  F src/test_init.c 5d624ffd0409d424cf9adbfe1f056b200270077c
  F src/test_intarray.c d879bbf8e4ce085ab966d1f3c896a7c8b4f5fc99
  F src/test_intarray.h 489edb9068bb926583445cb02589344961054207
@@@ -228,26 -226,28 +230,28 @@@ F src/test_syscall.c 34ce1be806cd180e24
  F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
  F src/test_thread.c bedd05cad673dba53326f3aa468cc803038896c0
  F src/test_vfs.c 2ed8853c1e51ac6f9ea091f7ce4e0d618bba8b86
+ F src/test_vfstrace.c 2265c9895f350c8d3c39b079998fbe7481505cc1
+ F src/test_wholenumber.c 6129adfbe7c7444f2e60cc785927f3aa74e12290
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 604607d6813e9551cf5189d899e0a25c12681080
- F src/trigger.c b8bedb9c0084ceb51a40f54fcca2ce048c8de852
- F src/update.c 227e6cd512108b84f69421fc6c7aa1b83d60d6e0
- F src/utf.c 1baeeac91707a4df97ccc6141ec0f808278af685
- F src/util.c ab1c92426494f499f42b9e307537b03e923d75c1
+ F src/trigger.c ec4813709e990a169b6923293e839fa5dfd64282
+ F src/update.c 81911be16ece3c3e7716aa18565b4814ec41f8b9
+ F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
+ F src/util.c cd997077bad039efc0597eb027c929658f93c018
  F src/vacuum.c 924bd1bcee2dfb05376f79845bd3b4cec7b54b2f
- F src/vdbe.c 624c618542806c2075588ee5d2bdf43d91e34c21
 -F src/vdbe.c 6488f759929602cbc3acea5e9c7c10e2d2cd00ed
++F src/vdbe.c 01b975f07a860a957927a46c217b2a9fb392db55
  F src/vdbe.h 4de0efb4b0fdaaa900cf419b35c458933ef1c6d2
- F src/vdbeInt.h 6e6f28e9bccc6c703dca1372fd661c57b5c15fb0
- F src/vdbeapi.c 35553aa4e234c173858606665f28bafafea22ae1
- F src/vdbeaux.c 33448d23b857654dd69ed2103611f5c733606f68
- F src/vdbeblob.c 18955f0ee6b133cd08e1592010cb9a6b11e9984c
- F src/vdbemem.c 411649a35686f54268ccabeda175322c4697f5a6
+ F src/vdbeInt.h 7e2f028ecc1a9faa6f253e7aa8d89cae03662bae
 -F src/vdbeapi.c a09ad9164cafc505250d5dd6b69660c960f1308c
++F src/vdbeapi.c bb9859f2c86fea99d06adb54f5e63939d96a36c3
+ F src/vdbeaux.c 010e4e67a5a577451b0220ea8903c9e279a43248
+ F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
+ F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 3ba13bc32bdf16d2bdea523245fd16736bed67b5
- F src/vtab.c b297e8fa656ab5e66244ab15680d68db0adbec30
- F src/wal.c dbca424f71678f663a286ab2a98f947af1d412a7
- F src/wal.h c1aac6593a0b02b15dc625987e619edeab39292e
+ F src/vtab.c e1edca38c4c4310710635bb91bb3c87fdf60f21d
+ F src/wal.c 7334009b396285b658a95a3b6bc6d2b016a1f794
+ F src/wal.h 7a5fbb00114b7f2cd40c7e1003d4c41ce9d26840
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c af069e6b53234118014dabfece96a9515b69d76b
+ F src/where.c 176574bfeee13775761ce56416f773b0ec115d3f
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
  F test/all.test 51756962d522e474338e9b2ebb26e7364d4aa125
@@@ -265,7 -268,7 +272,7 @@@ F test/async2.test bf5e2ca2c96763b4cba3
  F test/async3.test 93edaa9122f498e56ea98c36c72abc407f4fb11e
  F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a
  F test/async5.test f3592d79c84d6e83a5f50d3fd500445f7d97dfdf
- F test/attach.test ccdedd5496a0244f8e45366ba9253af30083ea84
 -F test/attach.test 2bb09073d7d5499127db00f50780766dcea913e1
++F test/attach.test e26b6c050d5b2ba0064288137bdd325370c11e65
  F test/attach2.test a295d2d7061adcee5884ef4a93c7c96a82765437
  F test/attach3.test bd9830bc3a0d22ed1310c9bff6896927937017dc
  F test/attachmalloc.test 1d5b821a676f7bf0b00d87cc106b78966789ba57
@@@ -378,15 -382,15 +386,15 @@@ F test/enc.test e54531cd6bf941ee6760be0
  F test/enc2.test 6d91a5286f59add0cfcbb2d0da913b76f2242398
  F test/enc3.test 5c550d59ff31dccdba5d1a02ae11c7047d77c041
  F test/enc4.test 4b575ef09e0eff896e73bd24076f96c2aa6a42de
- F test/eqp.test 69670e7919030f21de29fb99bf1d68f97aedcbdb
+ F test/eqp.test f14fadd76da53405e9885e2431cacf7191d83cdb
  F test/eval.test bc269c365ba877554948441e91ad5373f9f91be3
 -F test/exclusive.test 53e1841b422e554cecf0160f937c473d6d0e3062
 +F test/exclusive.test 897074dc6706b0c4f3b1dc4580ffddffe2a79206
- F test/exclusive2.test b65264c3e76e1db6c6eda15c02000a40743f6541
+ F test/exclusive2.test 343d55130c12c67b8bf10407acec043a6c26c86b
  F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
- F test/expr.test 620a636cf7b7d4e5834a0b9d83a4da372e24a7b7
+ F test/expr.test 19e8ac40313e2282a47b586d11c4892040990d3a
 -F test/fallocate.test 43dc34b8c24be6baffadc3b4401ee15710ce83c6
 +F test/fallocate.test a9927b638567e2e776c112f54d701402a0e74023
  F test/filectrl.test 97003734290887566e01dded09dc9e99cb937e9e
- F test/filefmt.test f77c92141960b7933bc6691631d2ad62257ef40a
+ F test/filefmt.test f178cfc29501a14565954c961b226e61877dd32c
  F test/fkey1.test 01c7de578e11747e720c2d9aeef27f239853c4da
  F test/fkey2.test 080969fe219b3b082b0e097ac18c6af2e5b0631f
  F test/fkey3.test 42f88d6048d8dc079e2a8cf7baad1cc1483a7620
@@@ -557,11 -565,12 +570,12 @@@ F test/mallocH.test 79b65aed612c9b3ed2d
  F test/mallocI.test a88c2b9627c8506bf4703d8397420043a786cdb6
  F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
  F test/mallocK.test d79968641d1b70d88f6c01bdb9a7eb4a55582cc9
- F test/malloc_common.tcl 4c63cf4e38cca5d1f21910e38a15ab78899678e8
 -F test/malloc_common.tcl 50d0ed21eed0ae9548b58935bd29ac89a05a54fa
 -F test/manydb.test b3d3bc4c25657e7f68d157f031eb4db7b3df0d3c
++F test/malloc_common.tcl 228af61862dd3f61f09dab4251ce3c1660b8b878
 +F test/manydb.test 7faa0df55bbab2b14c25f323801db336c4e7ce3a
- F test/memdb.test f773146f66ee2c635854a8264317f39a6cc3e18c
+ F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
 -F test/memdb.test 708a028d6d373e5b3842e4bdc8ba80998c9a4da6
++F test/memdb.test 4aa287fc0c18229086e7c286285d60773f0169c4
  F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
 -F test/memsubsys1.test 679db68394a5692791737b150852173b3e2fea10
 +F test/memsubsys1.test 7abc5c90b20e25040e2c800e3d95703d59d843a2
  F test/memsubsys2.test 72a731225997ad5e8df89fdbeae9224616b6aecc
  F test/minmax.test 722d80816f7e096bf2c04f4111f1a6c1ba65453d
  F test/minmax2.test 33504c01a03bd99226144e4b03f7631a274d66e0
@@@ -583,19 -592,21 +597,21 @@@ F test/notify2.test 195a467e021f74197be
  F test/notify3.test d60923e186e0900f4812a845fcdfd8eea096e33a
  F test/notnull.test cc7c78340328e6112a13c3e311a9ab3127114347
  F test/null.test a8b09b8ed87852742343b33441a9240022108993
+ F test/omitunique.test bbb2ec4345d9125d9ee21cd9488d97a163020d5f
  F test/openv2.test af02ed0a9cbc0d2a61b8f35171d4d117e588e4ec
- F test/pager1.test 7006a8b5dd3df1fe0d51d7da014333d7dc099778
+ F test/oserror.test 498d8337e9d15543eb7b004fef8594bf204ff43c
+ F test/pager1.test d8672fd0af5f4f9b99b06283d00f01547809bebe
  F test/pager2.test 745b911dde3d1f24ae0870bd433dfa83d7c658c1
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
 -F test/pagerfault.test 9de4d3e0c59970b4c6cb8dac511fa242f335d8a7
 +F test/pagerfault.test bea066b9162e1ab6843c2c1524ebb0965715e956
  F test/pagerfault2.test 1f79ea40d1133b2683a2f811b00f2399f7ec2401
- F test/pagerfault3.test 9b413f48a3e9a9a8c26968118f8db19fd7bfb8c7
+ F test/pagerfault3.test f16e2efcb5fc9996d1356f7cbc44c998318ae1d7
  F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806
  F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
- F test/permutations.test c0ce0f3b741dd92a6d4c2671dbacba4b92dd81eb
+ F test/permutations.test 5b2a4cb756ffb2407cb4743163668d1d769febb6
 -F test/pragma.test fdfc09067ea104a0c247a1a79d8093b56656f850
 +F test/pragma.test 88048136eed6baa2097dd7ab5145d3288128ca70
  F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
  F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -664,15 -675,17 +680,17 @@@ F test/stmt.test 78a6764439cfa5abdcbf98
  F test/subquery.test b524f57c9574b2c0347045b4510ef795d4686796
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
  F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
- F test/superlock.test 8468e057d8a5531ff99e504e77fcc585a0291bf2
+ F test/superlock.test 5d7a4954b0059c903f82c7b67867bc5451a7c082
  F test/sync.test ded6b39d8d8ca3c0c5518516c6371b3316d3e3a3
+ F test/syscall.test 02e5359bf4f5e6f716696318fde4e0b5c2c70d21
+ F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f
  F test/table.test 04ba066432430657712d167ebf28080fe878d305
- F test/tableapi.test 7262a8cbaa9965d429f1cbd2747edc185fa56516
+ F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tclsqlite.test 8c154101e704170c2be10f137a5499ac2c6da8d3
 -F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 +F test/tempdb.test 3263e5c3f0604e54d307481e8587327c54544d18
  F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
  F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
 -F test/tester.tcl dafe0d30279f6d380d5d2a535781dda91b8cfc3f
 +F test/tester.tcl 656849799443f3daa8022b646424c526c9e36fb7
  F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
  F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
  F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
@@@ -842,27 -860,28 +865,28 @@@ F test/vtabE.test 7c4693638d7797ce2eda1
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d
- F test/wal.test d83c3d227e9e9bb5c7a0c1447ea4a3c6cd5fced4
- F test/wal2.test 65587c92ca35a4112ac3e78eac6a3df395346ef8
- F test/wal3.test d3db776b107729d18c3e69b09690099f06083ff9
 -F test/wal.test 973a4747a69247a43cc03292c44f59cc76f4df65
 -F test/wal2.test e561a8c6fdd1c2cd1876f3e39757934e7b7361f8
 -F test/wal3.test 5c396cc22497244d627306f4c1d360167353f8dd
 -F test/wal4.test 3404b048fa5e10605facaf70384e6d2943412e30
++F test/wal.test f30615b9c00ba6cd5741db7c17836c2c3785b8ce
++F test/wal2.test 885142e522e94e2955b426dae392a1b56c101063
++F test/wal3.test 34c65b1cb78e1da5d24c9ab74534c376784f96ea
 +F test/wal4.test 6a68c45bc1ca24a3592ec449ddcb92b29d0e0e87
+ F test/wal5.test 1bbfaa316dc2a1d0d1fac3f4500c38a90055a41b
  F test/wal6.test 07aa31ca8892d0527f2c5c5a9a2a87aa421dfaa8
- F test/wal_common.tcl 895d76138043b86bdccf36494054bdabcf65837b
+ F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test 4df1c7369da0301caeb9a48fa45997fd592380e4
 -F test/walbig.test e882bc1d014afffbfa2b6ba36e0f07d30a633ad0
 -F test/walcksum.test a37b36375c595e61bdb7e1ec49b5f0979b6fc7ce
 -F test/walcrash.test e763841551d6b23677ccb419797c1589dcbdbaf5
 -F test/walcrash2.test 019d60b89d96c1937adb2b30b850ac7e86e5a142
 -F test/walfault.test 58fce626359c9376fe35101b5c0f2df8040aa839
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 22ddccd073c817ac9ead62b88ac446e8dedc7d2c
 +F test/walbak.test 767e1c9e0ea0cfb907873b332883e66e187fa4bc
 +F test/walbig.test 78ac493db2abdb65b9c6cace5b851cc32df1d449
 +F test/walcksum.test cf6787f2ee1a6a3da6f0c2b20b9ede5153e4e03f
 +F test/walcrash.test 80c1cc3173a0ef09d8303fa556cb0187a36d82ea
 +F test/walcrash2.test 929c99d14ee2e3e3ef82585058968a8b12f72706
- F test/walfault.test 395354b447eb3b249b725651fdbb6a83c461b5b4
++F test/walfault.test 7db81f3dac64ce8897196f199c2909078bcabf8d
 +F test/walhook.test c934ac5219fee2b4e7653d291db9107b8dc73bba
 +F test/walmode.test feb39956ec6f415fbb9dcb12d91243391c2c4715
  F test/walnoshm.test a074428046408f4eb5c6a00e09df8cc97ff93317
 -F test/walshared.test 6dda2293880c300baf5d791c307f653094585761
 -F test/walslow.test d21625e2e99e11c032ce949e8a94661576548933
 -F test/walthread.test a25a393c068a2b42b44333fa3fdaae9072f1617c
 +F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 +F test/walslow.test 989854bc5c214700a9f2d545bb158643813b8881
 +F test/walthread.test e6e32e93ccebfa401dfc0dd930c79daa3472b0ae
  F test/where.test de337a3fe0a459ec7c93db16a519657a90552330
  F test/where2.test 43d4becaf5a5df854e6c21d624a1cb84c6904554
- F test/where3.test 8ebedae552e13fc7f2b4e8df6cbe72a095347400
+ F test/where3.test 8e1175c7ef710c70502858fc4fb08d784b3620b9
  F test/where4.test e9b9e2f2f98f00379e6031db6a6fca29bae782a2
  F test/where5.test fdf66f96d29a064b63eb543e28da4dfdccd81ad2
  F test/where6.test 5da5a98cec820d488e82708301b96cb8c18a258b
@@@ -883,13 -902,13 +907,13 @@@ F tool/lempar.c 01ca97f87610d1dac6d8cd9
  F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
- F tool/mksqlite3c.tcl 136c838dba145ad65296522ff27cdd792657eaa0
 -F tool/mksqlite3c.tcl 623e26cc8c83322e4151d3ad85ac69d41221bae8
++F tool/mksqlite3c.tcl 98afd75c54489dd27b505fca45e3cc6943cb2409
  F tool/mksqlite3h.tcl d76c226a5e8e1f3b5f6593bcabe5e98b3b1ec9ff
  F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
- F tool/omittest.tcl 27d6f6e3b1e95aeb26a1c140e6eb57771c6d794a
+ F tool/omittest.tcl 4f4cc66bb7ca6a5b8f61ee37b6333f60fb8a746a
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
  F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
- F tool/shell1.test c31b0814a9c543db51ca0cc63edb5e77ea532303
+ F tool/shell1.test f608a009b04c490fd360c5ded458a6f98b4e7ec4
  F tool/shell2.test 5dc76b8005b465f420fed8241621da7513060ff3
  F tool/shell3.test 4fad469e8003938426355afdf34155f08c587836
  F tool/shell4.test 35f9c3d452b4e76d5013c63e1fd07478a62f14ce
@@@ -905,15 -924,9 +929,9 @@@ F tool/speedtest16.c c8a9c793df96db7e49
  F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
+ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 09d6c91dcff0699daec02de0cfd1cdc4e61b4f6b ed759d5a9edb3bba5f48f243df47be29e3fe8cd7
- R d7600af83b21d6c58e9f46b92ab932a6
 -P 4e996f36c73c5e768a954394fcbbf5e17576c807
 -R 4c64876ffe2c0a670add1f1b62152ed8
++P 55d2e55b7b0f7851a565e3a982f772afdf8d7a12 425e3edb146c497817855dd741878709a25c8b98
++R bd5fe0f4ee340cef15686857886c6583
  U drh
- Z f3b0c5cf2c174ccd832cd370332f35ff
- -----BEGIN PGP SIGNATURE-----
- Version: GnuPG v1.4.6 (GNU/Linux)
- 
- iD8DBQFNU0QhoxKgR168RlERAihVAJ9u5iAV3TqmB75uUGWDZXKRno5kRwCfaVoJ
- 0i0nYIgHaDL9cSkjG+mmaX0=
- =1/ln
- -----END PGP SIGNATURE-----
 -Z badc0ef9dd3fcc800ebaf4f50ec0d36c
++Z 63eef7e56d08532617282b251650ea42

diff --cc manifest.uuid
index 7d44f67dc147ad512a12472aa2f7c1527e8239d5,3a4413c91a396cd4c6d4d83d55fb83a76282dbc2..fa3546fb60bb438045ea63dc0ba1e2f9969f82bb
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 55d2e55b7b0f7851a565e3a982f772afdf8d7a12
 -425e3edb146c497817855dd741878709a25c8b98
++6d78a25ddce75f63581be60c34dbc75f34c243df

diff --cc src/func.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os_unix.c
index c5d0e26e84298a57d05f7fbadee677e5d015493b,67dd06fc1c6776a26aa080f38ceace2a7a2ab9c7..a528b4a7cfea15a9e22017405b3fff2d6d498a2b
--- 1/src/os_unix.c
--- 2/src/os_unix.c
+++ b/src/os_unix.c
@@@ -2875,16 -3187,7 +3193,16 @@@ static int full_fsync(int fd, int fullS
    rc = SQLITE_OK;
  #elif HAVE_FULLFSYNC
    if( fullSync ){
-     rc = fsync(fd);
 +#ifdef SQLITE_USE_REQUEST_FULLFSYNC
-     rc = fcntl(fd, F_FULLFSYNC, 0);
++    rc = osFsync(fd);
 +    if (!rc) {
 +      OSSpinLockLock(&notify_lock);
 +      rc = notify_post(REQUEST_FULLSYNC_NOTIFICATION);
 +      OSSpinLockUnlock(&notify_lock);
 +    }
 +#else
+     rc = osFcntl(fd, F_FULLFSYNC, 0);
 +#endif
    }else{
      rc = 1;
    }
@@@ -4938,10 -5065,9 +5319,11 @@@ static int unixOpen
        useProxy = !(fsInfo.f_flags&MNT_LOCAL);
      }
      if( useProxy ){
-       rc = fillInUnixFile(pVfs, fd, dirfd, pFile, zPath, noLock, isDelete);
+       rc = fillInUnixFile(pVfs, fd, dirfd, pFile, zPath, noLock,
+                           isDelete, isReadonly);
        if( rc==SQLITE_OK ){
 +        /* cache the pMethod in case the transform fails */
 +        const struct sqlite3_io_methods *pMethod = pFile->pMethods;
          rc = proxyTransformUnixFile((unixFile*)pFile, ":auto:");
          if( rc!=SQLITE_OK ){
            /* Use unixClose to clean up the resources added in fillInUnixFile 

diff --cc src/pragma.c
index f4703492abfcd0c289eab5b71de46fecd37da9a5,db55e4bb41fa28af2ce856e3f8ad34ba651a2375..a9592ad8a752ee3d231d92418adae736052387a4
--- 1/src/pragma.c
--- 2/src/pragma.c
+++ b/src/pragma.c
@@@ -693,11 -691,9 +692,10 @@@ void sqlite3Pragma
    if( sqlite3StrICmp(zLeft,"cache_size")==0 ){
      if( sqlite3ReadSchema(pParse) ) goto pragma_out;
      if( !zRight ){
 -      returnSingleInt(pParse, "cache_size", pDb->pSchema->cache_size);
 +      i64 cacheSize = pDb->pSchema->cache_size;
 +      returnSingleInt(pParse, "cache_size", &cacheSize);
      }else{
-       int size = sqlite3Atoi(zRight);
-       if( size<0 ) size = -size;
+       int size = sqlite3AbsInt32(sqlite3Atoi(zRight));
        pDb->pSchema->cache_size = size;
        sqlite3BtreeSetCacheSize(pDb->pBt, pDb->pSchema->cache_size);
      }

diff --cc src/prepare.c
Simple merge

diff --cc src/test1.c
index 7a492e723b3851c95618b5452bca6a21c85e3686,8a0d09a7164752018c497f0e957345118593260a..0b9385a29072c3c894f889d4e770b6eb23ef35fb
--- 1/src/test1.c
--- 2/src/test1.c
+++ b/src/test1.c
@@@ -5651,10 -5646,9 +5756,11 @@@ int Sqlitetest1_Init(Tcl_Interp *interp
       { "file_control_lasterrno_test", file_control_lasterrno_test,  0   },
       { "file_control_lockproxy_test", file_control_lockproxy_test,  0   },
       { "file_control_chunksize_test", file_control_chunksize_test,  0   },
+      { "file_control_sizehint_test", file_control_sizehint_test,  0   },
       { "sqlite3_vfs_list",           vfs_list,     0   },
       { "sqlite3_create_function_v2", test_create_function_v2, 0 },
 +     { "path_is_local",              path_is_local,  0   },
 +     { "path_is_dos",                path_is_dos,  0   },
  
       /* Functions from os.h */
  #ifndef SQLITE_OMIT_UTF16

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc test/attach.test
Simple merge

diff --cc test/malloc_common.tcl
Simple merge

diff --cc test/memdb.test
Simple merge

diff --cc test/wal.test
Simple merge

diff --cc test/wal2.test
Simple merge

diff --cc test/wal3.test
Simple merge

diff --cc test/walfault.test
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge