From 1668926bc3c7da0b2870a60382b179a0e3edb5de Mon Sep 17 00:00:00 2001

From: Ondrej Dubaj <odubaj@redhat.com>

Date: Thu, 26 Mar 2020 08:14:29 +0100

Subject: [PATCH] Do not allow the constant-propagation optimization to apple

 to ON/USING clause terms as it does not help and it might cause downstream

 problems.

---

 src/select.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/select.c b/src/select.c

index bbd13a4..88a43df 100644

--- a/src/select.c

+++ b/src/select.c

@@ -4171,7 +4171,7 @@ static int propagateConstantExprRewrite(Walker *pWalker, Expr *pExpr){

   int i;

   WhereConst *pConst;

   if( pExpr->op!=TK_COLUMN ) return WRC_Continue;

-  if( ExprHasProperty(pExpr, EP_FixedCol) ) return WRC_Continue;

+  if( ExprHasProperty(pExpr, EP_FixedCol|EP_FromJoin) ) return WRC_Continue;

   pConst = pWalker->u.pConst;

   for(i=0; i<pConst->nConst; i++){

     Expr *pColumn = pConst->apExpr[i*2];

-- 

2.24.1