From 0dba3304f61cc07aac8e64421eec824db7792584 Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 8 Mar 2016 13:56:02 +0000 Subject: [PATCH] Fix comments on pager flag settings to include synchronous=EXTRA. FossilOrigin-Name: 3a65a1fc0fd2408c6984153801ec5dcd5211c897 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/pager.c | 9 +++++++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 02f759a644..2807800e01 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Simplified\serror\sdetection\sin\sthe\sxBestIndex\sprocessing. -D 2016-03-08T02:59:33.371 +C Fix\scomments\son\spager\sflag\ssettings\sto\sinclude\ssynchronous=EXTRA. +D 2016-03-08T13:56:02.581 F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66 @@ -335,7 +335,7 @@ F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa F src/os_unix.c f5bac8e74aaefc4ea520e43b4540793c3b8a9e8f F src/os_win.c f0d7aa603eb6262143d7169a222aea07c4fca91d F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca -F src/pager.c d40cf1e890a0582b6ac7cb208c24619d72d2c900 +F src/pager.c 17aa37b3b53a62a1bd98fe6f3c758bb41429ef08 F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56 F src/parse.y 5ea8c81c5c41b27887f41b4a7e1c58470d7d3821 F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df @@ -1454,7 +1454,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 91bd619d27e4d91510a187bbb88de961a31c8a2e -R 925559caeda122c2e0a2ca4fc28cc0ee +P 82ca2131b670505578628687746135ac413d156b +R 4e1de8a7b93ab084a5d8af152570ff89 U drh -Z b4b54118bbf4d13b5c60372c03985e73 +Z 8d271451485b418fda3cdda213f61b81 diff --git a/manifest.uuid b/manifest.uuid index 21eda15faa..9831ba312c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -82ca2131b670505578628687746135ac413d156b \ No newline at end of file +3a65a1fc0fd2408c6984153801ec5dcd5211c897 \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index f045ce0eff..6cc6ebff42 100644 --- a/src/pager.c +++ b/src/pager.c @@ -3460,7 +3460,7 @@ void sqlite3PagerShrink(Pager *pPager){ ** The "level" in pgFlags & PAGER_SYNCHRONOUS_MASK sets the robustness ** of the database to damage due to OS crashes or power failures by ** changing the number of syncs()s when writing the journals. -** There are three levels: +** There are four levels: ** ** OFF sqlite3OsSync() is never called. This is the default ** for temporary and transient files. @@ -3480,6 +3480,10 @@ void sqlite3PagerShrink(Pager *pPager){ ** assurance that the journal will not be corrupted to the ** point of causing damage to the database during rollback. ** +** EXTRA This is like FULL except that is also syncs the directory +** that contains the rollback journal after the rollback +** journal is unlinked. +** ** The above is for a rollback-journal mode. For WAL mode, OFF continues ** to mean that no syncs ever occur. NORMAL means that the WAL is synced ** prior to the start of checkpoint and that the database file is synced @@ -3487,7 +3491,8 @@ void sqlite3PagerShrink(Pager *pPager){ ** was written back into the database. But no sync operations occur for ** an ordinary commit in NORMAL mode with WAL. FULL means that the WAL ** file is synced following each commit operation, in addition to the -** syncs associated with NORMAL. +** syncs associated with NORMAL. There is no difference between FULL +** and EXTRA for WAL mode. ** ** Do not confuse synchronous=FULL with SQLITE_SYNC_FULL. The ** SQLITE_SYNC_FULL macro means to use the MacOSX-style full-fsync -- 2.47.2