Merge the latest trunk changes into the statvfs branch.

FossilOrigin-Name: d5e36327c12f264429eb079bddbb71a310f76389

diff --cc manifest
index 5931a4da86824eef0661651a80b9ad10ebe0dcfd,2f08ae4c31f0fa156dc532eb0e50babe8b92d33e..eaeb4c67756764b7942e37fe542bfb965b0bfc49
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\srecent\strunk\schanges\sinto\sthe\sstatvfs\sbranch.
- D 2011-12-22T02:10:57.625
 -C Add\sinterfaces\ssqlite3_uri_boolean()\sand\ssqlite3_uri_int64()\swhich\sare\nwrappers\saround\ssqlite3_uri_parameter()\scombined\swith\sinternal\sroutines\sfor\nconverting\sstrings\sto\sbooleans\sand\s64-bit\sintegers.
 -D 2011-12-23T00:07:33.075
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sstatvfs\sbranch.
++D 2011-12-23T00:25:02.544
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -166,9 -166,9 +166,9 @@@ F src/os.c 28bbdab2170dfce84d86c45456a1
  F src/os.h 549b1a2e5e0ed1e1499f252dac126c4973e7379c
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
- F src/os_unix.c 3e630701efd54ecbdba237c5a3cb3c55d83d8a2e
- F src/os_win.c 4fc4aa8aecb334c64a250a4b36cff6a798704da4
 -F src/os_unix.c ee4ea557de196798bafba1ac69f76a755035ebbb
 -F src/os_win.c 197d23ce8a0dff748e766e034bf95ff756dd3884
 -F src/pager.c 523c64f6ca707e820d5cf10ed8371238ecac8333
++F src/os_unix.c ac21edf9794591badec31070a932845ef81f088e
++F src/os_win.c f45f03e4585c31b5124771eb07ecce5b37a5c30a
 +F src/pager.c fb35a2c33667dd568b8df30fc11a4516e9889057
  F src/pager.h 5cd760857707529b403837d813d86b68938d6183
  F src/parse.y fabb2e7047417d840e6fdb3ef0988a86849a08ba
  F src/pcache.c 1fdd77978c1525d1ca4b9ef48eb80abca710cb4c
@@@ -182,7 -182,7 +182,7 @@@ F src/resolve.c 3d3e80a98f203ac6b9329e9
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c a1d075db66a0ea42807353501b62997969e5be79
  F src/shell.c aa4183d4a5243d8110b1d3d77faa4aea7e9c9c2d
- F src/sqlite.h.in 369e7597b7673e8bc490e2012bc00fb15cd55674
 -F src/sqlite.h.in db834f87316a1422051a97cba5beac31c0cb1b2d
++F src/sqlite.h.in f414e44e9eb1d13804b9da0123ac082b0604bebf
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
  F src/sqliteInt.h 165409fa8adc8701148830804febeded3f2e4448
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
@@@ -986,7 -985,7 +986,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 19a6852a1e5905b35bc69b309951c5ec8ecd0bef c723e3e18a008922281d8d6e8e3aba07941eb173
- R 0d94bcf8f6066e5974e9f53b64f5faa2
 -P 1c27d842163e27c39bbe9409f50657b9de9ade6e
 -R 712ad6ea662046687d3fa2e6906d477a
++P 995ec8a41a7d091d9d87cb8f18f62102c8fda7d7 83d26b9a9115eadac9e59a33d608bca0ab2519e3
++R 260e1493aa81c50b80cb4676fbf8b938
  U drh
- Z 112a2eaccff16ef2315b6fa4c08d4e3f
 -Z dfef488f9835a38d5955098b906ef223
++Z de070232ec96f7f04c9c57b396f63bcc

diff --cc manifest.uuid
index 8e76db1dc56bb0001a540782ab22520e5dcd64a5,0daedf9dabe988a219d137f4d623a4b715760e1d..cc4ba4766792f2fb554214109bc1c8b128469a77
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 995ec8a41a7d091d9d87cb8f18f62102c8fda7d7
 -83d26b9a9115eadac9e59a33d608bca0ab2519e3
++d5e36327c12f264429eb079bddbb71a310f76389

diff --cc src/os_unix.c
index 4a31c8cdeac295d3492a976b3cd9652d0b2ba12e,5f26017b027ccc8816610336eb70b8ecf9a951e9..5378f862e90cf3979d2169f70d6bfbbd8206f36a
--- 1/src/os_unix.c
--- 2/src/os_unix.c
+++ b/src/os_unix.c
@@@ -4619,11 -4565,10 +4616,12 @@@ static int fillInUnixFile
    pNew->h = h;
    pNew->pVfs = pVfs;
    pNew->zPath = zFilename;
-   zZeroDam = sqlite3_uri_parameter(zFilename, "zero_damage");
-   if( zZeroDam==0 ) zZeroDam = "1";
-   pNew->ctrlFlags = atoi(zZeroDam) ? UNIXFILE_ZERO_DAMAGE : 1;
++  pNew->ctrlFlags = 0;
++  if( sqlite3_uri_boolean(zFilename, "zero_damage", 1) ){
++    pNew->ctrlFlags |= UNIXFILE_ZERO_DAMAGE;
++  }
    if( memcmp(pVfs->zName,"unix-excl",10)==0 ){
 -    pNew->ctrlFlags = UNIXFILE_EXCL;
 -  }else{
 -    pNew->ctrlFlags = 0;
 +    pNew->ctrlFlags |= UNIXFILE_EXCL;
    }
    if( isReadOnly ){
      pNew->ctrlFlags |= UNIXFILE_RDONLY;

diff --cc src/os_win.c
index ec4d062f9b8d4d4946a0bff64b4926597a18c0a2,ab70eebbf77c2cdf0b61f364e3097502192245f4..85bf9d89bbb88127a990a983c13b2b43dba15ea2
--- 1/src/os_win.c
--- 2/src/os_win.c
+++ b/src/os_win.c
@@@ -3201,9 -3178,6 +3200,9 @@@ static int winOpen
    pFile->pVfs = pVfs;
    pFile->pShm = 0;
    pFile->zPath = zName;
-   zZeroDam = sqlite3_uri_parameter(zName, "zero_damage");
-   if( zZeroDam==0 ) zZeroDam = "1";
-   pFile->ctrlFlags = atoi(zZeroDam) ? WINFILE_ZERO_DAMAGE : 1;
++  if( sqlite3_uri_boolean(zName, "zero_damage", 1) ){
++    pFile->ctrlFlags |= WINFILE_ZERO_DAMAGE;
++  }
    pFile->sectorSize = getSectorSize(pVfs, zUtf8Name);
  
  #if SQLITE_OS_WINCE

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