From: dan <Dan Kennedy>
Date: Fri, 25 Oct 2024 18:37:00 +0000 (+0000)
Subject: Update special logging messages on this branch to say "v=6" instead of "v=5".
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a93c70dfac25b27d2f5f7a1d05576c99b408e02;p=thirdparty%2Fsqlite.git

Update special logging messages on this branch to say "v=6" instead of "v=5".

FossilOrigin-Name: af4e778bd3bdf30cac3d9a6266f105a8cd71f947b8d71249ef74b8fdc0505dd7
---

diff --git a/manifest b/manifest
index 48ba142913..0fc78d1536 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Reduce\sthe\snumber\sof\smalloc()/free()\scalls\sthat\smay\soccur\swhen\sa\sBEGIN\sCONCURRENT\stransaction\sis\scommitted.
-D 2024-10-25T18:24:53.832
+C Update\sspecial\slogging\smessages\son\sthis\sbranch\sto\ssay\s"v=6"\sinstead\sof\s"v=5".
+D 2024-10-25T18:37:00.723
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -849,7 +849,7 @@ F src/vdbe.c fea60cfe46d8839a08e4680d90a96898d542d3f6d7954e2e99cd92596f1a01f8
 F src/vdbe.h e0569d3f32eab55c97e0524f68548e83149dedd1278db69b74ba9e1aeb5c9cf8
 F src/vdbeInt.h 92b7eabbaadbe8127741cd96e7e39c4834c2bb0b75987d5f6251975f47233690
 F src/vdbeapi.c 80235ac380e9467fec1cb0883354d841f2a771976e766995f7e0c77f845406df
-F src/vdbeaux.c c73029037e1b007d09b181ce28072f5acb72ade3c1cf5223a76f5f9d22eb9d3c
+F src/vdbeaux.c 93d4374bbdb091a5ff348e7fe9a55dfec6e69087bffe7821d8474fdd62cc56bf
 F src/vdbeblob.c 255be187436da38b01f276c02e6a08103489bbe2a7c6c21537b7aecbe0e1f797
 F src/vdbemem.c 831a244831eaa45335f9ae276b50a7a82ee10d8c46c2c72492d4eb8c98d94d89
 F src/vdbesort.c d0a3c7056c081703c8b6d91ad60f17da5e062a5c64bf568ed0fa1b5f4cae311f
@@ -2249,8 +2249,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 9cafae1fff34ff45772910d6f2a19d08038edea4327234f577f6da30e5baa558
-R 7ec87bd379700435f6cb804abbfeea3a
+P fcd68bebf27e10e4e49efad220c9f53b7a109696d8b41e24f88c02460197b93f
+R 55f19018b52b5dfe7531f40b0b39acb3
 U dan
-Z a012a666f80e1c5592390f2b415cbfb2
+Z 34ac8be8f57c2f9a313183f66b283f0e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4713bdbfba..1c1ff244c0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fcd68bebf27e10e4e49efad220c9f53b7a109696d8b41e24f88c02460197b93f
+af4e778bd3bdf30cac3d9a6266f105a8cd71f947b8d71249ef74b8fdc0505dd7
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index ae1ec35c9e..bde66dae2e 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -5480,7 +5480,7 @@ void sqlite3CommitTimeLog(u64 *aCommit){
       }
       zStr = sqlite3_mprintf("%z%s%s%d", zStr, (zStr?", ":""), zHash, iVal);
     }
-    sqlite3_log(SQLITE_WARNING, "slow commit (v=5): (%s)", zStr);
+    sqlite3_log(SQLITE_WARNING, "slow commit (v=6): (%s)", zStr);
     sqlite3_free(zStr);
   }
 }
@@ -5508,7 +5508,7 @@ void sqlite3PrepareTimeLog(const char *zSql, int nSql, u64 *aPrepare){
     }
     if( nByte<0 ){ nByte = sqlite3Strlen30(zSql); }
     sqlite3_log(SQLITE_WARNING, 
-        "slow prepare (v=5): (%s) [%.*s]", zStr, nByte, zSql
+        "slow prepare (v=6): (%s) [%.*s]", zStr, nByte, zSql
     );
     sqlite3_free(zStr);
   }
@@ -5524,7 +5524,7 @@ void sqlite3SchemaTimeLog(u64 *aSchema){
         (aSchema[ii]==0 ? 0 : (int)(aSchema[ii] - i1))
       );
     }
-    sqlite3_log(SQLITE_WARNING, "slow schema (v=5): (%s)", zStr);
+    sqlite3_log(SQLITE_WARNING, "slow schema (v=6): (%s)", zStr);
     sqlite3_free(zStr);
   }
 }