OSDN Git Service

Merge branch 'pgrex90-base' into pgrex90
authorMasaoFujii <masao.fujii@gmail.com>
Mon, 13 Dec 2010 09:12:21 +0000 (18:12 +0900)
committerMasaoFujii <masao.fujii@gmail.com>
Mon, 13 Dec 2010 09:12:21 +0000 (18:12 +0900)
commit01ad6c4ddeec357decfb3fa9929bfca158f859f4
tree83c8ba151d09abb941c9435ca417f62c99d0f547
parentee5e6b02a5468f679cd22f6a516c4f6f9673e36b
parent118834d74467eb10e54bcfd48339eecce5aec27f
Merge branch 'pgrex90-base' into pgrex90

Conflicts:
doc/src/sgml/protocol.sgml
src/backend/replication/walsender.c
src/interfaces/libpq/fe-exec.c
src/interfaces/libpq/fe-protocol2.c
src/interfaces/libpq/fe-protocol3.c
src/interfaces/libpq/libpq-int.h
doc/src/sgml/protocol.sgml
src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
src/backend/replication/walsender.c
src/interfaces/libpq/fe-exec.c