From: dan Date: Tue, 17 Jul 2018 14:01:55 +0000 (+0000) Subject: If an SQLITE_IOERR error is encountered as part of an atomic commit on an F2FS file... X-Git-Tag: version-3.25.0~117 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac306682dfe2182029a4dea87946bda9cbde7aa4;p=thirdparty%2Fsqlite.git If an SQLITE_IOERR error is encountered as part of an atomic commit on an F2FS file-system, retry the commit in legacy journal mode. FossilOrigin-Name: 2e0357c2ed30927921cd17129e348a18a6f3fd086d1fc0a42756036b321a084d --- ac306682dfe2182029a4dea87946bda9cbde7aa4 diff --cc manifest index 92e8676358,6e1a90bd6c..3238f82679 --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Minor\ssimplification\sto\ssqlite3RollbackAll(). - D 2018-07-16T11:32:59.740 -C Fix\sfor\sbuilds\swithout\sSQLITE_ENABLE_BATCH_ATOMIC_WRITE. -D 2018-07-17T13:55:08.594 ++C If\san\sSQLITE_IOERR\serror\sis\sencountered\sas\spart\sof\san\satomic\scommit\son\san\sF2FS\sfile-system,\sretry\sthe\scommit\sin\slegacy\sjournal\smode. ++D 2018-07-17T14:01:55.153 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6 @@@ -1747,7 -1749,7 +1749,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 - P 148d9b61471a874a16a9ec9c9603da03cadb3a40662fb550af51cb36212426b1 - R 9731515b749f0bceaf8a9239bf3b3da0 - U drh - Z 7d83889f4fd55f54443283ec8ab17e29 -P 59efb1bfaba12742379aae45c8c796ca539f089af9e553a3a55d6899a9c583c8 -R f80f88392522b1bdb8d9dd2500fd726f ++P 432fdc221550b3cca4140b1ae411da22201f689c30c72c5472dfdbc79bec9d90 b10ec14ef7edcc5d7b0ad298c8230d1eca5508e8cf673fbbc97a0928b76c92fb ++R 87d1309d70d437ae68a1599993e70cbb ++T +closed b10ec14ef7edcc5d7b0ad298c8230d1eca5508e8cf673fbbc97a0928b76c92fb + U dan -Z a92c63bc8962be8f1fcb4cef36d7f989 ++Z f77b0e3b42ed0976545721536fc22e40 diff --cc manifest.uuid index 4a268b88a2,91f656d5df..167d45e9b0 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 432fdc221550b3cca4140b1ae411da22201f689c30c72c5472dfdbc79bec9d90 -b10ec14ef7edcc5d7b0ad298c8230d1eca5508e8cf673fbbc97a0928b76c92fb ++2e0357c2ed30927921cd17129e348a18a6f3fd086d1fc0a42756036b321a084d