[Pgpool-hackers] Follow master patch modified

[Gilles Darold]

Tatsuo,

Le 09/03/2011 08:43, Tatsuo Ishii a écrit :
> I have applied this patches to the CVS HEAD and got an compile error:
>
> gcc -DHAVE_CONFIG_H -DDEFAULT_CONFIGDIR=\"/usr/local/etc\" -I.  -D_GNU_SOURCE -I /usr/local/pgsql/include   -g -O2 -Wall -Wmissing-prototypes -Wmissing-declarations -MT main.o -MD -MP -MF .deps/main.Tpo -c -o main.o main.c
> main.c: In function ‘failover’:
> main.c:1654: error: ‘POOL_REQUEST_INFO’ has no member named ‘prefered_primary_node_id’
Oh yes, sorry this is a line from the promote patch, you can safely
remove it. Or if you prefer I've attached the fixed patch.

> I thought I needed pcp_promote_node patch and tried to apply the patch but I got:
>
> $ patch -b -p1 < ../patch-promote.diff 
> patching file main.c
> Hunk #2 succeeded at 167 (offset 2 lines).
> Hunk #4 succeeded at 1376 (offset 2 lines).
> Hunk #6 FAILED at 1604.
> Hunk #7 succeeded at 1660 with fuzz 2 (offset 44 lines).
> Hunk #8 FAILED at 1686.
> Hunk #9 FAILED at 2398.
> Hunk #10 FAILED at 2412.
> Hunk #11 FAILED at 2441.
> 5 out of 11 hunks FAILED -- saving rejects to file main.c.rej
> patching file pcp/Makefile.am
> patching file pcp/Makefile.in
> patching file pcp/pcp.c
> patching file pcp/pcp.h
> patching file pcp/pcp_promote_node.c
> patching file pcp_child.c
> patching file pool_auth.c
> patching file pool.h
> patching file pool_query_context.c
>
> Any help appreciated.
Those 2 patches are working on same parts so hunks on main.c are normal,
you have to applied by hand what have been rejected.

-- 
Gilles Darold
Administrateur de bases de données
http://dalibo.com - http://dalibo.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-follow.diff
Type: text/x-patch
Size: 13401 bytes
Desc: not available
URL: <http://pgfoundry.org/pipermail/pgpool-hackers/attachments/20110309/18c3ec47/attachment-0001.bin>