Tweaks to [4b4f33d791fe4318] to make it easier to test.

FossilOrigin-Name: 2567298f4b0fdfeb42aa6bba7e0bec3bc8d0b89bf644a79b41893dd6a6c5774c

diff --git a/manifest b/manifest
index f8e251197cd49483dbea6c727d0b4b03665c9392..c8b50bd72136d1ca365c054bd367e49041258bb2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stest\scase\snumbering\sin\stests\srecently\sadded\sto\slike3.test.
-D 2025-01-31T18:56:58.478
+C Tweaks\sto\s[4b4f33d791fe4318]\sto\smake\sit\seasier\sto\stest.
+D 2025-01-31T20:18:34.963
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -867,7 +867,7 @@ F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
 F src/where.c 09dc313e7223ca1217c39c7026b00f16ff449a8323511a762fcba7863a00f4cd
 F src/whereInt.h d20cddddb1d61b18d5cb1fcfa9b77fbeebbc4afe44d996e603452a23b3009ee1
 F src/wherecode.c 0c3d3199a2b769a5e2bb70feb5003dc85b3d86842ecaf903a47f2b4205ca5dab
-F src/whereexpr.c fd80811331cebf37a96a1bbbe93a20425eb04a925baa7c2306d72e0797a47a4c
+F src/whereexpr.c d304e3fec8309cddffd194a2d06c49de3aac1c32a7ef9f6bd78546abc7d77352
 F src/window.c 2bf01f9941a64fbcead61a0e3cb5db3fca5094b30d2ff0d23274c2a81d2e2385
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@ -2209,8 +2209,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 8da1a9af66f905c683e9c3445d609b5c0e11ac912be192c468ddd79f237837f4
-R 7c3dd7099324ee3f6570f3eda4b7c65a
+P 6df2098c548b58c2910837726b666a628d5c712c560c0221a771e8181f71fae7
+R 135ac307112d80006ac833a8ae148e6e
 U drh
-Z f8d1c9b3f391a5065e5e11e0179528b8
+Z 1e05e96ac0e79f8e8ee82c826159e60e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index dc09f5f03dcd04662c178538c56ef459a0981e3a..79096bfae973068b77904de49f6ea1b7cd4584b7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6df2098c548b58c2910837726b666a628d5c712c560c0221a771e8181f71fae7
+2567298f4b0fdfeb42aa6bba7e0bec3bc8d0b89bf644a79b41893dd6a6c5774c

diff --git a/src/whereexpr.c b/src/whereexpr.c
index 0a963f4f9259d424843acd148dbf53274aad781a..2c4d0fef0d3c8235997b77dd0fffe78cee400f2b 100644 (file)
--- a/src/whereexpr.c
+++ b/src/whereexpr.c
@@ -232,7 +232,7 @@ static int isLikeOrGlob(
         cnt++;
       }else if( c>=0x80 ){
         const u8 *z2 = z+cnt-1;
-        if( sqlite3Utf8Read(&z2)==0xfffd || c==0xFF   /* bad utf-8 */
+        if( c==0xff || sqlite3Utf8Read(&z2)==0xfffd  /* bad utf-8 */
          || ENC(db)==SQLITE_UTF16LE 
         ){
           cnt--;
@@ -1400,7 +1400,7 @@ static void exprAnalyze(
       }
 
       /* Increment the value of the last utf8 character in the prefix. */
-      while( *pC==0xBF && pC>(u8*)pStr2->u.zToken ){
+      while( *pC==0xBF && ALWAYS(pC>(u8*)pStr2->u.zToken) ){
         *pC = 0x80;
         pC--;
       }