Fix an #ifdef that uses a different macro name from the main branch.

FossilOrigin-Name: ad6ac5d3e84cf7f32378a45f276dd331d6fbac8a102d700c44c2167080fb6a1c

diff --git a/manifest b/manifest
index 747cca412e64ed1021a18d98dbc7ecb407e2812f..fd7d46b38a7758b450eca8cfb30b37e3c2cfb680 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Back-port\somit-unused-subquery-column\senhancements\sinto\sthe\s3.28\sbranch.
-D 2023-02-16T19:04:40.830
+C Fix\san\s#ifdef\sthat\suses\sa\sdifferent\smacro\sname\sfrom\sthe\smain\sbranch.
+D 2023-02-16T21:01:33.679
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -518,7 +518,7 @@ F src/printf.c 67f79227273a9009d86a017619717c3f554f50b371294526da59faa6014ed2cd
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 567888ee3faec14dae06519b4306201771058364a37560186a3e0e755ebc4cb8
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
-F src/select.c 7549148775c8b881bb91aeecbc483c45708fefb1c565fc72805472246e2208ac
+F src/select.c f8e57c3aecc5ce8766ee29dce119637d3b10c06fa9c831235600c4047c99089b
 F src/shell.c.in c1986496062f9dba4ed5b70db06b5e0f32e1954cdcfab0b30372c6c186796810
 F src/sqlite.h.in 59f5e145b8d7a915ca29c6bf4a1f00e3112c1605c9ac5c627c45060110332ba2
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1820,10 +1820,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0163b697dd560b6ad78ae20b3ae495a051680b0faf1633827119db381869351f
-Q +6b1a1f374d1372f11f5420d99645b218867100bf070bd3a8885bf5f00c189dff
-Q +cc148503db8ef180bce984328da7e84959afadd6a9613c2d03bc1eafeb95dfad
-R 6e43319432868c44861b20a58646f9d1
+P 57a4e91f4343b612c346a4d284c0354deee364f83951e64b009e79cd20aedb47
+R 46f2b179cf525c40591e596cbf5da675
 U drh
-Z 8fcbd94b7296fd11258479522881477c
+Z e7f78531a94b757a0e87af38aab3bb53
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index f16f350651a4bd4919171a0813159f4ed92bc0ae..23495a734c6b220e279a50999e0f7555cb1fab9d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-57a4e91f4343b612c346a4d284c0354deee364f83951e64b009e79cd20aedb47
\ No newline at end of file
+ad6ac5d3e84cf7f32378a45f276dd331d6fbac8a102d700c44c2167080fb6a1c
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index f4e3086430b3bf43245afa645f81ef5be87a7eed..aec7d6276a6136dec41054d4d750bc1dc9b791a8 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -5952,7 +5952,7 @@ int sqlite3Select(
     ** expressions, to avoid unneeded searching and computation.
     */
     if( disableUnusedSubqueryResultColumns(pItem) ){
-#if TREETRACE_ENABLED
+#if SELECTTRACE_ENABLED
       if( sqlite3TreeTrace & 0x4000 ){
         TREETRACE(0x4000,pParse,p,
             ("Change unused result columns to NULL for subquery %d:\n",