Prevent remote libpq notices from being sent to clients

1 patchset tracked - current t139871_1

v1t139871_1posted Jun 05, 09:31successneeds rebaserecent 24dpg 20

base5e5929040 Sep 27, 21:55 on master

applyapplied Sep 27, 23:48

rebaselast tried about 13 hours ago on 66042bd3e

Applying: Avoid sending remote libpq notices back to clients
Using index info to reconstruct a base tree...
M	src/include/libpq/libpq-be-fe-helpers.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/libpq/libpq-be-fe-helpers.h
CONFLICT (content): Merge conflict in src/include/libpq/libpq-be-fe-helpers.h
Patch failed at 0001 Avoid sending remote libpq notices back to clients

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

conflicts on master: src/include/libpq/libpq-be-fe-helpers.h

pushSep 27, 23:48 -> 3d55c5245 branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1039 / 1039	2m 13s / 4m 50s	`docker run ... :t139871`	Sep 27, 23:58
run 36359932805 executed 1039 - ccache 78 hit / 6544 miss - head 3d55c5245 - digest sha256:c758ffa2a3a187... - run 36359932805
success	1	20	1039 / 1039	2m 46s / 4m 51s	`docker run ... @sha256:f83fba0...`	Sep 26, 19:16
run 36264887309 executed 1039 - ccache 78 hit / 6544 miss - head 3abfebf91 - digest sha256:f83fba03dbfb69... - run 36264887309
success	1	20	1039 / 1039	2m 49s / 5m 30s	`docker run ... @sha256:457a87b...`	Sep 25, 19:05
run 36176403494 executed 1039 - ccache 78 hit / 6544 miss - head a7d3d24db - digest sha256:457a87bcdfad8f... - run 36176403494
success	1	20	1038 / 1038	2m 58s / 5m 38s	`docker run ... @sha256:d1e9e50...`	Sep 24, 19:04
run 36044304984 executed 1038 - ccache 78 hit / 6544 miss - head 432e3e8af - digest sha256:d1e9e5060119b6... - run 36044304984
success	1	20	1036 / 1036	2m 52s / 5m 33s	`docker run ... @sha256:71b1b63...`	Sep 23, 19:02
run 35905347671 executed 1036 - ccache 98 hit / 6524 miss - head ef8b1cf6f - digest sha256:71b1b630490730... - run 35905347671
success	1	20	1036 / 1036	2m 54s / 5m 13s	`docker run ... @sha256:e837665...`	Sep 22, 18:59
run 35769686627 executed 1036 - ccache 98 hit / 6524 miss - head bac10a327 - digest sha256:e83766524bb728... - run 35769686627
success	1	20	1036 / 1036	2m 58s / 5m 41s	`docker run ... @sha256:7c42a8c...`	Sep 21, 18:49
run 35639647706 executed 1036 - ccache 98 hit / 6524 miss - head b01566ba6 - digest sha256:7c42a8c84000a5... - run 35639647706
success	1	20	1036 / 1036	2m 46s / 5m 21s	`docker run ... @sha256:b73c508...`	Sep 20, 13:17
run 35512545614 executed 1036 - ccache 98 hit / 6524 miss - head 646c7771f - digest sha256:b73c508e1d9e81... - run 35512545614
success	1	20	1036 / 1036	1m 52s / 4m 04s	`docker run ... @sha256:c9f1cac...`	Sep 19, 13:12
run 35444679251 executed 1036 - ccache 98 hit / 6524 miss - head 29c4bb96f - digest sha256:c9f1cac8c07528... - run 35444679251
success	1	20	1036 / 1036	1m 55s / 4m 29s	`docker run ... @sha256:1c56e5f...`	Sep 18, 13:12
run 35347994242 executed 1036 - ccache 98 hit / 6524 miss - head daa99f220 - digest sha256:1c56e5f69762a4... - run 35347994242
success	1	20	1036 / 1036	2m 58s / 5m 41s	`docker run ... @sha256:931d5f4...`	Sep 17, 13:12
run 35224442526 executed 1036 - ccache 98 hit / 6524 miss - head 010c4ae45 - digest sha256:931d5f4d931034... - run 35224442526
success	1	20	1036 / 1036	2m 50s / 5m 27s	`docker run ... @sha256:1c3f77b...`	Sep 16, 13:03
run 35098357945 executed 1036 - ccache 98 hit / 6524 miss - head 9773e3a6c - digest sha256:1c3f77b3dd545f... - run 35098357945
success	1	20	1036 / 1036	2m 56s / 5m 18s	`docker run ... @sha256:b3eee99...`	Sep 15, 12:57
run 34970856921 executed 1036 - ccache 98 hit / 6523 miss - head 5cc7e351f - digest sha256:b3eee99402606a... - run 34970856921
success	1	20	1023 / 1023	2m 09s / 4m 22s	`docker run ... @sha256:45b148d...`	Sep 14, 12:53
run 34845047550 executed 1023 - ccache 98 hit / 6523 miss - head 2c0bd96c8 - digest sha256:45b148d9266d2a... - run 34845047550
success	1	20	1023 / 1023	2m 59s / 5m 02s	`docker run ... @sha256:b235a3d...`	Sep 13, 12:13
run 34756040338 executed 1023 - ccache 98 hit / 6523 miss - head fa3b3d824 - digest sha256:b235a3d552d1c7... - run 34756040338
success	1	20	1023 / 1023	2m 47s / 5m 39s	`docker run ... @sha256:2280438...`	Sep 12, 12:04
run 34692119468 executed 1023 - ccache 98 hit / 6523 miss - head bf646301f - digest sha256:2280438177e0fd... - run 34692119468
success	1	20	1022 / 1022	2m 54s / 5m 20s	`docker run ... @sha256:1b2ca9e...`	Sep 11, 12:06
run 34595884958 executed 1022 - ccache 98 hit / 6523 miss - head 35920b3ac - digest sha256:1b2ca9ef720609... - run 34595884958
success	1	20	1022 / 1022	2m 53s / 5m 35s	`docker run ... @sha256:dd978aa...`	Sep 10, 12:03
run 34472997861 executed 1022 - ccache 98 hit / 6523 miss - head fe1f9f021 - digest sha256:dd978aa4f10e74... - run 34472997861
success	1	20	1020 / 1020	2m 54s / 5m 07s	`docker run ... @sha256:a9ef2c5...`	Sep 09, 11:51
run 34346829468 executed 1020 - ccache 98 hit / 6523 miss - head d6f0aede7 - digest sha256:a9ef2c5ee478cd... - run 34346829468
success	1	20	1020 / 1020	2m 08s / 4m 23s	`docker run ... @sha256:f47423e...`	Sep 08, 11:49
run 34221764892 executed 1020 - ccache 98 hit / 6523 miss - head 165a78d9b - digest sha256:f47423e6814233... - run 34221764892
success	1	20	1024 / 1024	2m 48s / 5m 18s	`docker run ... @sha256:309f33e...`	Sep 07, 11:44
run 34117238964 executed 1024 - ccache 98 hit / 6527 miss - head 2625bd656 - digest sha256:309f33ef3c2781... - run 34117238964
success	1	20	1024 / 1024	2m 55s / 5m 34s	`docker run ... @sha256:e546800...`	Sep 05, 13:39
run 33968875865 executed 1024 - ccache 98 hit / 6527 miss - head dd1886564 - digest sha256:e546800b7c3fce... - run 33968875865
success	1	20	1024 / 1024	2m 57s / 5m 30s	`docker run ... @sha256:18de6eb...`	Sep 04, 13:36
run 33877852604 executed 1024 - ccache 98 hit / 6527 miss - head d4b455f9f - digest sha256:18de6ebe102937... - run 33877852604
success	1	20	1023 / 1023	2m 47s / 5m 21s	`docker run ... @sha256:fef9dcc...`	Sep 03, 13:38
run 33760678562 executed 1023 - ccache 98 hit / 6526 miss - head ebb7dff19 - digest sha256:fef9dcc6f2fc78... - run 33760678562
success	1	20	1022 / 1022	2m 16s / 4m 15s	`docker run ... @sha256:26225fb...`	Sep 02, 13:27
run 33634824007 executed 1022 - ccache 98 hit / 6526 miss - head ecb7af709 - digest sha256:26225fbc96c5c5... - run 33634824007
success	1	20	1022 / 1022	2m 53s / 5m 12s	`docker run ... @sha256:ff8b427...`	Sep 01, 13:29
run 33512245095 executed 1022 - ccache 98 hit / 6526 miss - head 426812e88 - digest sha256:ff8b42711ad5b8... - run 33512245095
success	1	20	1022 / 1022	2m 54s / 5m 17s	`docker run ... @sha256:16431a5...`	Aug 31, 13:23
run 33395715810 executed 1022 - ccache 98 hit / 6526 miss - head 60c982162 - digest sha256:16431a59bb8c67... - run 33395715810
success	1	20	1021 / 1021	2m 48s / 5m 15s	`docker run ... @sha256:a45edbc...`	Aug 30, 13:21
run 33313460474 executed 1021 - ccache 98 hit / 6525 miss - head 202767a45 - digest sha256:a45edbc6e8a5ca... - run 33313460474
success	1	20	1021 / 1021	2m 55s / 5m 30s	`docker run ... @sha256:73ac16a...`	Aug 29, 13:20
run 33254307978 executed 1021 - ccache 98 hit / 6525 miss - head e1d2131cb - digest sha256:73ac16a4042b03... - run 33254307978
success	1	20	1021 / 1021	2m 09s / 4m 43s	`docker run ... @sha256:0dd45df...`	Aug 28, 13:18
run 33174113994 executed 1021 - ccache 98 hit / 6525 miss - head 40d577d72 - digest sha256:0dd45dfec0563c... - run 33174113994
success	1	20	1021 / 1021	2m 55s / 5m 35s	`docker run ... @sha256:4bca084...`	Aug 27, 13:18
run 33075246306 executed 1021 - ccache 98 hit / 6525 miss - head 6cd045169 - digest sha256:4bca0841a8f005... - run 33075246306
success	1	20	1024 / 1024	2m 14s / 4m 46s	`docker run ... @sha256:98d5ba9...`	Aug 26, 13:03
run 32971030106 executed 1024 - ccache 98 hit / 6525 miss - head 26d2420eb - digest sha256:98d5ba909aa8e6... - run 32971030106
success	1	20	1024 / 1024	2m 56s / 5m 23s	`docker run ... @sha256:8067122...`	Aug 25, 12:52
run 32848977379 executed 1024 - ccache 98 hit / 6525 miss - head af24ef331 - digest sha256:806712234ff38c... - run 32848977379
success	1	20	1023 / 1023	2m 11s / 4m 31s	`docker run ... @sha256:2ffe40e...`	Aug 24, 12:48
run 32728246333 executed 1023 - ccache 98 hit / 6525 miss - head 76a7e898d - digest sha256:2ffe40ed533ef0... - run 32728246333
success	1	20	1023 / 1023	2m 47s / 5m 04s	`docker run ... @sha256:df206bc...`	Aug 23, 12:48
run 32639954977 executed 1023 - ccache 98 hit / 6525 miss - head d6da7870a - digest sha256:df206bcd9f219e... - run 32639954977
success	1	20	1023 / 1023	2m 54s / 5m 31s	`docker run ... @sha256:579b21e...`	Aug 22, 12:47
run 32573457047 executed 1023 - ccache 98 hit / 6525 miss - head beecf309f - digest sha256:579b21eee783e8... - run 32573457047
success	1	20	1023 / 1023	2m 22s / 4m 17s	`docker run ... @sha256:948d6ad...`	Aug 21, 12:44
run 32482624131 executed 1023 - ccache 98 hit / 6525 miss - head 5b4df0810 - digest sha256:948d6ade722f3a... - run 32482624131
success	1	20	1023 / 1023	2m 50s / 5m 23s	`docker run ... @sha256:df5c29a...`	Aug 20, 12:46
run 32369526515 executed 1023 - ccache 98 hit / 6525 miss - head 02b4a97bb - digest sha256:df5c29a5be5361... - run 32369526515
success	1	20	1023 / 1023	2m 58s / 5m 14s	`docker run ... @sha256:5ddaa8e...`	Aug 19, 12:49
run 32253107655 executed 1023 - ccache 98 hit / 6525 miss - head fa6e8a18a - digest sha256:5ddaa8ef0c4ca4... - run 32253107655
success	1	20	1021 / 1021	2m 54s / 5m 28s	`docker run ... @sha256:2afec40...`	Aug 18, 12:27
run 32135952543 executed 1021 - ccache 98 hit / 6525 miss - head f578c6b01 - digest sha256:2afec401798544... - run 32135952543
success	1	20	1019 / 1019	2m 16s / 4m 51s	`docker run ... @sha256:2572e4b...`	Aug 17, 12:27
run 32028957222 executed 1019 - ccache 98 hit / 6524 miss - head 5a503656a - digest sha256:2572e4b31702d3... - run 32028957222
success	1	20	1019 / 1019	1m 47s / 4m 06s	`docker run ... @sha256:5540e42...`	Aug 16, 12:21
run 31946443490 executed 1019 - ccache 98 hit / 6524 miss - head eb39d9611 - digest sha256:5540e4271cc938... - run 31946443490
success	1	20	1019 / 1019	2m 58s / 5m 43s	`docker run ... @sha256:a2dd7cd...`	Aug 15, 12:24
run 31883971617 executed 1019 - ccache 98 hit / 6524 miss - head 57e0fbda7 - digest sha256:a2dd7cd463ffa3... - run 31883971617
success	1	20	1019 / 1019	2m 13s / 4m 53s	`docker run ... @sha256:dd96a09...`	Aug 14, 12:19
run 31799047022 executed 1019 - ccache 165 hit / 6457 miss - head 7fad3119d - digest sha256:dd96a09330fee5... - run 31799047022
success	1	20	1019 / 1019	2m 48s / 4m 46s	`docker run ... @sha256:13cc578...`	Aug 13, 12:18
run 31698557428 executed 1019 - ccache 165 hit / 6457 miss - head d61d1b7f6 - digest sha256:13cc578f519570... - run 31698557428
success	1	20	1019 / 1019	2m 54s / 5m 29s	`docker run ... @sha256:bb6de64...`	Aug 12, 12:15
run 31594734764 executed 1019 - ccache 165 hit / 6457 miss - head ec5e60e74 - digest sha256:bb6de64b2a93a9... - run 31594734764
success	1	20	1019 / 1019	1m 44s / 4m 11s	`docker run ... @sha256:1d72821...`	Aug 11, 12:13
run 31489375338 executed 1019 - ccache 165 hit / 6453 miss - head 58da77c02 - digest sha256:1d7282129f9c14... - run 31489375338
success	1	20	1019 / 1019	1m 48s / 4m 06s	`docker run ... @sha256:2033f67...`	Aug 10, 12:11
run 31385776523 executed 1019 - ccache 166 hit / 6452 miss - head a38406c12 - digest sha256:2033f67d3ae3f3... - run 31385776523
success	1	20	1019 / 1019	2m 55s / 5m 33s	`docker run ... @sha256:e9347c6...`	Aug 08, 14:51
run 31262521561 executed 1019 - ccache 166 hit / 6452 miss - head 565711638 - digest sha256:e9347c687f2ac0... - run 31262521561
success	1	20	1019 / 1019	1m 54s / 4m 10s	`docker run ... @sha256:857d973...`	Aug 07, 14:49
run 31188664115 executed 1019 - ccache 166 hit / 6452 miss - head 1149293ce - digest sha256:857d97308e8197... - run 31188664115
success	1	20	1018 / 1018	2m 55s / 5m 28s	`docker run ... @sha256:3e963ad...`	Aug 06, 14:49
run 31111830111 executed 1018 - ccache 166 hit / 6452 miss - head 25a425940 - digest sha256:3e963adbd35da2... - run 31111830111
success	1	20	1018 / 1018	2m 47s / 5m 10s	`docker run ... @sha256:2bb859a...`	Aug 05, 14:48
run 31016155148 executed 1018 - ccache 166 hit / 6452 miss - head 223431e54 - digest sha256:2bb859a4ca9392... - run 31016155148
success	1	20	1018 / 1018	2m 15s / 4m 07s	`docker run ... @sha256:2e08fd3...`	Aug 04, 14:46
run 30919896277 executed 1018 - ccache 166 hit / 6452 miss - head 31c1658c9 - digest sha256:2e08fd32b10460... - run 30919896277
success	1	20	1017 / 1017	2m 51s / 5m 23s	`docker run ... @sha256:c8dc9ba...`	Aug 03, 14:46
run 30823415259 executed 1017 - ccache 166 hit / 6452 miss - head dec7c44ae - digest sha256:c8dc9baec513e7... - run 30823415259
success	1	20	1017 / 1017	2m 50s / 5m 30s	`docker run ... @sha256:013d4dc...`	Aug 02, 14:45
run 30752406962 executed 1017 - ccache 166 hit / 6452 miss - head 6694423da - digest sha256:013d4dc0b9690d... - run 30752406962
success	1	20	1017 / 1017	2m 53s / 5m 06s	`docker run ... @sha256:20ad52a...`	Aug 01, 14:44
run 30704040293 executed 1017 - ccache 166 hit / 6452 miss - head a447db5ac - digest sha256:20ad52a89a000a... - run 30704040293
success	1	20	1016 / 1016	2m 55s / 5m 33s	`docker run ... @sha256:1ed93d4...`	Jul 31, 14:43
run 30639053619 executed 1016 - ccache 166 hit / 6452 miss - head 74e620db4 - digest sha256:1ed93d4c5d5914... - run 30639053619
success	1	20	1016 / 1016	2m 51s / 5m 35s	`docker run ... @sha256:9184ee1...`	Jul 30, 14:42
run 30552099160 executed 1016 - ccache 166 hit / 6452 miss - head e60ad016a - digest sha256:9184ee124213dc... - run 30552099160
success	1	20	1015 / 1015	3m 01s / 5m 41s	`docker run ... @sha256:f7380f8...`	Jul 29, 14:41
run 30461147738 executed 1015 - ccache 166 hit / 6452 miss - head d7c7d9005 - digest sha256:f7380f81032c03... - run 30461147738
success	1	20	1014 / 1014	2m 58s / 5m 29s	`docker run ... @sha256:cc66e09...`	Jul 28, 14:40
run 30368567043 executed 1014 - ccache 166 hit / 6452 miss - head 6612c4bb9 - digest sha256:cc66e09904e370... - run 30368567043