Change a newly unreachable branch into an ALWAYS().

FossilOrigin-Name: 99556be3fd99e6b7c520b0ae2090f59c6f58375750f9d571f9f586bce0a21504

diff --git a/manifest b/manifest
index 686b15d35d8674834f2e5c0e871fb3dabaec75b1..82e28d78be4bd904a5962c7f392c45bdc9998f1e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sreturning\sSQLITE_ERROR_RETRY\sif\scollation\ssequences\sassociated\swith\sthe\stable's\sPK\scannot\sbe\sfound\swhen\screating\san\sindex.\sPossible\sfix\sfor\s[forum:aa61ab56ad\s|\sforum\spost\saa61ab56ad].
-D 2025-08-20T15:42:23.331
+C Change\sa\snewly\sunreachable\sbranch\sinto\san\sALWAYS().
+D 2025-08-20T21:12:40.927
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -736,7 +736,7 @@ F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 F src/pcache1.c 131ca0daf4e66b4608d2945ae76d6ed90de3f60539afbd5ef9ec65667a5f2fcd
 F src/pragma.c 30b535d0a66348df844ee36f890617b4cf45e9a22dcbc47ec3ca92909c50aaf1
-F src/prepare.c 1832be043fce7d489959aae6f994c452d023914714c4d5457beaed51c0f3d126
+F src/prepare.c 4b784f1e1cf77739cb7de1d16a9e1ecb27999be76b6da9121bef482949cfba42
 F src/printf.c 5f0c957af9699e849d786e8fbaa3baab648ca5612230dc17916434c14bc8698f
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c f8d1d011aba0964ff1bdccd049d4d2c2fec217efd90d202a4bb775e926b2c25d
@@ -2169,11 +2169,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 138e2aab43ac07aaf8c5389105ff6d3e107ff2d35badcb48233664fcb9661471
-R 9e5c7e81644c35679b2a0a46b53e72da
-T *branch * create-index-error-retry-fix
-T *sym-create-index-error-retry-fix *
-T -sym-trunk *
-U dan
-Z 19b61eb0eb1df6f2f14da4dd841ac729
+P ac649e5b9ca9b8f7729defa8d646df8c0cb57977a5eedcfa2cf1147d109a17f1
+R 642ae7a3f0616f68a22b85d4f264d43c
+U drh
+Z b37b2b7ff48f90895e102d34aa3245b4
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index c96ac75d65de433ffeb8dcb8fc9189570321c3da..7e2b93deb2423c9ede72ec48e2c09262291163eb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ac649e5b9ca9b8f7729defa8d646df8c0cb57977a5eedcfa2cf1147d109a17f1
+99556be3fd99e6b7c520b0ae2090f59c6f58375750f9d571f9f586bce0a21504

diff --git a/src/prepare.c b/src/prepare.c
index de364f925b699ca4d2da775d3ed8ddd1d8b1f382..2abd14bac75d588f2e2fb524029152f83e85537b 100644 (file)
--- a/src/prepare.c
+++ b/src/prepare.c
@@ -860,8 +860,9 @@ static int sqlite3LockAndPrepare(
     rc = sqlite3Prepare(db, zSql, nBytes, prepFlags, pOld, ppStmt, pzTail);
     assert( rc==SQLITE_OK || *ppStmt==0 );
     if( rc==SQLITE_OK || db->mallocFailed ) break;
-  }while( (rc==SQLITE_ERROR_RETRY && (cnt++)<SQLITE_MAX_PREPARE_RETRY)
-       || (rc==SQLITE_SCHEMA && (sqlite3ResetOneSchema(db,-1), cnt++)==0) );
+    cnt++;
+  }while( (rc==SQLITE_ERROR_RETRY && ALWAYS(cnt<=SQLITE_MAX_PREPARE_RETRY))
+       || (rc==SQLITE_SCHEMA && (sqlite3ResetOneSchema(db,-1), cnt)==1) );
   sqlite3BtreeLeaveAll(db);
   rc = sqlite3ApiExit(db, rc);
   assert( (rc&db->errMask)==rc );