On winOpen(), redo the read-only test on every retry attempt. Just

don't retry the winAccess() call.

FossilOrigin-Name: ccdd67ad9a508530ccfcec582410768c24bca4eb8b05939577fb99a50dd44b15

diff --git a/manifest b/manifest
index 4a5ec55ac9ce87643cb8fd373bd3d79eea5f332d..e0f92d42b9582a04286925ba96016ae0d2676c2e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\sattempted\simprovements\sat\sfast-fail\sfor\san\sinaccessible\ndatabase\sfile.
-D 2025-03-26T15:51:05.795
+C On\swinOpen(),\sredo\sthe\sread-only\stest\son\severy\sretry\sattempt.\s\sJust\ndon't\sretry\sthe\swinAccess()\scall.
+D 2025-03-26T17:05:29.844
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -770,7 +770,7 @@ F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e
 F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a
 F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
 F src/os_unix.c 410185df4900817c218c0efdb8064b3481af88cb3f7cea7392f820b6eebc7889
-F src/os_win.c de4315b809e8c8a8dd9556a14bf4dd74d090d7e3d92ab535ff6f200408c50c15
+F src/os_win.c f4bc31a181306f61f0597c8445971081e1f1ee98a17f86587a92fe56be799294
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 9fbb541b46125dfa8914827575e6bb4d15048caa008073b1709112d495d7983b
 F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8
@@ -2215,8 +2215,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 986e45912cde7cb8e6db8ba7a9364aef7187a23032be64ef6cd573163f56676d
-R 71d9939e4210ac024e91383da51b8b95
+P cdeb21a312d4f1a9e3009a0baf0af33857c172f7bc22bca047dcd46a03e9c964
+R 6c2ac8039a69021b5d572668708823ae
 U drh
-Z a58eb24c7298b49ea23e24e867766e9d
+Z de39fba1a9cbf7ece5997a062776733d
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index bc1f34c7027071ab748a422edb2226cbc0a81211..a75cf46195e14dd156db26b08b8d20ea85985b6a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cdeb21a312d4f1a9e3009a0baf0af33857c172f7bc22bca047dcd46a03e9c964
+ccdd67ad9a508530ccfcec582410768c24bca4eb8b05939577fb99a50dd44b15

diff --git a/src/os_win.c b/src/os_win.c
index 29680b6eb8c006f7fa0f71dbf3b92efdaf220ab0..a545d7310a4e52a7e489ad7b88784836d904ffca 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -5473,7 +5473,7 @@ static int winOpen(
                         dwCreationDisposition,
                         &extendedParameters);
       if( h!=INVALID_HANDLE_VALUE ) break;
-      if( isReadWrite && cnt==0 ){
+      if( isReadWrite ){
         int rc2;
         sqlite3BeginBenignMalloc();
         rc2 = winAccess(pVfs, zUtf8Name, SQLITE_ACCESS_READ|NORETRY, &isRO);
@@ -5490,7 +5490,7 @@ static int winOpen(
                         dwFlagsAndAttributes,
                         NULL);
       if( h!=INVALID_HANDLE_VALUE ) break;
-      if( isReadWrite && cnt==0 ){
+      if( isReadWrite ){
         int rc2;
         sqlite3BeginBenignMalloc();
         rc2 = winAccess(pVfs, zUtf8Name, SQLITE_ACCESS_READ|NORETRY, &isRO);
@@ -5510,7 +5510,7 @@ static int winOpen(
                         dwFlagsAndAttributes,
                         NULL);
       if( h!=INVALID_HANDLE_VALUE ) break;
-      if( isReadWrite && cnt==0 ){
+      if( isReadWrite ){
         int rc2;
         sqlite3BeginBenignMalloc();
         rc2 = winAccess(pVfs, zUtf8Name, SQLITE_ACCESS_READ|NORETRY, &isRO);