Merge all recent trunk changes into the experimental-mmap branch.

FossilOrigin-Name: a607d63f0b6a3d3785e9385187d3e6b92e14fc70

diff --cc manifest
index 215ae805d4007643484a185ae2f0dfcde3386ab8,abc6aa243070c37b4587c114d88f7c16da03121e..920c0ece2feea7001878d9d6a4242949d4af9a89
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Add\sa\stest\sthat\ssimulates\san\serror\sin\smmap().
- D 2013-03-25T19:05:07.846
 -C Add\sa\ssecond\stest\sfor\s[38b1ae018f].
 -D 2013-03-25T12:02:45.865
++C Merge\sall\srecent\strunk\schanges\sinto\sthe\sexperimental-mmap\sbranch.
++D 2013-03-25T19:57:26.572
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5
+ F Makefile.in df3e48659d80e1b7765785d8d66c86b320f72cc7
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 1bed3bca025ee90441bb0c9f95f36f42b70bd839
+ F Makefile.msc 0c1abc21c8deefc88e8a32ad6a07e5f96e158761
  F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 6d4f66eaebabc42ef8c2a4d2d0caf4ce7ee81137
@@@ -116,21 -116,21 +116,21 @@@ F sqlite3.1 6be1ad09113570e1fc8dcaff84c
  F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
  F src/alter.c f8db986c03eb0bfb221523fc9bbb9d0b70de3168
  F src/analyze.c d5f895810e8ff9737c9ec7b76abc3dcff5860335
- F src/attach.c ea5247f240e2c08afd608e9beb380814b86655e1
+ F src/attach.c 1816f5a9eea8d2010fc2b22b44f0f63eb3a62704
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
  F src/backup.c b2cac9f7993f3f9588827b824b1501d0c820fa68
- F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
+ F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c f5ea8d3d658887b5cae0369ef10a427d7469a768
 -F src/btree.c 3cebaa69db81a528e115b463a5506133a0043710
 -F src/btree.h 3ad7964d6c5b1c7bff569aab6adfa075f8bf06cd
++F src/btree.c ef238f2d88c6072cc0d6cff33b72c2a9044a15e4
 +F src/btree.h d3259057a38494c4c4358e377032158c762e3d8b
  F src/btreeInt.h eecc84f02375b2bb7a44abbcbbe3747dde73edb2
- F src/build.c 375e5df716e03b9343c5e1211be3b24e6d6dff05
+ F src/build.c 083da8466fd7e481cb8bd5264398f537507f6176
  F src/callback.c d7e46f40c3cf53c43550b7da7a1d0479910b62cc
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c 72a70dcfda75d3a1f81041ce4573e7afddcd8e4e
+ F src/ctime.c 2a5f251fcd7393808df77ccfc817e7058df08c4c
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
  F src/delete.c aeabdabeeeaa0584127f291baa9617153d334778
- F src/expr.c d488bb60e54c9305d9fca1fa6fcc7bfbd23b13a2
+ F src/expr.c 48048fca951eedbc74aa32262154410d56c83812
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e16942bd5c8a868ac53287886464a5ed0e72b179
  F src/func.c 48987c025d69399f59a1c2a553cea5da41bf105d
@@@ -157,34 -157,34 +157,34 @@@ F src/mutex_noop.c 7682796b7d8d39bf1c13
  F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
  F src/mutex_w32.c 32a9b3841e2d757355f0012b860b1bc5e01eafa0
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 -F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
 -F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
 +F src/os.c 809d0707cec693e1b9b376ab229271ad74c3d35d
 +F src/os.h ae08bcc5f6ec6b339f4a2adf3931bb88cc14c3e4
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
- F src/os_unix.c 6815e3dd9a1507f2e36ba5a8dcd36b67ac60f3b0
- F src/os_win.c 386f8c034b177b672f7819ddc5d80be6c8d593ac
- F src/pager.c d0cdf47664e487f735b4bea485ee70637ed34a55
 -F src/os_unix.c 21a36fa0b3753609b6606b30d9338d4bb6b24696
 -F src/os_win.c 9fe5356f943425ab8431237bd3a4297044928b70
 -F src/pager.c 3e9a15939684b0af441325f05335331b15979c9d
 -F src/pager.h 1109a06578ec5574dc2c74cf8d9f69daf36fe3e0
++F src/os_unix.c 54b82f341b3c81630aa8c73efd2effe037b69270
++F src/os_win.c e4f17ddf79f2a9373e33ed70565e765d65324589
++F src/pager.c 4e1b55e7a50db0466b06f8ec114799b432c18131
 +F src/pager.h 241d72dc0905df042da165f086d03505cb0bb50c
  F src/parse.y 5d5e12772845805fdfeb889163516b84fbb9ae95
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
 -F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
 +F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
  F src/pcache1.c 9fd22671c270b35131ef480bbc00392b8b5f8ab9
 -F src/pragma.c 9f0ee3d74a7f33eeeff40a4b014fc3abf8182ce2
 +F src/pragma.c 86c8088ac6a12d3f3be5f7394542651f03fa9a38
- F src/prepare.c 78cd7ae8cd0d8de8ef8a8b5352fc5f38693a0852
+ F src/prepare.c 310eaff1ee5f3c700b3545afb095cfe9346efc3a
  F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 9079da7d59aed2bb14ec8315bc7f720dd85b5b65
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c e1c6f6abdf9f359f4e735cb8ae11d2f359bf52a9
+ F src/select.c 01540bcd3df3c8f1187158e77986028b1c667258
  F src/shell.c 7c41bfcd9e5bf9d96b9215f79b03a5b2b44a3bca
- F src/sqlite.h.in b04790da19184e883da788d07688f16230d2cb6b
 -F src/sqlite.h.in 8d9e83d965f364ff99ebf4b653d0683d05df3900
++F src/sqlite.h.in 457eb0ba9fbc331281dca53182c90035b087527f
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 7183ab832e23db0f934494f16928da127a571d75
 -F src/sqliteInt.h 0f8f05ee4db4ba9120b38f7a3992b325698f6e8a
 +F src/sqliteInt.h 2c3d830ae78b046ebf939c905c023610e43c2796
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 3213f3101e3b85f047d6e389da5a53d76d3d7540
+ F src/tclsqlite.c 9a716c737590d2f129d71c8fc7065e5aba0e7222
 -F src/test1.c ff3e68eedfbd858c9b89cf03e3db233cd29be1d0
 +F src/test1.c 26e66b839f42c2eed6833f9023e0098f0d863f35
  F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
  F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
  F src/test4.c bf9fa9bece01de08e6f5e02314e4af5c13590dfa
@@@ -223,10 -223,10 +223,10 @@@ F src/test_rtree.c aba603c949766c4193f1
  F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
  F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f
  F src/test_spellfix.c 56dfa6d583ac34f61af0834d7b58d674e7e18e13
- F src/test_sqllog.c 8acb843ddb9928dea8962e31bb09f421a72ffccb
+ F src/test_sqllog.c bc50e5afeb7fb50e77b4594e42302df9d05446aa
  F src/test_stat.c d1569c7a4839f13e80187e2c26b2ab4da2d03935
  F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd
 -F src/test_syscall.c a992d8c80ea91fbf21fb2dd570db40e77dd7e6ae
 +F src/test_syscall.c fe018f95049d4f24e036d1d649516b60689b4e57
  F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
  F src/test_thread.c e286f2173563f2a1747c24bcda6b9d030bf4f4e4
  F src/test_vfs.c fb16b2d9938cf0c1afc5a423b55b952fcc024275
@@@ -235,24 -235,24 +235,24 @@@ F src/test_wholenumber.c 3d2b9ed1505c40
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
  F src/trigger.c cd95ac64efa60e39faf9b5597443192ff27a22fa
- F src/update.c 28d2d098b43a2c70dae399896ea8a02f622410ef
+ F src/update.c a2a5631d618cbe240fc83725fa9e95c56ae0084c
  F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
- F src/util.c 0af2e515dc0dabacec931bca39525f6c3f1c5455
+ F src/util.c 550f2b6a5c0085153a4d00462719fb17ee242792
  F src/vacuum.c 2727bdd08847fcb6b2d2da6d14f018910e8645d3
- F src/vdbe.c 292f8f7ced59c29c63fe17830cbe5f5a0230cdf0
+ F src/vdbe.c 1d56617d816098a41bdbe73536a67dcdefad52bd
  F src/vdbe.h b52887278cb173e66188da84dfab216bea61119d
- F src/vdbeInt.h 396bb03eec560f768d1b86092b00f46c25575d3b
- F src/vdbeapi.c 9616986209cc77822aa9f7d91cf9e6880516d557
- F src/vdbeaux.c 735a6905df302a7f3c715a82bd3af06dc7d74ef2
+ F src/vdbeInt.h 3bb8531d6768379f086e1576b31d52331f6eb982
+ F src/vdbeapi.c 56f9ad6329d093f54b5dd321a2b4a643f89a6cb6
+ F src/vdbeaux.c ecb43014bcd3019e5aa2b5561e5c3a447f007a08
  F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
  F src/vdbemem.c 833005f1cbbf447289f1973dba2a0c2228c7b8ab
- F src/vdbesort.c c61ca318681c0e7267da8be3abfca8469652a7e9
+ F src/vdbesort.c 4fad64071ae120c25f39dcac572d716b9cadeb7f
  F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
  F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
 -F src/wal.c f5c7b5027d0ed0e9bc9afeb4a3a8dfea762ec7d2
 -F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
 +F src/wal.c e84eff498c57ec2d79ca4496a3f4a638af378fb3
 +F src/wal.h a4d3da523d55a226a0b28e9058ef88d0a8051887
  F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b
- F src/where.c bdbbfa7ef4ea04c8d9b09585b45d4717a72f980a
+ F src/where.c 9a16c0b84bbeb054d11fda96e9e037ae310bd54e
  F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@@ -526,7 -526,7 +526,7 @@@ F test/in2.test 5d4c61d17493c832f7d2d32
  F test/in3.test 3cbf58c87f4052cee3a58b37b6389777505aa0c0
  F test/in4.test 64f3cc1acde1b9161ccdd8e5bde3daefdb5b2617
  F test/in5.test 99f9a40af01711b06d2d614ecfe96129f334fba3
- F test/incrblob.test bf210bea512474d4e1d94fbb9b0fcb386cd65dea
 -F test/incrblob.test e7ef2a6094d9b5eb7284c21af2c07644eefffe7d
++F test/incrblob.test e81846d214f3637622620fbde7cd526781cfe328
  F test/incrblob2.test edc3a96e557bd61fb39acc8d2edd43371fbbaa19
  F test/incrblob3.test aedbb35ea1b6450c33b98f2b6ed98e5020be8dc7
  F test/incrblob4.test 09be37d3dd996a31ea6993bba7837ece549414a8
@@@ -746,8 -746,8 +747,8 @@@ F test/subselect.test d24fd8757daf97daf
  F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
  F test/superlock.test 1cde669f68d2dd37d6c9bd35eee1d95491ae3fc2
  F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85
--F test/syscall.test bea9bf329bff733c791310244617c2a76974e64a
 -F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f
++F test/syscall.test cf59bafccb143f8df21c043b3201d5afa9fe2474
 +F test/sysfault.test 3258d6c8213b44f2669994d798a5eb5327b40146
  F test/table.test a59d985ca366e39b17b175f387f9d5db5a18d4e2
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tclsqlite.test 37a61c2da7e3bfe3b8c1a2867199f6b860df5d43
@@@ -1039,7 -1039,7 +1040,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 77443ef2cd0b29b7822eea544ab8c6c4a93cb67b
- R 602dbedb509e1b6f815316de036c2541
 -P f85f9103cffa5c8ba6a63a68beb90817147ba080
 -R 8636831e10a59eea94894795b6da6922
--U dan
- Z 3ee6172e1f5d6ed5486bb4fa69d324f2
 -Z 40d326d8e18513e2868148c4279af040
++P 6ec7367d8e98425f00eeb8215ca8964313c1d0b7 5062db672c00c3365d51cd6b39815078f5b6b525
++R 868df99cd28788ba5be1e70b11892bee
++U drh
++Z 7385c5f656a5c7af6e1d7e1f0ea19ddb

diff --cc manifest.uuid
index 50a8aea1fc7714b3301e7ae534daf97850504c1a,14d19b23d153829526f4e71ca25b248e803bda1f..0965ca83906455c3d37d54ace7987e5dd079a756
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6ec7367d8e98425f00eeb8215ca8964313c1d0b7
 -5062db672c00c3365d51cd6b39815078f5b6b525
++a607d63f0b6a3d3785e9385187d3e6b92e14fc70

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/sqlite.h.in
Simple merge

diff --cc test/incrblob.test
Simple merge

diff --cc test/syscall.test
index d841a9a0b29e1f2ed22779419a7bdfe32eb7bf25,d841a9a0b29e1f2ed22779419a7bdfe32eb7bf25..b9a3b196e3616b49aa85943437ebfde47ab8dcc4
--- 1/test/syscall.test
--- 2/test/syscall.test
+++ b/test/syscall.test
@@@ -60,7 -60,7 +60,7 @@@ foreach s 
      open close access getcwd stat fstat ftruncate
      fcntl read pread write pwrite fchmod fallocate
      pread64 pwrite64 unlink openDirectory mkdir rmdir 
--    statvfs fchown umask
++    statvfs fchown umask mmap
  } {
    if {[test_syscall exists $s]} {lappend syscall_list $s}
  }