Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3B16F200C79 for ; Fri, 19 May 2017 23:33:58 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 39A6E160BD1; Fri, 19 May 2017 21:33:58 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 82641160BB0 for ; Fri, 19 May 2017 23:33:57 +0200 (CEST) Received: (qmail 55569 invoked by uid 500); 19 May 2017 21:33:56 -0000 Mailing-List: contact commits-help@trafodion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@trafodion.apache.org Delivered-To: mailing list commits@trafodion.apache.org Received: (qmail 55555 invoked by uid 99); 19 May 2017 21:33:55 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 May 2017 21:33:55 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 672361A02BF for ; Fri, 19 May 2017 21:33:55 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.722 X-Spam-Level: X-Spam-Status: No, score=-3.722 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_NUMSUBJECT=0.5, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 52MQgJDC_Zpq for ; Fri, 19 May 2017 21:33:54 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 533485FC84 for ; Fri, 19 May 2017 21:33:54 +0000 (UTC) Received: (qmail 55535 invoked by uid 99); 19 May 2017 21:33:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 May 2017 21:33:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6160CDF9AE; Fri, 19 May 2017 21:33:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbirdsall@apache.org To: commits@trafodion.incubator.apache.org Date: Fri, 19 May 2017 21:33:54 -0000 Message-Id: <1b425150e08948038384b6368e20fecc@git.apache.org> In-Reply-To: <86e38989e3dd49e693ffbdc60262e1c8@git.apache.org> References: <86e38989e3dd49e693ffbdc60262e1c8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-trafodion git commit: Merge [TRAFODION-2605] PR 1099 Rework fix for TRAFODION-2294 archived-at: Fri, 19 May 2017 21:33:58 -0000 Merge [TRAFODION-2605] PR 1099 Rework fix for TRAFODION-2294 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/3f1485fe Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/3f1485fe Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/3f1485fe Branch: refs/heads/master Commit: 3f1485fe68b33869883c48122aa2cfa2bf3eb964 Parents: ced104a 1caf7f2 Author: Dave Birdsall Authored: Fri May 19 21:32:46 2017 +0000 Committer: Dave Birdsall Committed: Fri May 19 21:32:46 2017 +0000 ---------------------------------------------------------------------- core/sql/arkcmp/CmpStatement.cpp | 2 +- core/sql/regress/executor/DIFF140.KNOWN | 4 -- core/sql/regress/executor/EXPECTED140 | 63 ++++++++++++++-------------- core/sql/sqlcomp/CmpMain.cpp | 47 ++++++++++----------- core/sql/sqlcomp/CmpMain.h | 12 ++++-- 5 files changed, 62 insertions(+), 66 deletions(-) ----------------------------------------------------------------------