From cf892bfabe5addaebfa41f9056a237744911a9a9 Mon Sep 17 00:00:00 2001
From: Tatsuo Ishii <ishii at sraoss.co.jp>
Date: Sat, 12 Mar 2005 13:01:47 +0000
Subject: [PATCH] version 2.5.2

---
 ChangeLog    |  6 ++++++
 Makefile.am  |  2 +-
 Makefile.in  |  2 +-
 NEWS         | 11 +++++++++++
 TODO         |  8 +++++++-
 configure    |  2 +-
 configure.in |  2 +-
 7 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0c2abcf..2dab934 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-12    <t-ishii@sra.co.jp>
+	* version 2.5.2
+	* fix bug in health checking
+	* strict mode is applied to non SELECT query only
+	* add -D_GNU_SOURCE to CPP flag
+	
 2005-02-20    <t-ishii@sra.co.jp>
 	* version 2.5.1
 	* fix bug in heal checking
diff --git a/Makefile.am b/Makefile.am
index a167cff..90bb5c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,4 +11,4 @@ DEFS = @DEFS@ \
 
 sysconf_DATA = pgpool.conf.sample
 
-AM_CPPFLAGS = -Wall -Wmissing-prototypes -Wmissing-declarations
+AM_CPPFLAGS = -Wall -Wmissing-prototypes -Wmissing-declarations -D_GNU_SOURCE
diff --git a/Makefile.in b/Makefile.in
index eba5290..13bd384 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -177,7 +177,7 @@ pgpool_SOURCES = pool.h version.h pgpool.conf.sample \
 	pool_signal.h pool_signal.c
 
 sysconf_DATA = pgpool.conf.sample
-AM_CPPFLAGS = -Wall -Wmissing-prototypes -Wmissing-declarations
+AM_CPPFLAGS = -Wall -Wmissing-prototypes -Wmissing-declarations -D_GNU_SOURCE
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
diff --git a/NEWS b/NEWS
index 6a2868e..2d5144e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+2.5.2(kaku) 2005/3/12(Sat)
+
+      o 2.5.1¤Ëenbug¤ò½¤Àµ¡¥health check¤¬¼ÂºÝ¤Ë¤Ï¤µ¤ì¤Æ¤¤¤Ê¤¤¥±¡¼¥¹¤¬
+	¤¢¤Ã¤¿¤Î¤ò½¤Àµ¡¥¥±¡¼¥Ö¥ëÈ´¤±¤Ê¤É¤ò¥¿¥¤¥à¥¢¥¦¥È¤Ç¸¡½Ð¤¹¤ë¤Î¤ÏOK
+	¤À¤¬¡¤Ä¾¤Á¤Ë¥¨¥é¡¼¤Ë¤Ê¤ë¥±¡¼¥¹¤ò¸¡½Ð¤Ç¤­¤Æ¤¤¤Ê¤«¤Ã¤¿¡¥
+
+      o strict¥â¡¼¥É¤Ç¤¢¤Ã¤Æ¤â¡¤SELECT¤À¤Ã¤¿¤ésecondary¤Î´°Î»¤òÂÔ¤¿¤Ê
+	¤¤¡¥¤³¤ì¤Ë¤è¤Ã¤Æ¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤¬¸þ¾å¤¹¤ë¡¥
+
+      o ¥³¥ó¥Ñ¥¤¥ë¥Õ¥é¥°¤Ë-D_GNU_SOURCE¤òÄɲÃ(asprintf¤ÎÀë¸À¤ËɬÍ×)
+
 2.5.1(kaku) 2005/2/20(Sun)
 
       o 2.5¤ÇÄɲ䵤줿health checkµ¡Ç½¤Î¥Ð¥°½¤Àµ
diff --git a/TODO b/TODO
index bf14774..948d0fa 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,13 @@ $Header$
 
 TODO¹àÌÜ
 
-- o pgpool¥¹¥¿¡¼¥È»þ¤Ë¥í¥°¤ò½ÐÎÏ(v2.5.1)
+o STRICT¥â¡¼¥É¤Ç¤¢¤Ã¤Æ¤â¡¤SELECT¤Ê¤é¤Ðnon strict¤Ë¤·¤Æ¤¤¤¤¤Ï¤º¡¥
+
+o ¥Ð¥°¡¥master/slave mode&load balance mode¤Î¤È¤­¤Ë¡¤reset query¤¬¥Þ¥¹
+  ¥¿Â¦¤Ë¤·¤«½Ð¤Ê¤¤¡¥master_slave mode¤Ç¤Ê¤±¤ì¤Ð¤³¤ÎÌäÂê¤Ïµ¯¤­¤Ê¤¤->¤·¤ç
+  ¤¦¤¬¤Ê¤¤¡©
+
+-o pgpool¥¹¥¿¡¼¥È»þ¤Ë¥í¥°¤ò½ÐÎÏ(v2.5.1)
 
 o ¥»¥Ã¥·¥ç¥ó³«»Ï»þ¤Ëȯ¹Ô¤¹¤ëÌ䤤¹ç¤ï¤»¤òpgpool.conf¤ÇÀßÄê²Äǽ¤Ë¤¹¤ë
 
diff --git a/configure b/configure
index b1dd681..f2c873a 100755
--- a/configure
+++ b/configure
@@ -2603,7 +2603,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=pgpool
- VERSION=2.5.1
+ VERSION=2.5.2
 
 
 cat >>confdefs.h <<_ACEOF
diff --git a/configure.in b/configure.in
index 75623d7..6720d33 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_INIT
 dnl Checks for programs.
 AC_PROG_CC
 
-AM_INIT_AUTOMAKE(pgpool, 2.5.1)
+AM_INIT_AUTOMAKE(pgpool, 2.5.2)
 
 AM_PROG_LEX
 
-- 
2.39.5