Re: Patch (3): Implement failover on libpq connect level. - Mailing list pgsql-hackers

On 26 October 2015 at 07:58, Victor Wagner <vitus@wagner.pp.ru> wrote:
> On 2015.10.14 at 13:41:51 +0300, Victor Wagner wrote:
>
>> Attached patch which implements client library failover and
>> loadbalancing as was described in the proposal
>> <20150818041850.GA5092@wagner.pp.ru>.
>
> New version of patch
>
> 1. Handles replication connections correctly (i.e doesn't attempt to
> check readwrite mode if replication option is on)
> 2. Some minor improvement recommended by Korry Douglas  in
> <562A9259.4060408@enterprisedb.com>

This patch doesn't apply.  On line 636, this appears:

<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
+                                       if (value[0] ==  't')
======= COMMON ANCESTOR content follows ============================
+                                       if (strcmp(value, "true") == 0)
======= MERGED IN content follows ==================================
+                                       if (value[0]=='t')
>>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

Thom