From: dan <Dan Kennedy>
Date: Wed, 13 Nov 2024 14:42:32 +0000 (+0000)
Subject: Increase maximum length of sqlite3_log() messages to 700 bytes. Mark log messages... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f0f625bda56a64856acd500d138a1c2227620dce;p=thirdparty%2Fsqlite.git

Increase maximum length of sqlite3_log() messages to 700 bytes. Mark log messages as v=10.

FossilOrigin-Name: 35aa893d4537d0b3605084a1f2f5529794e82af59b8893053815d3fcb4719a27
---

diff --git a/manifest b/manifest
index 22d148d768..9e211aeef6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Optimize\sdeferred\sallocation\sof\spages\son\sthis\sbranch\sby\savoiding\sBTALLOC_LE.
-D 2024-11-13T11:12:30.936
+C Increase\smaximum\slength\sof\ssqlite3_log()\smessages\sto\s700\sbytes.\sMark\slog\smessages\sas\sv=10.
+D 2024-11-13T14:42:32.861
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -770,7 +770,7 @@ F src/pcache1.c 437282ad81350c98a8592425b19e1b4e132196f7a81aef49b2ca39c50937b827
 F src/pragma.c 08472536cf1ecc38947d56f6cb2c8d8b3f6a26722451a38614c41a5b0cbcfc52
 F src/pragma.h 6ebbdee90ed56a892d2c728e27fd9c1ce48c8a28841888d0c6c147946b38cb25
 F src/prepare.c 140ce8271ba7da946668ad2e0c68fe14419319cb6c68cfcd660186557c271969
-F src/printf.c 6a87534ebfb9e5346011191b1f3a7ebc457f5938c7e4feeea478ecf53f6a41b2
+F src/printf.c 9480e90343dfde2406eeb25ff072774a77453d0f57fcd6495102f915dcc26a82
 F src/random.c 9bd018738ec450bf35d28050b4b33fa9a6eebf3aaefb1a1cff42dc14a7725673
 F src/resolve.c 2c127880c0634962837f16f2f48a295e514357af959330cc038de73015d5b5e8
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
@@ -849,7 +849,7 @@ F src/vdbe.c fea60cfe46d8839a08e4680d90a96898d542d3f6d7954e2e99cd92596f1a01f8
 F src/vdbe.h e439c7b44191828413f461eac23360ffbf0513fe57d129853f690c4ea4d46746
 F src/vdbeInt.h 92b7eabbaadbe8127741cd96e7e39c4834c2bb0b75987d5f6251975f47233690
 F src/vdbeapi.c 80235ac380e9467fec1cb0883354d841f2a771976e766995f7e0c77f845406df
-F src/vdbeaux.c 158f4d16d172f4ff125d4c2c7b2bb10d5ccd6bf4625f97ea8a3fea9ea359facf
+F src/vdbeaux.c 4f7e3fc42eea9612ae59ff5f123280507935be53d0d2e9ea474957b30f9e1f29
 F src/vdbeblob.c 255be187436da38b01f276c02e6a08103489bbe2a7c6c21537b7aecbe0e1f797
 F src/vdbemem.c 831a244831eaa45335f9ae276b50a7a82ee10d8c46c2c72492d4eb8c98d94d89
 F src/vdbesort.c d0a3c7056c081703c8b6d91ad60f17da5e062a5c64bf568ed0fa1b5f4cae311f
@@ -2249,9 +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 3a45387a09398db8efdb2b6ecd773fa30970e61e5242823e04a2e968d1c93c10
-Q +0812161025272851af6233f183a6abdee5c583decc688c4763965b50e7ab1b9d
-R 608f78f15371bc6bff4085c3bfb99aee
+P e0c0176793d41bef30e093975a87170981277dac20cde08e0fd3e0b6f40dca2f
+R 40d5d8e3822854d0b02030b6b7d7027f
 U dan
-Z 8f96987b0e0c6b3e12665292bbb3a478
+Z 1f420b344bc232a0c739cabd514cf0b5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d3205236c2..7e973bcf72 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e0c0176793d41bef30e093975a87170981277dac20cde08e0fd3e0b6f40dca2f
+35aa893d4537d0b3605084a1f2f5529794e82af59b8893053815d3fcb4719a27
diff --git a/src/printf.c b/src/printf.c
index a140565146..59cf22794d 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -1317,7 +1317,7 @@ char *sqlite3_snprintf(int n, char *zBuf, const char *zFormat, ...){
 */
 static void renderLogMsg(int iErrCode, const char *zFormat, va_list ap){
   StrAccum acc;                          /* String accumulator */
-  char zMsg[SQLITE_PRINT_BUF_SIZE*3];    /* Complete log message */
+  char zMsg[SQLITE_PRINT_BUF_SIZE*10];   /* Complete log message */
 
   sqlite3StrAccumInit(&acc, 0, zMsg, sizeof(zMsg), 0);
   sqlite3_str_vappendf(&acc, zFormat, ap);
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index a866603ae1..390446c585 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -5494,7 +5494,7 @@ void sqlite3CommitTimeLog(u64 *aCommit){
       }
       zStr = sqlite3_mprintf("%z%s%s%d%s", zStr, (zStr?", ":""),zHash,iVal,zU);
     }
-    sqlite3_log(SQLITE_WARNING, "slow commit (v=9): (%s)", zStr);
+    sqlite3_log(SQLITE_WARNING, "slow commit (v=10): (%s)", zStr);
     sqlite3_free(zStr);
   }
 }
@@ -5522,7 +5522,7 @@ void sqlite3PrepareTimeLog(const char *zSql, int nSql, u64 *aPrepare){
     }
     if( nByte<0 ){ nByte = sqlite3Strlen30(zSql); }
     sqlite3_log(SQLITE_WARNING, 
-        "slow prepare (v=9): (%s) [%.*s]", zStr, nByte, zSql
+        "slow prepare (v=10): (%s) [%.*s]", zStr, nByte, zSql
     );
     sqlite3_free(zStr);
   }
@@ -5538,7 +5538,7 @@ void sqlite3SchemaTimeLog(u64 *aSchema){
         (aSchema[ii]==0 ? 0 : (int)(aSchema[ii] - i1))
       );
     }
-    sqlite3_log(SQLITE_WARNING, "slow schema (v=9): (%s)", zStr);
+    sqlite3_log(SQLITE_WARNING, "slow schema (v=10): (%s)", zStr);
     sqlite3_free(zStr);
   }
 }