From: drh <drh@noemail.net>
Date: Tue, 23 Aug 2011 12:50:09 +0000 (+0000)
Subject: Merge the PAGECACHE_BLOCKALLOC changes into trunk.
X-Git-Tag: version-3.7.8~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2dd9b60c3589a86355d2d414e2a6bee6312ce5fb;p=thirdparty%2Fsqlite.git

Merge the PAGECACHE_BLOCKALLOC changes into trunk.

FossilOrigin-Name: 768c1846d48a555054f07edeabdae8817a2c0a8e
---

2dd9b60c3589a86355d2d414e2a6bee6312ce5fb
diff --cc manifest
index acc30194f2,5e20ca7e05..e73614d2b4
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C When\scopying\sa\srollback\smode\sdatabase\sover\sa\sWAL\sdatabase\susing\sthe\sbackup\sAPI,\sleave\sthe\sdestination\sdatabase\sin\sWAL\smode\s(instead\sof\sswitching\sit\sto\srollback\smode).\sFix\sfor\s[af95b8c609].
- D 2011-08-23T11:47:06.849
 -C Change\sto\stest\sinstrumentation\sof\sos_unix.c:\sRegard\sIO\serrors\sthat\soccur\swithin\sSQLITE_FCNTL_SIZE_HINT\srequests\sas\sbenign.
 -D 2011-08-23T05:10:39
++C Merge\sthe\sPAGECACHE_BLOCKALLOC\schanges\sinto\strunk.
++D 2011-08-23T12:50:09.565
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 8c930e7b493d59099ea1304bd0f2aed152eb3315
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -121,16 -121,16 +121,16 @@@ F src/alter.c ac80a0f31189f8b4a524ebf66
  F src/analyze.c a425d62e8fa9ebcb4359ab84ff0c62c6563d2e2a
  F src/attach.c 12c6957996908edc31c96d7c68d4942c2474405f
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 -F src/backup.c 986c15232757f2873dff35ee3b35cbf935fc573c
 +F src/backup.c 4dfc39043a42cbe47f22b2da47065ae5377f44fd
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
 -F src/btree.c a30bdcc27eedc36a38a3a11e1ba83de9a6729f7e
 +F src/btree.c 97cf3ba4ff067e716753b33661035e50853aebba
  F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce
  F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3
 -F src/build.c 77be7c2174300e94404ca89a2a9bbd8047d0ce11
 +F src/build.c 6c60478a1e23f7cdd30ae0251b46f9adbe0e98c2
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
--F src/ctime.c 7f283795650dd4122cc07bd02193c40193b32cc6
++F src/ctime.c caf51429be3e0d4114056a8273b0fff812ff8ae9
  F src/date.c a3c6842bad7ae632281811de112a8ba63ff08ab3
  F src/delete.c ff68e5ef23aee08c0ff528f699a19397ed8bbed8
  F src/expr.c 4bbdfaf66bc614be9254ce0c26a17429067a3e07
@@@ -358,7 -358,7 +358,7 @@@ F test/crash8.test 38767cb504bbe491de6b
  F test/crashtest1.c 09c1c7d728ccf4feb9e481671e29dda5669bbcc2
  F test/createtab.test b5de160630b209c4b8925bdcbbaf48cc90b67fe8
  F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c
--F test/ctime.test 7bd009071e242aac4f18521581536b652b789a47
++F test/ctime.test 7f0bd5084d9dd7da9ad46901810896edd2ebb463
  F test/date.test a18a2ce81add84b17b06559e82ad7bb91bc6ddff
  F test/dbstatus.test a719af0f226bd280748a4bb9054c0a5a9fc1b16c
  F test/default.test 6faf23ccb300114924353007795aa9a8ec0aa9dc
@@@ -961,7 -960,7 +961,7 @@@ F tool/symbols.sh caaf6ccc7300fd4335331
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
- P a65681926d8acf779ad39be21b74537c21777783
- R 4fa828c7c042de4b81d2337ffc4e400a
 -P c61000705b61dc448a838846826d1a5ab5eaca2b
 -R adaf3ffa3eb6341c9bccd9574332e7b9
--U dan
- Z 6839a6474a17b2a69c514b02de64259d
 -Z a132e12565cef78793cdd803b684e9a4
++P 35e6ac18e3d030095da57fff87a288939e9be93f ca47da2a1f6e6d221470e7f02b129fc21c288d7b
++R 403e9fa9f5f657d069e88180eb3874b3
++U drh
++Z ec65a11b28f52408e8ceb2cf85827722
diff --cc manifest.uuid
index 46d3d76682,037bbf1746..387dd4abbe
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 35e6ac18e3d030095da57fff87a288939e9be93f
 -ca47da2a1f6e6d221470e7f02b129fc21c288d7b
++768c1846d48a555054f07edeabdae8817a2c0a8e
diff --cc src/ctime.c
index 9d31596bba,9d31596bba..77174d0dae
--- a/src/ctime.c
+++ b/src/ctime.c
@@@ -326,6 -326,6 +326,9 @@@ static const char * const azCompileOpt[
  #ifdef SQLITE_OMIT_XFER_OPT
    "OMIT_XFER_OPT",
  #endif
++#ifdef SQLITE_PAGECACHE_BLOCKALLOC
++  "PAGECACHE_BLOCKALLOC",
++#endif
  #ifdef SQLITE_PERFORMANCE_TRACE
    "PERFORMANCE_TRACE",
  #endif
diff --cc test/ctime.test
index e4cb156168,e4cb156168..11216f9016
--- a/test/ctime.test
+++ b/test/ctime.test
@@@ -223,5 -223,5 +223,16 @@@ do_test ctime-2.5.$tc 
    } ]
  } {0 {{}}}
  
++ifcapable blockalloc {
++  do_test ctime-3.1a {
++    db eval {SELECT sqlite_compileoption_used('PAGECACHE_BLOCKALLOC')}
++  } {1}
++} else {
++  do_test ctime-3.1b {
++    db eval {SELECT sqlite_compileoption_used('PAGECACHE_BLOCKALLOC')}
++  } {0}
++}
++
++
  
  finish_test