From: drh <>
Date: Thu, 19 Oct 2023 19:57:57 +0000 (+0000)
Subject: For TK_ORDER expression nodes to always be full-size.
X-Git-Tag: version-3.44.0~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f53f85e22df1c5e1e36106b5e4d1db5089519aa;p=thirdparty%2Fsqlite.git

For TK_ORDER expression nodes to always be full-size.

FossilOrigin-Name: a5c73b46f4772f214ffbfa31cb87dce82ebd690addabef539bd09def26b7744d
---

diff --git a/manifest b/manifest
index ee9b2d6e44..0abfc0faf1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sadverse\sinteraction\sbetween\sthe\snew\saggregate\sORDER\sBY\slogic\sand\sthe\nexpression\scompressor.
-D 2023-10-19T19:19:59.307
+C For\sTK_ORDER\sexpression\snodes\sto\salways\sbe\sfull-size.
+D 2023-10-19T19:57:57.476
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -668,7 +668,7 @@ F src/date.c eebc54a00e888d3c56147779e9f361b77d62fd69ff2008c5373946aa1ba1d574
 F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782
 F src/dbstat.c 3b677254d512fcafd4d0b341bf267b38b235ccfddbef24f9154e19360fa22e43
 F src/delete.c cb766727c78e715f9fb7ec8a7d03658ed2a3016343ca687acfcec9083cdca500
-F src/expr.c 18a23aeeb4f0f1999163c273a823e7812a179de110025d07f6db58cfd9d3ddf0
+F src/expr.c 0756a4116a60666e31e77297444e628262cac913eebdac955a17c8cc8177429b
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c a7fcbf7e66d14dbb73cf49f31489ebf66d0e6006c62b95246924a3bae9f37b36
 F src/func.c e8d7b3587a225f4f1116f720b72090511fe9feb936e960bd26a053cea6a17a63
@@ -2133,8 +2133,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 d2c6b82c346dbf39e07f09d187e4a8216a56caa7df3dcfafc82e32f676a1db8a
-R 9da72bfce06dbb3400677ef0c3b1a035
+P f371e4c0f8ea73aee9ea0645f396e3da20f1eb97be34c83de9d94c9cbb959934
+R 6e8e24ae6b4cb9a95bb70c9f80125f71
 U drh
-Z c6070fdc6625bfd39e8b2f9924ac4aea
+Z 5b3ced1de2a96a932e2087f4a6248f87
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 002a508a44..bcdd04358b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f371e4c0f8ea73aee9ea0645f396e3da20f1eb97be34c83de9d94c9cbb959934
\ No newline at end of file
+a5c73b46f4772f214ffbfa31cb87dce82ebd690addabef539bd09def26b7744d
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 2dcba6e524..86b5f5f1e7 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -1240,6 +1240,7 @@ void sqlite3ExprAddFunctionOrderBy(
   pOB->x.pList = pOrderBy;
   assert( ExprUseXList(pOB) );
   pExpr->pLeft = pOB;
+  ExprSetProperty(pOB, EP_FullSize);
 }
 
 /*