Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1f3ho3-0006FH-ML for pgsql-hackers@arkaria.postgresql.org; Wed, 04 Apr 2018 12:46:27 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1f3ho2-00048r-Ai for pgsql-hackers@arkaria.postgresql.org; Wed, 04 Apr 2018 12:46:26 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1f3ho1-00048h-Vu for pgsql-hackers@lists.postgresql.org; Wed, 04 Apr 2018 12:46:26 +0000 Received: from mail-qk0-f196.google.com ([209.85.220.196]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1f3hnu-0005RH-MM for pgsql-hackers@postgresql.org; Wed, 04 Apr 2018 12:46:24 +0000 Received: by mail-qk0-f196.google.com with SMTP id g7so10076160qkm.1 for ; Wed, 04 Apr 2018 05:46:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:subject:to:cc:references:from :organization:message-id:date:user-agent:mime-version:in-reply-to :content-language; bh=GAZi8KA+Eodpb2cWcVxI07Q3SR6o6ek8xPD6W/+BpnM=; b=R2OhKJ4BgNrHeyjC3CabWQAVKqdn/rPV2P7su1+pT3ySJqb5Jf4r4+AEItZHzo2dWh KNTZ+69i0Ym4oF296vmKhCkzkLDLg33NbIP0z7+mZe85WvpK2A6Pu/+ykeZbmjwc7OmR Xa8lsHQZJjeyOIZvfsDpkreYDsxNK9pJ5A4/BQeyCi7uhVGjCFJy6ncNn4cbNjrxTj// 8v39+G7ijngNHeuzP/lET4pNBPi60r38dJQzcsNc1yKCrF/YBWT0yl8A6YS1AB/dU9Yw WgEZfDGHJYroccAHVnj3/pQuWBvsFCIiV+A9sqD/k+DdhuBWPdXL9ArhaI87FZuHkHE4 cxHw== X-Gm-Message-State: ALQs6tDe2nfINLaTn9MuEFQMof+V8OW2SkQ8fDE3CbDRTGJ1iqPn1qZC 6Ftf48DHs+2tkjpsJVhqYDRMfOkoZ9jfww== X-Google-Smtp-Source: AIpwx4/rrR1kILUk4zA0FfsTdV1MDD3jI6p/Qdlpt2dXrZ8Sn8B+1sF6iAiz7Rh/iJ4huKnBwHHCJw== X-Received: by 10.233.235.16 with SMTP id b16mr23357400qkg.99.1522845977167; Wed, 04 Apr 2018 05:46:17 -0700 (PDT) Received: from localhost.localdomain (c-24-61-8-151.hsd1.ma.comcast.net. [24.61.8.151]) by smtp.gmail.com with ESMTPSA id q184sm3674008qkf.79.2018.04.04.05.46.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Apr 2018 05:46:16 -0700 (PDT) Reply-To: jesper.pedersen@redhat.com Subject: Re: [HACKERS] MERGE SQL Statement for PG11 To: Simon Riggs Cc: Pavan Deolasee , Peter Geoghegan , Amit Langote , Robert Haas , Tomas Vondra , Alvaro Herrera , Andrew Dunstan , Pavan Deolasee , Stephen Frost , PostgreSQL-development References: From: Jesper Pedersen Organization: Red Hat Message-ID: Date: Wed, 4 Apr 2018 08:46:15 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------09740D93A3243497CA33381F" Content-Language: en-US List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk This is a multi-part message in MIME format. --------------09740D93A3243497CA33381F Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Hi Simon, On 03/30/2018 07:10 AM, Simon Riggs wrote: > No problems found, but moving proposed commit to 2 April pm > There is a warning for this, as attached. Best regards, Jesper --------------09740D93A3243497CA33381F Content-Type: text/x-patch; name="merge_warn.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="merge_warn.patch" diff --git a/src/backend/executor/nodeMerge.c b/src/backend/executor/nodeMerge.c index 0e0d0795d4..9aee073a94 100644 --- a/src/backend/executor/nodeMerge.c +++ b/src/backend/executor/nodeMerge.c @@ -485,7 +485,6 @@ ExecMerge(ModifyTableState *mtstate, EState *estate, TupleTableSlot *slot, ItemPointer tupleid; ItemPointerData tuple_ctid; bool matched = false; - char relkind; Datum datum; bool isNull; --------------09740D93A3243497CA33381F--