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 1f43Dj-0007xf-Nv for pgsql-hackers@arkaria.postgresql.org; Thu, 05 Apr 2018 11:38:23 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1f43Dh-00016H-Js for pgsql-hackers@arkaria.postgresql.org; Thu, 05 Apr 2018 11:38:21 +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 1f43Dh-000167-9Q for pgsql-hackers@lists.postgresql.org; Thu, 05 Apr 2018 11:38:21 +0000 Received: from mail-qt0-f193.google.com ([209.85.216.193]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1f43DZ-0003Qg-41 for pgsql-hackers@postgresql.org; Thu, 05 Apr 2018 11:38:19 +0000 Received: by mail-qt0-f193.google.com with SMTP id z23so25801174qti.5 for ; Thu, 05 Apr 2018 04:38:11 -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:from:to:cc:references :organization:message-id:date:user-agent:mime-version:in-reply-to :content-language; bh=kunLbM76amUi6LNdKU+6vd9yuKTsBHEfuyFUKoSF+9w=; b=D3OJ2hX+cZTSANl6sErqezb4cyNdCZxgv+Iw5jEoEApRJbQbgwer9A6pOyB5kAaR3p FC2j7erRbhmUR34Ha6pzNxue6aj9UvhpBX/lrGQXhqVD6II7izeIHKwcNgIckrVfWnBi m3WbgEHro8osELmmTfsyKi6VefMDi5qZSCxYhC13WuHKYTC7iMpsbiexUcljX7P7ixCa kdj0bjTv4/ZMxD+tpS7qfUgF2Ik7GJxkue2cM6Ik2Drfe2LTUKY0ACNPeT5ee8xj89oK XvZ+ePMdL6+H2fq8N2Y3kb2tmPYJguiSF5ALjuq/gf3WbauIEle6KvgPTQmmSHwxHnsy IFIw== X-Gm-Message-State: ALQs6tB7RfzqJSyXWffSpgg7hz3c3619CuPiw1IhuEnO7HsH8vH0dqgT QvBAtwVeCEviR+rIidw4yOTyMiRVmI3loA== X-Google-Smtp-Source: AIpwx49GeUfib/ML7w9XJyM2L219GiE8vZnaTCtTloR+MGtKu+WLaSI5GZm8DAbuHEjyzLbgJy6mZw== X-Received: by 10.237.58.131 with SMTP id o3mr4659369qte.4.1522928290337; Thu, 05 Apr 2018 04:38:10 -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 h21sm5326587qtm.57.2018.04.05.04.38.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Apr 2018 04:38:09 -0700 (PDT) Reply-To: jesper.pedersen@redhat.com Subject: Re: [HACKERS] MERGE SQL Statement for PG11 From: Jesper Pedersen To: Simon Riggs , Pavan Deolasee Cc: Peter Geoghegan , Amit Langote , Robert Haas , Tomas Vondra , Alvaro Herrera , Andrew Dunstan , Pavan Deolasee , Stephen Frost , PostgreSQL-development References: Organization: Red Hat Message-ID: <4cccec00-bf86-1989-bb59-05e57ad3d2a1@redhat.com> Date: Thu, 5 Apr 2018 07:38:07 -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="------------52DDFA7F992293BE1A689336" 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. --------------52DDFA7F992293BE1A689336 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Hi Simon and Paven, On 04/04/2018 08:46 AM, Jesper Pedersen wrote: > 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. > Updated version due to latest refactoring. Best regards,  Jesper --------------52DDFA7F992293BE1A689336 Content-Type: text/x-patch; name="merge_warn_v2.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="merge_warn_v2.patch" diff --git a/src/backend/executor/execMerge.c b/src/backend/executor/execMerge.c index 471f64361d..e35025880d 100644 --- a/src/backend/executor/execMerge.c +++ b/src/backend/executor/execMerge.c @@ -48,7 +48,6 @@ ExecMerge(ModifyTableState *mtstate, EState *estate, TupleTableSlot *slot, ItemPointer tupleid; ItemPointerData tuple_ctid; bool matched = false; - char relkind; Datum datum; bool isNull; --------------52DDFA7F992293BE1A689336--