From commits-return-8756-archive-asf-public=cust-asf.ponee.io@trafodion.apache.org Mon Nov 19 19:09:01 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 7AD78180671 for ; Mon, 19 Nov 2018 19:09:00 +0100 (CET) Received: (qmail 69356 invoked by uid 500); 19 Nov 2018 18:08:59 -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 69347 invoked by uid 99); 19 Nov 2018 18:08:59 -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; Mon, 19 Nov 2018 18:08:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 35583E0954; Mon, 19 Nov 2018 18:08:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbirdsall@apache.org To: commits@trafodion.apache.org Date: Mon, 19 Nov 2018 18:08:59 -0000 Message-Id: <805048d26d4a4c58864dc79b14b4c430@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] trafodion git commit: fix TRAFODION-3233 Repository: trafodion Updated Branches: refs/heads/master b4749fcfc -> 084145de6 fix TRAFODION-3233 Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/87bf65df Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/87bf65df Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/87bf65df Branch: refs/heads/master Commit: 87bf65df82090fde10b7705cc4137b91d86f48f6 Parents: b4749fc Author: SuJinpei <873118042@qq.com> Authored: Wed Nov 14 17:26:16 2018 +0800 Committer: SuJinpei <873118042@qq.com> Committed: Wed Nov 14 17:26:16 2018 +0800 ---------------------------------------------------------------------- core/conn/odb/src/odb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/87bf65df/core/conn/odb/src/odb.c ---------------------------------------------------------------------- diff --git a/core/conn/odb/src/odb.c b/core/conn/odb/src/odb.c index 053fad7..5e427c0 100755 --- a/core/conn/odb/src/odb.c +++ b/core/conn/odb/src/odb.c @@ -5498,7 +5498,7 @@ static void etabadd(char type, char *run, int id) } } else { /* not a load job */ etab[no].k = no; /* record grandparent for copy/diff ops */ - if ( etab[no].ps > 1 ){ + if (etab[no].mr && etab[no].ps > 1 ){ etab[no].TotalMaxRecords = etab[no].mr; etab[no].mr /= etab[no].ps; /* each thread will get a portion of the max record to fetch */ if (etab[0].r > etab[0].mr) /* rowset size should not exceeds the max size */