aboutsummaryrefslogtreecommitdiff
path: root/src/expr.c
diff options
context:
space:
mode:
authordrh <>2025-07-01 15:13:37 +0000
committerdrh <>2025-07-01 15:13:37 +0000
commite1910ed1d293616aa72e8252e4f7d0242fba1e1f (patch)
treec5bd0ff88501e43f1cbcd8a4f45e74bcd981b765 /src/expr.c
parent3d21dcc924fb1049c7e0cbc42a21ebfe17d472b6 (diff)
parentd82c6a2cf7394354ed1a17ad26d42b02766bb0d2 (diff)
downloadsqlite-e1910ed1d293616aa72e8252e4f7d0242fba1e1f.tar.gz
sqlite-e1910ed1d293616aa72e8252e4f7d0242fba1e1f.zip
Merge trunk fixes into the empty-table-optimizations branch.
FossilOrigin-Name: 63306e447efb3ac17e789a331ed3bb65459eb8b79d66e9c185ba3bd852f34ce3
Diffstat (limited to 'src/expr.c')
-rw-r--r--src/expr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/expr.c b/src/expr.c
index 6cb9c2aa1..9ed0a121e 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -1144,7 +1144,7 @@ Expr *sqlite3ExprAnd(Parse *pParse, Expr *pLeft, Expr *pRight){
return pLeft;
}else{
u32 f = pLeft->flags | pRight->flags;
- if( (f&(EP_OuterON|EP_InnerON|EP_IsFalse))==EP_IsFalse
+ if( (f&(EP_OuterON|EP_InnerON|EP_IsFalse|EP_HasFunc))==EP_IsFalse
&& !IN_RENAME_OBJECT
){
sqlite3ExprDeferredDelete(pParse, pLeft);