From 8578d1b5bd1af239750baf191a703dd607e14a87 Mon Sep 17 00:00:00 2001 From: Tatsuo Ishii Date: Thu, 26 Jul 2007 02:09:42 +0000 Subject: [PATCH] Run autoconf --- Makefile.in | 9 +-------- configure | 5 +++-- pool_config.c | 13 +++++++++++++ 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/Makefile.in b/Makefile.in index d95ae67..10b7b31 100644 --- a/Makefile.in +++ b/Makefile.in @@ -122,7 +122,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -149,6 +148,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ ac_ct_CC = @ac_ct_CC@ +ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ @@ -159,26 +159,19 @@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ -htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ -localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ -psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ diff --git a/configure b/configure index 875a50d..e78444b 100755 --- a/configure +++ b/configure @@ -2604,7 +2604,7 @@ fi # Define the identity of the package. PACKAGE=pgpool - VERSION=3.3 + VERSION=3.4 cat >>confdefs.h <<_ACEOF @@ -4443,7 +4443,8 @@ done -for ac_header in fcntl.h unistd.h getopt.h netinet/tcp.h netinet/in.h netdb.h sys/param.h sys/types.h sys/socket.h sys/un.h sys/time.h sys/pstat.h + +for ac_header in fcntl.h unistd.h getopt.h netinet/tcp.h netinet/in.h netdb.h sys/param.h sys/types.h sys/socket.h sys/un.h sys/time.h sys/pstat.h sys/select.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then diff --git a/pool_config.c b/pool_config.c index 6d02fe1..d2d9424 100644 --- a/pool_config.c +++ b/pool_config.c @@ -1662,6 +1662,7 @@ int pool_get_config(char *confpath) pool_config.replication_timeout = 0; pool_config.load_balance_mode = 0; pool_config.replication_stop_on_mismatch = 0; + pool_config.replicate_select = 0; pool_config.weight_master = 0.5; pool_config.weight_secondary = 0.5; pool_config.reset_query_list = default_reset_query_list; @@ -1986,6 +1987,18 @@ int pool_get_config(char *confpath) pool_debug("replication_stop_on_mismatch: %d", v); pool_config.replication_stop_on_mismatch = v; } + else if (!strcmp(key, "replicate_select")) + { + int v = eval_logical(yytext); + + if (v < 0) + { + pool_error("pool_config: invalid value %s for %s", yytext, key); + return(-1); + } + pool_debug("replicate_select: %d", v); + pool_config.replicate_select = v; + } else if (!strcmp(key, "weight_master")) { double v = atof(yytext); -- 2.39.5