Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hvjOA-0002Q0-D1 for pgsql-hackers@arkaria.postgresql.org; Thu, 08 Aug 2019 14:27:34 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1hvjO9-0000tc-3M for pgsql-hackers@arkaria.postgresql.org; Thu, 08 Aug 2019 14:27:33 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hvjO7-0000jo-Vg for pgsql-hackers@lists.postgresql.org; Thu, 08 Aug 2019 14:27:32 +0000 Received: from out2-smtp.messagingengine.com ([66.111.4.26]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hvjO5-0003MB-3s for pgsql-hackers@postgresql.org; Thu, 08 Aug 2019 14:27:31 +0000 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id DAEA520FE3 for ; Thu, 8 Aug 2019 10:27:27 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Thu, 08 Aug 2019 10:27:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=CfNzEF3J/jzrok31gau6VsxSUIkKR ClVyu5UsI2IbOs=; b=EwVD/IMyMw826MYBHeTCd2WaCHILPctIWt+QEaqWs4HxA 0CLp0+BeaX/TUgrD19tRjp6TYyq/I2YHxaBlvNWECFm8ygC1hmERTWqewOVeabxH Ww9mEiIvtxdqLMkSywbMYaDx9n5EmiI93pP4S39SEN6YljLADA0uaT5tq7wAe6u9 84VElj0UrrPhK8JHr60XvSMQJvSO7XGZPlIWPL/WM3t7L3QteRWk6VVNdkNzlLYp mfv2AA96+SsHtUAy87x++SyTLQC93fbYZXGr964X7F5MfYd9QkOAOjpTvrUT8Mve iu1CsVMCff54wRC42OR6dfuVqiDi6fG/OUwgDVJxA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrudduhedgjeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefvhffuohfkffgfgggtsehmtderre dtfeejnecuhfhrohhmpefrvghtvghrucfgihhsvghnthhrrghuthcuoehpvghtvghrrdgv ihhsvghnthhrrghuthesvdhnughquhgrughrrghnthdrtghomheqnecuffhomhgrihhnpe dvnhguqhhurggurhgrnhhtrdgtohhmnecukfhppeelfedrvdegvddrgedtrddvtddvnecu rfgrrhgrmhepmhgrihhlfhhrohhmpehpvghtvghrrdgvihhsvghnthhrrghuthesvdhnug hquhgrughrrghnthdrtghomhenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from april.pezone.net (p5df228ca.dip0.t-ipconnect.de [93.242.40.202]) by mail.messagingengine.com (Postfix) with ESMTPA id 2877880063 for ; Thu, 8 Aug 2019 10:27:27 -0400 (EDT) To: pgsql-hackers From: Peter Eisentraut Subject: clean up obsolete initdb locale handling Openpgp: preference=signencrypt Autocrypt: addr=peter.eisentraut@2ndquadrant.com; prefer-encrypt=mutual; keydata= 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 3jI= Organization: 2ndQuadrant Message-ID: Date: Thu, 8 Aug 2019 16:27:25 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2593B64F7ED91D36B3AEC201" 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. --------------2593B64F7ED91D36B3AEC201 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit A long time ago, we changed LC_COLLATE and LC_CTYPE from cluster-wide to per-database (61d967498802ab86d8897cb3c61740d7e9d712f6). There is some leftover code from that in initdb.c and backend/main/main.c to pass these environment variables around in the expectations that the backend will write them to pg_control during bootstrap, which is of course all a lie now. The attached patch cleans that up. (Not totally sure about the WIN32 block, but the change seems good to me.) -- Peter Eisentraut http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services --------------2593B64F7ED91D36B3AEC201 Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="0001-initdb-Remove-obsolete-locale-handling.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-initdb-Remove-obsolete-locale-handling.patch" RnJvbSA1MTU2OGQyOTIzY2UyNmVjZjQzZjAyOGRkNDA3NTM3NmNmYjg2NGZiIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogVGh1LCA4IEF1ZyAyMDE5IDEyOjMzOjA3ICswMjAwClN1YmplY3Q6 IFtQQVRDSF0gaW5pdGRiOiBSZW1vdmUgb2Jzb2xldGUgbG9jYWxlIGhhbmRsaW5nCgpUaGUg bWV0aG9kIG9mIHBhc3NpbmcgTENfQ09MTEFURSBhbmQgTENfQ1RZUEUgdG8gdGhlIGJhY2tl bmQgZHVyaW5nCmluaXRkYiBpcyBvYnNvbGV0ZSBhcyBvZiA2MWQ5Njc0OTg4MDJhYjg2ZDg4 OTdjYjNjNjE3NDBkN2U5ZDcxMmY2LgpUaGlzIGNhbiBhbGwgYmUgcmVtb3ZlZC4KLS0tCiBz cmMvYmFja2VuZC9tYWluL21haW4uYyB8IDM5ICsrKysrKysrKystLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLQogc3JjL2Jpbi9pbml0ZGIvaW5pdGRiLmMgfCAxNCAtLS0tLS0tLS0t LS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCA0MyBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9tYWluL21haW4uYyBiL3NyYy9iYWNrZW5k L21haW4vbWFpbi5jCmluZGV4IDdiMThmOGM3NTguLjFiZDg0OWZiNTEgMTAwNjQ0Ci0tLSBh L3NyYy9iYWNrZW5kL21haW4vbWFpbi5jCisrKyBiL3NyYy9iYWNrZW5kL21haW4vbWFpbi5j CkBAIC05OSw0MiArOTksMjMgQEAgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCU1l bW9yeUNvbnRleHRJbml0KCk7CiAKIAkvKgotCSAqIFNldCB1cCBsb2NhbGUgaW5mb3JtYXRp b24gZnJvbSBlbnZpcm9ubWVudC4gIE5vdGUgdGhhdCBMQ19DVFlQRSBhbmQKLQkgKiBMQ19D T0xMQVRFIHdpbGwgYmUgb3ZlcnJpZGRlbiBsYXRlciBmcm9tIHBnX2NvbnRyb2wgaWYgd2Ug YXJlIGluIGFuCi0JICogYWxyZWFkeS1pbml0aWFsaXplZCBkYXRhYmFzZS4gIFdlIHNldCB0 aGVtIGhlcmUgc28gdGhhdCB0aGV5IHdpbGwgYmUKLQkgKiBhdmFpbGFibGUgdG8gZmlsbCBw Z19jb250cm9sIGR1cmluZyBpbml0ZGIuICBMQ19NRVNTQUdFUyB3aWxsIGdldCBzZXQKLQkg KiBsYXRlciBkdXJpbmcgR1VDIG9wdGlvbiBwcm9jZXNzaW5nLCBidXQgd2Ugc2V0IGl0IGhl cmUgdG8gYWxsb3cgc3RhcnR1cAotCSAqIGVycm9yIG1lc3NhZ2VzIHRvIGJlIGxvY2FsaXpl ZC4KKwkgKiBTZXQgdXAgbG9jYWxlIGluZm9ybWF0aW9uCiAJICovCi0KIAlzZXRfcGdsb2Nh bGVfcGdzZXJ2aWNlKGFyZ3ZbMF0sIFBHX1RFWFRET01BSU4oInBvc3RncmVzIikpOwogCi0j aWZkZWYgV0lOMzIKLQogCS8qCi0JICogV2luZG93cyB1c2VzIGNvZGVwYWdlcyByYXRoZXIg dGhhbiB0aGUgZW52aXJvbm1lbnQsIHNvIHdlIHdvcmsgYXJvdW5kCi0JICogdGhhdCBieSBx dWVyeWluZyB0aGUgZW52aXJvbm1lbnQgZXhwbGljaXRseSBmaXJzdCBmb3IgTENfQ09MTEFU RSBhbmQKLQkgKiBMQ19DVFlQRS4gV2UgaGF2ZSB0byBkbyB0aGlzIGJlY2F1c2UgaW5pdGRi IHBhc3NlcyB0aG9zZSB2YWx1ZXMgaW4gdGhlCi0JICogZW52aXJvbm1lbnQuIElmIHRoZXJl IGlzIG5vdGhpbmcgdGhlcmUgd2UgZmFsbCBiYWNrIG9uIHRoZSBjb2RlcGFnZS4KKwkgKiBM Q19DT0xMQVRFIGFuZCBMQ19DVFlQRSBhcmUgc2V0IGF0IGJhY2tlbmQgc3RhcnQgdG8gdmFs dWVzIGZyb20KKwkgKiBwZ19kYXRhYmFzZS4gIFdlIHN0YXJ0IG91dCBMQ19DT0xMQVRFIGFz ICJDIiAobm90aGluZyBpbiB0aGUgcG9zdG1hc3RlcgorCSAqIHNob3VsZCBjYXJlKS4gIEJ1 dCBMQ19DVFlQRSBzaG91bGQgYmUgc2V0IHRvIHNvbWV0aGluZyByZWFzb25hYmxlIHNvCisJ ICogdGhhdCBnZXR0ZXh0IGNhbiB3b3JrLgogCSAqLwotCXsKLQkJY2hhcgkgICAqZW52X2xv Y2FsZTsKLQotCQlpZiAoKGVudl9sb2NhbGUgPSBnZXRlbnYoIkxDX0NPTExBVEUiKSkgIT0g TlVMTCkKLQkJCWluaXRfbG9jYWxlKCJMQ19DT0xMQVRFIiwgTENfQ09MTEFURSwgZW52X2xv Y2FsZSk7Ci0JCWVsc2UKLQkJCWluaXRfbG9jYWxlKCJMQ19DT0xMQVRFIiwgTENfQ09MTEFU RSwgIiIpOwotCi0JCWlmICgoZW52X2xvY2FsZSA9IGdldGVudigiTENfQ1RZUEUiKSkgIT0g TlVMTCkKLQkJCWluaXRfbG9jYWxlKCJMQ19DVFlQRSIsIExDX0NUWVBFLCBlbnZfbG9jYWxl KTsKLQkJZWxzZQotCQkJaW5pdF9sb2NhbGUoIkxDX0NUWVBFIiwgTENfQ1RZUEUsICIiKTsK LQl9Ci0jZWxzZQotCWluaXRfbG9jYWxlKCJMQ19DT0xMQVRFIiwgTENfQ09MTEFURSwgIiIp OworCWluaXRfbG9jYWxlKCJMQ19DT0xMQVRFIiwgTENfQ09MTEFURSwgIkMiKTsKIAlpbml0 X2xvY2FsZSgiTENfQ1RZUEUiLCBMQ19DVFlQRSwgIiIpOwotI2VuZGlmCiAKKwkvKgorCSAq IExDX01FU1NBR0VTIHdpbGwgZ2V0IHNldCBsYXRlciBkdXJpbmcgR1VDIG9wdGlvbiBwcm9j ZXNzaW5nLCBidXQgd2Ugc2V0CisJICogaXQgaGVyZSB0byBhbGxvdyBzdGFydHVwIGVycm9y IG1lc3NhZ2VzIHRvIGJlIGxvY2FsaXplZC4KKwkgKi8KICNpZmRlZiBMQ19NRVNTQUdFUwog CWluaXRfbG9jYWxlKCJMQ19NRVNTQUdFUyIsIExDX01FU1NBR0VTLCAiIik7CiAjZW5kaWYK ZGlmZiAtLWdpdCBhL3NyYy9iaW4vaW5pdGRiL2luaXRkYi5jIGIvc3JjL2Jpbi9pbml0ZGIv aW5pdGRiLmMKaW5kZXggNTUxZDM3OWQ4NS4uODhhMjYxZDliZCAxMDA2NDQKLS0tIGEvc3Jj L2Jpbi9pbml0ZGIvaW5pdGRiLmMKKysrIGIvc3JjL2Jpbi9pbml0ZGIvaW5pdGRiLmMKQEAg LTE0MTcsMjAgKzE0MTcsNiBAQCBib290c3RyYXBfdGVtcGxhdGUxKHZvaWQpCiAJYmtpX2xp bmVzID0gcmVwbGFjZV90b2tlbihia2lfbGluZXMsICJMQ19DVFlQRSIsCiAJCQkJCQkJICBl c2NhcGVfcXVvdGVzX2JraShsY19jdHlwZSkpOwogCi0JLyoKLQkgKiBQYXNzIGNvcnJlY3Qg TENfeHh4IGVudmlyb25tZW50IHRvIGJvb3RzdHJhcC4KLQkgKgotCSAqIFRoZSBzaGVsbCBz Y3JpcHQgYXJyYW5nZWQgdG8gcmVzdG9yZSB0aGUgTEMgc2V0dGluZ3MgYWZ0ZXJ3YXJkcywg YnV0Ci0JICogdGhlcmUgZG9lc24ndCBzZWVtIHRvIGJlIGFueSBjb21wZWxsaW5nIHJlYXNv biB0byBkbyB0aGF0LgotCSAqLwotCXNucHJpbnRmKGNtZCwgc2l6ZW9mKGNtZCksICJMQ19D T0xMQVRFPSVzIiwgbGNfY29sbGF0ZSk7Ci0JcHV0ZW52KHBnX3N0cmR1cChjbWQpKTsKLQot CXNucHJpbnRmKGNtZCwgc2l6ZW9mKGNtZCksICJMQ19DVFlQRT0lcyIsIGxjX2N0eXBlKTsK LQlwdXRlbnYocGdfc3RyZHVwKGNtZCkpOwotCi0JdW5zZXRlbnYoIkxDX0FMTCIpOwotCiAJ LyogQWxzbyBlbnN1cmUgYmFja2VuZCBpc24ndCBjb25mdXNlZCBieSB0aGlzIGVudmlyb25t ZW50IHZhcjogKi8KIAl1bnNldGVudigiUEdDTElFTlRFTkNPRElORyIpOwogCi0tIAoyLjIy LjAKCg== --------------2593B64F7ED91D36B3AEC201--