Prepare for 3.2

diff --git a/ChangeLog b/ChangeLog
index 5ff8f198853b73dea3512de7810a44eea4241c37..8d51552c05fbbd45474c9bd91cae4b3f4bfe3b6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2007-02-XX    <ishii@sraoss.co.jp>
+2007-02-10    <ishii@sraoss.co.jp>
        * Version 3.2
        * Support HBA authentication(Taiki)
        * Support log_connections(Taiki)
@@ -6,6 +6,8 @@
        * Show pgpool status in ps command(Tatsuo)
        * Fix bug with prepared query(Yoshiyuki)
        * Detach secondary server when "kind mismatch error" is detected(Tatsuo)
+        * Re-open socket if it was closed by backend while reusing
+         connection(Yoshiyuki)
        
 2006-12-12    <y-asaba@sraoss.co.jp>
        * Version 3.1.2

diff --git a/NEWS b/NEWS
index ce683b9f2d83b9f8fcddbc44cb77824dc039b3b3..99d6616f05c177b3914d8a6ac22498ac930d4eb1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-3.2(kalekale) 2007/2/XX
+3.2(kalekale) 2007/2/10
       o HBAǧ¾Ú¤ò¥µ¥Ý¡¼¥È¤·¤¿(Taiki)
 
       o log_connections¤ò¥µ¥Ý¡¼¥È¤·¤¿(Taiki)
@@ -13,6 +13,9 @@
          o kind mismatch error¤Î¤È¤­¤Ëmaster¤Ç¤Ï¤Ê¤¯¡¤secondary¤òÀÚ¤êÎ¥¤¹
           ¤è¤¦¤Ë¤·¤¿(replication_stop_on_mismatch = true¤Î¤È¤­)(Tatsuo)
 
+      o ¥³¥Í¥¯¥·¥ç¥ó¥×¡¼¥ë¤òºÆÍøÍѤ¹¤ë¤È¤­¤Ë¡¤¥½¥±¥Ã¥È¤¬¥¯¥í¡¼¥º¤µ¤ì¤Æ
+       ¤¤¤¿¤éºÆÅÙ¥³¥Í¥¯¥·¥ç¥ó¤ò³«¤¯¤è¤¦¤Ë¤·¤¿(Yoshiyuki)
+
 3.1.2(kawakawa) 2006/12/12
       o weight ¤Ë 0 ¤ò»ØÄê¤Ç¤­¤ë¤è¤¦¤Ë¤·¤¿(Tatsuo)
 

diff --git a/README b/README
index 48e6650548a69a7f3070af094eb2a253a6588b9d..8c06217241e0d7fe3c8bc8a59d0ed3f2324625c5 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 $Header$
 
-pgpool version 3.1 README
+pgpool version 3.2 README
 
 1. What is pgpool
 

diff --git a/aclocal.m4 b/aclocal.m4
index 7258915b5e47964cf1b3ef2a928a35c762436c18..20ce300290d9fbd6f2aa7c1970dc6f7e81fa54ad 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -881,4 +881,3 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([ac_func_accept_argtypes.m4])

diff --git a/configure b/configure
index 2dcc88c40b719b846cf1a2aefd6aeae7f7cd6535..d348c58cbc00d528841e70608b8eaef2e5bf3d03 100755 (executable)
--- a/configure
+++ b/configure
@@ -4832,6 +4832,30 @@ _ACEOF
 fi
 
 
+# $PostgreSQL: pgsql/config/ac_func_accept_argtypes.m4,v 1.6 2003/11/29 19:51:17 pgsql Exp $
+# This comes from the official Autoconf macro archive at
+# <http://research.cys.de/autoconf-archive/>
+# (I removed the $ before the Id CVS keyword below.)
+
+
+
+# PostgreSQL local changes: In the original version ACCEPT_TYPE_ARG3
+# is a pointer type. That's kind of useless because then you can't
+# use the macro to define a corresponding variable. We also make the
+# reasonable(?) assumption that you can use arg3 for getsocktype etc.
+# as well (i.e., anywhere POSIX.2 has socklen_t).
+#
+# arg2 can also be `const' (e.g., RH 4.2). Change the order of tests
+# for arg3 so that `int' is first, in case there is no prototype at all.
+#
+# Solaris 7 and 8 have arg3 as 'void *' (disguised as 'Psocklen_t'
+# which is *not* 'socklen_t *').  If we detect that, then we assume
+# 'int' as the result, because that ought to work best.
+#
+# On Win32, accept() returns 'unsigned int PASCAL'
+
+
+
 echo "$as_me:$LINENO: checking for struct sockaddr_storage" >&5
 echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
 if test "${ac_cv_type_struct_sockaddr_storage+set}" = set; then

diff --git a/configure.in b/configure.in
index f58584b6d81f117536614202664870bbe4b99430..0754c3f9a69226d00f0995e28bf9d263320ecf9c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -33,7 +33,6 @@ AC_HEADER_TIME
 
 dnl Checks for sockadr_storage structure, members and necessary types
 m4_include([ac_func_accept_argtypes.m4])
-
 AC_CHECK_TYPES([struct sockaddr_storage], [], [],
 [#include <sys/types.h>
 #ifdef HAVE_SYS_SOCKET_H