From 980580efecd8291bc9bd9244e7bef34dd00d307a Mon Sep 17 00:00:00 2001 From: drh <> Date: Thu, 20 Nov 2025 21:08:46 +0000 Subject: [PATCH] Preserve auto-explain mode across mode changes, as has always been the case before. FossilOrigin-Name: 8896185ae0b0af8918aa8ce449f18759e6ae60358afbac1019397bae307b15d5 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/shell.c.in | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index f203bf26c9..d0aba71310 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\shwtime.h\s(broken\sby\s[305bb022368bac9f])\sso\sthat\sunamalgamated\swindows\nbuilds\swork\sagain. -D 2025-11-20T12:41:26.416 +C Preserve\sauto-explain\smode\sacross\smode\schanges,\sas\shas\salways\sbeen\sthe\ncase\sbefore. +D 2025-11-20T21:08:46.952 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -734,7 +734,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 5616fbcf3b833c7c705b24371828215ad0925d0c0073216c4f153348d5753f0a F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c ba9cd07ffa3277883c1986085f6ddc4320f4d35d5f212ab58df79a7ecc1a576a -F src/shell.c.in b5de4197a021ed3157c243bdb320fce7d388f68fd45ac967e30e61092aa0cc40 +F src/shell.c.in c8256f5f03ed3177b892ba8a730cdf222aeefbf146a4efae046b5f7356953ada F src/sqlite.h.in f1363321ca55cc2feaa289e9fe6dfb08102a28c54edf005564711a2348b06eef F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 F src/sqlite3ext.h 5d5330f5f8461f5ce74960436ddcfa53ecd09c2b8b23901e22ae38aec3243998 @@ -2175,8 +2175,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 86817b4e9f011d296fb420be95269fecb54fb48a220bce84020e3af2d2c164a4 -R 12df208129cfac05da6465e778ffa7dd +P 1245319257d03a00eddbc8ff4b43b5813f8a567a12a9957f923bef58c85c0c20 +R f732652d0e1f11bfe46467efc5be1c8c U drh -Z 2383ae68ea8b18a19ff2f4d551109d3e +Z c4f547400bf3f5e95c885ba485f32056 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 00841802ed..d455f9170c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1245319257d03a00eddbc8ff4b43b5813f8a567a12a9957f923bef58c85c0c20 +8896185ae0b0af8918aa8ce449f18759e6ae60358afbac1019397bae307b15d5 diff --git a/src/shell.c.in b/src/shell.c.in index 9d63354770..9bdc542aad 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -1529,6 +1529,7 @@ static const ModeInfo aModeInfo[] = { ** contains. */ static void modeFree(Mode *p){ + u8 autoExplain = p->autoExplain; free(p->spec.aWidth); free(p->spec.aAlign); free(p->spec.zColumnSep); @@ -1537,6 +1538,7 @@ static void modeFree(Mode *p){ free(p->spec.zNull); memset(p, 0, sizeof(*p)); p->spec.iVersion = 1; + p->autoExplain = autoExplain; } /* -- 2.47.3