From 051b4210e3cb3f3a9ec7cd5ab4503b48f279ab48 Mon Sep 17 00:00:00 2001
From: "Vadim B. Mikheev" <vadim4o@yahoo.com>
Date: Tue, 22 Apr 1997 03:32:38 +0000
Subject: Fix for Hash and arrays

---
 src/backend/executor/execQual.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/backend/executor/execQual.c')

diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index 7e9d6f0bac..9d943368a3 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.10 1997/01/10 20:17:31 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.11 1997/04/22 03:32:35 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -98,7 +98,6 @@ ExecEvalArrayRef(ArrayRef *arrayRef,
     int 	*lIndex;
     char *dataPtr;
     
-    execConstByVal = arrayRef->refelembyval;
     *isNull       =	false; 
     array_scanner =	(ArrayType*)ExecEvalExpr(arrayRef->refexpr,
 					     econtext,
@@ -138,6 +137,8 @@ ExecEvalArrayRef(ArrayRef *arrayRef,
 				      assgnexpr, econtext,
 				      isNull, &dummy);
 	if (*isNull) return (Datum)NULL;
+    	execConstByVal = arrayRef->refelembyval;
+    	execConstLen = arrayRef->refelemlength;
 	if (lIndex == NULL)
 	    return (Datum) array_set(array_scanner, i, upper.indx, dataPtr, 
 				     arrayRef->refelembyval,
@@ -149,6 +150,8 @@ ExecEvalArrayRef(ArrayRef *arrayRef,
 				   arrayRef->refelembyval,
 				   arrayRef->refelemlength, isNull);
     }
+    execConstByVal = arrayRef->refelembyval;
+    execConstLen = arrayRef->refelemlength;
     if (lIndex == NULL) 
 	return (Datum) array_ref(array_scanner, i, upper.indx,
 				 arrayRef->refelembyval,
-- 
cgit v1.2.1