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 6B3512004F3 for ; Tue, 15 Aug 2017 18:20:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 698F5166E83; Tue, 15 Aug 2017 16:20:36 +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 B12E9166E80 for ; Tue, 15 Aug 2017 18:20:35 +0200 (CEST) Received: (qmail 69613 invoked by uid 500); 15 Aug 2017 16:20:34 -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 69604 invoked by uid 99); 15 Aug 2017 16:20:34 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Aug 2017 16:20:34 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id BF57B18077D for ; Tue, 15 Aug 2017 16:20:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-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 (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id Pf4xhWoa9gLV for ; Tue, 15 Aug 2017 16:20:32 +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 324825F254 for ; Tue, 15 Aug 2017 16:20:32 +0000 (UTC) Received: (qmail 69595 invoked by uid 99); 15 Aug 2017 16:20:31 -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; Tue, 15 Aug 2017 16:20:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A0389E009E; Tue, 15 Aug 2017 16:20:31 +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: Tue, 15 Aug 2017 16:20:31 -0000 Message-Id: <34d039d9a99b48428ac4ef3c2a5d9c45@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-trafodion git commit: fix TRAFODION-2712 archived-at: Tue, 15 Aug 2017 16:20:36 -0000 Repository: incubator-trafodion Updated Branches: refs/heads/master 93bb3df75 -> 49f9681f0 fix TRAFODION-2712 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/47de0e2c Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/47de0e2c Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/47de0e2c Branch: refs/heads/master Commit: 47de0e2c6a4bb5dcf8031f47532313ca445d5a1b Parents: 802f3b0 Author: SuJinpei <873118042@qq.com> Authored: Mon Aug 14 20:29:27 2017 +0800 Committer: SuJinpei <873118042@qq.com> Committed: Mon Aug 14 20:29:27 2017 +0800 ---------------------------------------------------------------------- core/conn/odb/src/odb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/47de0e2c/core/conn/odb/src/odb.c ---------------------------------------------------------------------- diff --git a/core/conn/odb/src/odb.c b/core/conn/odb/src/odb.c index 5ec4eb4..4db998c 100755 --- a/core/conn/odb/src/odb.c +++ b/core/conn/odb/src/odb.c @@ -3664,7 +3664,7 @@ Please note the fixed length '6' in strmicmp: SELECT/UPDATET/DELETE/INSERT have } pos += snprintf(&obuff[pos], obl - pos, "%s", os, (char *)&Ocnames[i*MAXCOL_LEN]); } - pos += snprintf(&obuff[pos], obl - pos, "\n "); + pos += snprintf(&obuff[pos], obl - pos, "\n "); } break; case 3: /* Print Line Mode */ @@ -9686,7 +9686,7 @@ static void Oextract(int eid) #ifdef HDFS if ( etab[eid].fho ) { (*hdfswrite)(hfs, etab[eid].fho, (void *)xbuff, xbuffl); - } else if ( etab[eid].fho ) { + } else if ( etab[eid].fo ) { (void)fwrite ( xbuff, 1, xbuffl, etab[eid].fo ); } #else @@ -9910,7 +9910,7 @@ static void Oextract(int eid) } if ( etab[eid].flg2 & 04000000 ) { /* initialize XML output buffer */ - xbuffl = snprintf(xbuff, xbuffl, "\n<%s>\n", + xbuffl = snprintf(xbuff, xbuffl, "\n\n", etab[eid].src ? etab[eid].src : "select" ); #ifdef HDFS if ( etab[eid].fho ) {