From: drh <drh@noemail.net>
Date: Wed, 11 Dec 2013 15:47:39 +0000 (+0000)
Subject: Add the SQLITE_FCNTL_SYNC and SQLITE_FCNTL_COMMIT_PHASETWO file-controls
X-Git-Tag: version-3.8.3~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5f40593bee1ae4261725e80b18259e3dfda975d;p=thirdparty%2Fsqlite.git

Add the SQLITE_FCNTL_SYNC and SQLITE_FCNTL_COMMIT_PHASETWO file-controls
and have the pager call them at appropriate times.  This is needed in order
to enable ZIPVFS to do multi-file atomic commits.

FossilOrigin-Name: 552f94d50f08cf11f33205730fde52bc2f06cff6
---

a5f40593bee1ae4261725e80b18259e3dfda975d
diff --cc manifest
index 058f299285,4df669542d..c46916bc45
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sbug\sin\sthe\sshell\s".import"\scommand:\s\sDo\snot\send\sthe\sfield\nwhen\san\sescaped\sdouble-quote\soccurs\sat\sthe\send\sof\sa\sCRNL\sline.
- D 2013-12-11T14:00:04.667
 -C Merge\sin\sthe\slatest\strunk\schanges.
 -D 2013-12-11T14:17:06.145
++C Add\sthe\sSQLITE_FCNTL_SYNC\sand\sSQLITE_FCNTL_COMMIT_PHASETWO\sfile-controls\nand\shave\sthe\spager\scall\sthem\sat\sappropriate\stimes.\s\sThis\sis\sneeded\sin\sorder\nto\senable\sZIPVFS\sto\sdo\smulti-file\satomic\scommits.
++D 2013-12-11T15:47:39.590
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -234,7 -234,7 +234,7 @@@ F src/test2.c 7355101c085304b90024f2261
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
  F src/test5.c a6d1ac55ac054d0b2b8f37b5e655b6c92645a013
- F src/test6.c 4f958b71334695e65746d357dac77709732b28db
 -F src/test6.c 0c8fdf2e875ab23bb7fab6dee1a2c4c4ff03f5b0
++F src/test6.c 41cacf3b0dd180823919bf9e1fbab287c9266723
  F src/test7.c 72b732baa5642f795655ba1126ea032af46ecfd2
  F src/test8.c c7aab1d9fbbf54fc33d43b73aa24aa55f9eaf534
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
@@@ -1146,7 -1146,7 +1146,8 @@@ F tool/vdbe-compress.tcl 0cf56e9263a152
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 3e1d55f0bd84810a035bd6c54583eb373784a9a3
- R 7d1fbc3502ae32ded8a54ca8c1f54c36
 -P fdc3f3fa3de1481860e1e2a819db2d6c4eb05658 5e239ecda0f7835ce037b38b04627a574b5854cd
 -R 67e94d0b56b00fc27eeae35854bf8ba9
++P 5e239ecda0f7835ce037b38b04627a574b5854cd 9ff4dfe1e36b40e386858b03f36cfab8f6806fdd
++R 13a0878650f79a2d1e381d073556388e
++T +closed 9ff4dfe1e36b40e386858b03f36cfab8f6806fdd
  U drh
- Z 2736aa335da363db578416e90c12bc54
 -Z 7c7b3737dbf629b19ab7333ee0081c4f
++Z b8733cc6e30d13ae991531254c7c0f0a
diff --cc manifest.uuid
index c859518640,856d09cdcf..b6a4ded46b
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5e239ecda0f7835ce037b38b04627a574b5854cd
 -9ff4dfe1e36b40e386858b03f36cfab8f6806fdd
++552f94d50f08cf11f33205730fde52bc2f06cff6
diff --cc src/test6.c
index 6ea03b0f1c,0d0cf2c2f1..306482dcd3
--- a/src/test6.c
+++ b/src/test6.c
@@@ -632,7 -633,7 +633,6 @@@ static int cfOpen
        ** UPDATE: It also contains an assert() verifying that each call
        ** to the xRead() method reads less than 128KB of data.
        */
--      const int isDb = (flags&SQLITE_OPEN_MAIN_DB);
        i64 iOff;
  
        memset(pWrapper->zData, 0, pWrapper->nData);