[trafodion] branch master updated: [MANTIS-10179] Fix regression introduced by Mantis 8184 fix (cherry picked from commit 8bc7344ec6510dc1ce4e9604e5c2e5bc1427a385)

[db...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dbirdsall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafodion.git


The following commit(s) were added to refs/heads/master by this push:
     new fd8978f  [MANTIS-10179] Fix regression introduced by Mantis 8184 fix (cherry picked from commit 8bc7344ec6510dc1ce4e9604e5c2e5bc1427a385)
     new 53daac4  Merge pull request #1797 from DaveBirdsall/Trafodion3276
fd8978f is described below

commit fd8978f9b61ab0fa659d4a84d5be094026389873
Author: Dave Birdsall <db...@apache.org>
AuthorDate: Tue Feb 12 20:41:52 2019 +0000

    [MANTIS-10179] Fix regression introduced by Mantis 8184 fix
    (cherry picked from commit 8bc7344ec6510dc1ce4e9604e5c2e5bc1427a385)
---
 core/sql/generator/GenPreCode.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/sql/generator/GenPreCode.cpp b/core/sql/generator/GenPreCode.cpp
index 5d27db3..d6619f9 100644
--- a/core/sql/generator/GenPreCode.cpp
+++ b/core/sql/generator/GenPreCode.cpp
@@ -130,9 +130,7 @@ static void generateKeyExpr(const ValueIdSet & externalInputs,
 						ieKeyVal);
 
       // Bind it so potential incompatible data type issues are handled
-      const NAType & keyType = listOfKeyColumns[keyNum].getType();      
-      if (keyType.supportsSQLnull())
-        keyExpr->setSpecialNulls(TRUE);  // allow NULL ieKeyVal for nullable keys
+      keyExpr->setSpecialNulls(TRUE);  // allow NULL ieKeyVal
       keyExpr->bindNode(generator->getBindWA());
 
       // Synthesize its type for and assign a ValueId to it.