From: drh <>
Date: Thu, 30 Oct 2025 17:23:17 +0000 (+0000)
Subject: Fix a harmless compiler warning associated with flexarrays.
X-Git-Tag: major-release~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ebf49168ab999672e4d1f1119996796727f0896;p=thirdparty%2Fsqlite.git

Fix a harmless compiler warning associated with flexarrays.

FossilOrigin-Name: f02cdf1d3ea8da8a09d115721845afeff5d6169dd7532ab486d3ed6db69cde2d
---

diff --git a/manifest b/manifest
index 1d64f16af3..ab7570d6ae 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Updates\sto\sthe\smain\sREADME.md\sfile.
-D 2025-10-30T15:43:57.542
+C Fix\sa\sharmless\scompiler\swarning\sassociated\swith\sflexarrays.
+D 2025-10-30T17:23:17.418
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -804,9 +804,9 @@ F src/util.c 36fb1150062957280777655976f3f9a75db236cb8207a0770ceae8d5ec17fcd3
 F src/vacuum.c 1bacdd0a81d2b5dc1c508fbf0d938c89fa78dd8d5b46ec92686d44030d4f4789
 F src/vdbe.c b44c366e83412d3b8c190feb1f029b7d02e1bd69252a57b32f195107f0d03964
 F src/vdbe.h be33bd7b17f2ec92939642416030491508c51071f6c14e27cd195983fec56b63
-F src/vdbeInt.h 52896dd4d5b62190c53db14b09fc2484434eb594c963df0fa66eb8a94527b02e
+F src/vdbeInt.h 2aaeb6df2938b181b4700a9328688a3986f2bba71e8b96f6a80671316618fa49
 F src/vdbeapi.c 869a0da5d855495055f4d35c6ada582f64ce995ce14b26ff9d336274d497266c
-F src/vdbeaux.c cb907297d03b374544a5a4f81ca981497ff4d09d13838f06de507118367f0b73
+F src/vdbeaux.c 908d8a191aed444b2e4c920159249127f3ff67b94c56a16fad1dfdf9c7488f20
 F src/vdbeblob.c b3f0640db9642fbdc88bd6ebcc83d6009514cafc98f062f675f2c8d505d82692
 F src/vdbemem.c e67d9c6484d868c879d20c70d00bf4a9058082f1d4058607ca15d50eb3aebc21
 F src/vdbesort.c b69220f4ea9ffea5fdef34d968c60305444eea909252a81933b54c296d9cca70
@@ -2171,8 +2171,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P c833f26a6780f919551e50c67d308e96293cec8481899354411d805617481f24
-R e8dc5682ed4f2696bbc9bc3dffb6a68d
+P ab10c4cd9f9314bc62aa310ee796f63c82710c35659debe347e8ebcbf34d9e86
+R 13630b126d7ddf9fcef324f1c64b9b51
 U drh
-Z 9001bb5eea87d985aeb604bc8bd8046b
+Z 3dce9d541e88bf36d9bad835082ef940
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2c475c76c5..4259722c54 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ab10c4cd9f9314bc62aa310ee796f63c82710c35659debe347e8ebcbf34d9e86
+f02cdf1d3ea8da8a09d115721845afeff5d6169dd7532ab486d3ed6db69cde2d
diff --git a/src/vdbeInt.h b/src/vdbeInt.h
index ca28b075a5..8b68c339af 100644
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@ -557,8 +557,7 @@ struct PreUpdate {
   Table *pTab;                    /* Schema object being updated */
   Index *pPk;                     /* PK index if pTab is WITHOUT ROWID */
   sqlite3_value **apDflt;         /* Array of default values, if required */
-  union {
-    KeyInfo sKey;
+  struct {
     u8 keyinfoSpace[SZ_KEYINFO_0];  /* Space to hold pKeyinfo[0] content */
   } uKey;
 };
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 10b41150d0..5368c0c420 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -5538,7 +5538,7 @@ void sqlite3VdbePreUpdateHook(
   preupdate.pCsr = pCsr;
   preupdate.op = op;
   preupdate.iNewReg = iReg;
-  preupdate.pKeyinfo = &preupdate.uKey.sKey;
+  preupdate.pKeyinfo = (KeyInfo*)&preupdate.uKey;
   preupdate.pKeyinfo->db = db;
   preupdate.pKeyinfo->enc = ENC(db);
   preupdate.pKeyinfo->nKeyField = pTab->nCol;