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 5F3CC200BF3 for ; Thu, 22 Dec 2016 06:31:58 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 5E043160B39; Thu, 22 Dec 2016 05:31: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 A79CC160B26 for ; Thu, 22 Dec 2016 06:31:57 +0100 (CET) Received: (qmail 51090 invoked by uid 500); 22 Dec 2016 05:31: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 51077 invoked by uid 99); 22 Dec 2016 05:31:56 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Dec 2016 05:31:56 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 5C16EC0F01 for ; Thu, 22 Dec 2016 05:31:56 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.218 X-Spam-Level: X-Spam-Status: No, score=-6.218 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id dYQYkmMbwRR0 for ; Thu, 22 Dec 2016 05:31:55 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 7A7565F2F1 for ; Thu, 22 Dec 2016 05:31:54 +0000 (UTC) Received: (qmail 51062 invoked by uid 99); 22 Dec 2016 05:31: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; Thu, 22 Dec 2016 05:31:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7EAF6DF9AD; Thu, 22 Dec 2016 05:31:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: liuming@apache.org To: commits@trafodion.incubator.apache.org Date: Thu, 22 Dec 2016 05:31:54 -0000 Message-Id: <02bd7f9574f844918135bf1c849aeb0b@git.apache.org> In-Reply-To: <63614df766ce4c4e9a9d46954d546ef3@git.apache.org> References: <63614df766ce4c4e9a9d46954d546ef3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-trafodion git commit: Merge Fix for [TRAFODION-2228]fix shift/reduce conflict for AES_ENCRYPT/AES_DECRYPT archived-at: Thu, 22 Dec 2016 05:31:58 -0000 Merge Fix for [TRAFODION-2228]fix shift/reduce conflict for AES_ENCRYPT/AES_DECRYPT Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c69b501a Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c69b501a Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c69b501a Branch: refs/heads/master Commit: c69b501af3a6811aadcba2a54e74262e71fd0115 Parents: 763f15b 37fa8dc Author: Liu Ming Authored: Thu Dec 22 05:31:20 2016 +0000 Committer: Liu Ming Committed: Thu Dec 22 05:31:20 2016 +0000 ---------------------------------------------------------------------- core/sql/parser/sqlparser.y | 2 -- 1 file changed, 2 deletions(-) ----------------------------------------------------------------------