Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nh8lw-00053V-4j for pgsql-hackers@arkaria.postgresql.org; Wed, 20 Apr 2022 11:45:24 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1nh8lu-0004gM-OZ for pgsql-hackers@arkaria.postgresql.org; Wed, 20 Apr 2022 11:45:22 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nh8lt-0004gC-MZ for pgsql-hackers@lists.postgresql.org; Wed, 20 Apr 2022 11:45:22 +0000 Received: from out3-smtp.messagingengine.com ([66.111.4.27]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nh8lr-0007ib-1J for pgsql-hackers@lists.postgresql.org; Wed, 20 Apr 2022 11:45:20 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id DDE5F5C0186; Wed, 20 Apr 2022 07:45:17 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Wed, 20 Apr 2022 07:45:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1650455117; x=1650541517; bh=xB2fddKHqY/binBgLhbUMGDv0UgL ww5UygVAIGLZgE0=; b=q2D5XAuB+sLJj7R4sDwQgSjPL/Qja7f2hmh34ueo/AH9 4Nmrv0V2xxyE2/s6ePXoMyxcbxgTeY34m96k3cN4z4YQXT1tesq4bpNT/mEne9Eb ZP1q/z7mVAn7IkHV++rjFnH2HAXx60OisRGkiTYLGPS85TQn/jaThLV8uCrtHUgM quvTmL7jJ+t2fJEIQm+77r6UfeZWUc6yh7RtbJs8Yx0bxuAKAgAe4VdEZhZFOIru jEt79JaE2iGsv1Go7C5Y9ASxEIsERbQo/yYfdqWnlnECkWrM0wMkcBAUe5+mMNnk UokW55189FETMbSezrq73QvZQcMLFD/Nk14kGB9Y3A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrtddtgddukecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvvefukfggtggugfgjsehtkeertddttdejnecuhfhrohhmpeetlhhvrghr ohcujfgvrhhrvghrrgcuoegrlhhvhhgvrhhrvgesrghlvhhhrdhnohdqihhprdhorhhgqe enucggtffrrghtthgvrhhnpedvkedtffduffdtffffheffhfejjefhgfeiueeukeejkeff gfdufffhudffffeuveenucffohhmrghinhepvghnthgvrhhprhhishgvuggsrdgtohhmne cuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprghlvhhh vghrrhgvsegrlhhvhhdrnhhoqdhiphdrohhrgh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 20 Apr 2022 07:45:17 -0400 (EDT) Received: by perhan.alvh.no-ip.org (Postfix, from userid 1000) id DD5062A379F; Wed, 20 Apr 2022 13:45:10 +0200 (CEST) Date: Wed, 20 Apr 2022 13:45:10 +0200 From: Alvaro Herrera To: Michael Paquier Cc: Pg Hackers Subject: Re: minor MERGE cleanups Message-ID: <202204201145.glospebqz4zz@alvherre.pgsql> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk On 2022-Apr-20, Michael Paquier wrote: > On Tue, Apr 19, 2022 at 03:45:22PM +0200, Alvaro Herrera wrote: > > I expect these fixups in new code should be uncontroversial. > > The whole set looks rather sane to me. Thank you, I have pushed them. -- Álvaro Herrera Breisgau, Deutschland — https://www.EnterpriseDB.com/