pgpool2.git / summary / log / commit / refs
commit 6ed3bc65ae73d6de91c7c971d9b70df59262201b
Author: Tatsuo Ishii <ishii@postgresql.org>
Date: Wed May 07 11:22:14 2014 +0000
Mega merge with EXCEPTION_MGR branch.
Exception manager and memory manager are incorporated from PostgreSQL.
Contributed by Muhammad Usama.
Conflicts:
src/config/pool_config.c
src/main/main.c
Makefile.in | 376 +-
aclocal.m4 | 617 +-
configure | 1303 ++--
doc/Makefile.in | 156 +-
doc/pgpool-en.html | 38 +
src/Makefile.am | 10 +-
src/Makefile.in | 533 +-
src/auth/md5.c | 9 +-
src/auth/pool_auth.c | 678 +-
src/auth/pool_hba.c | 424 +-
src/config/pool_config.c | 277 +-
src/config/pool_config.l | 245 +-
src/config/pool_config_md5.c | 2 +
src/context/pool_query_context.c | 130 +-
src/context/pool_session_context.c | 69 +-
src/include/Makefile.in | 180 +-
src/include/context/pool_query_context.h | 4 +-
src/include/context/pool_session_context.h | 5 +-
src/include/parallel_query/pool_rewrite_query.h | 1 -
src/include/parser/pool_memory.h | 77 -
src/include/parser/pool_parser.h | 17 +-
src/include/parser/pool_string.h | 3 +-
src/include/parser/stringinfo.h | 4 +
src/include/pcp/pcp_stream.h | 1 +
src/include/pool.h | 42 +-
src/include/pool_config.h | 3 +
src/include/pool_type.h | 288 +-
src/include/protocol/pool_proto_modules.h | 5 +-
src/include/protocol/protocol_defs.h | 19 +
src/include/utils/elog.h | 507 ++
src/include/utils/fe_ports.h | 28 +
src/include/utils/memdebug.h | 34 +
utils}/memnodes.h | 7 +-
src/include/utils/memutils.h | 148 +
src/include/utils/palloc.h | 105 +
src/include/utils/pool_ipc.h | 2 +-
src/include/utils/pool_path.h | 29 -
src/include/utils/pool_stream.h | 6 +-
src/libs/Makefile.in | 288 +-
src/libs/pcp/Makefile.am | 9 +-
src/libs/pcp/Makefile.in | 322 +-
src/libs/pcp/pcp.c | 282 +-
src/main/main.c | 2610 +------
src/main/pgpool_main.c | 2560 ++++++
src/main/pool_globals.c | 2 +
src/parallel_query/pool_rewrite_outfuncs.c | 44 +-
src/parallel_query/pool_rewrite_query.c | 241 +-
src/parser/Makefile.am | 4 +-
src/parser/Makefile.in | 322 +-
src/parser/copyfuncs.c | 4 +-
src/parser/gram.c | 9405 ++++++++++-------------
src/parser/gram.y | 5 +-
src/parser/list.c | 4 +-
src/parser/makefuncs.c | 2 +-
src/parser/outfuncs.c | 13 +-
src/parser/parser.c | 41 +-
src/parser/pool_memory.c | 342 -
src/parser/pool_string.c | 29 +-
src/parser/scan.c | 6 +-
src/parser/scan.l | 6 +-
src/parser/scansup.c | 2 +-
src/parser/snprintf.c | 2 +-
src/parser/stringinfo.c | 2 +-
src/parser/value.c | 2 +-
src/parser/wchar.c | 104 +
src/pcp_con/pcp_child.c | 1773 +++--
src/protocol/child.c | 1563 ++--
src/protocol/pool_connection_pool.c | 108 +-
src/protocol/pool_process_query.c | 1526 ++--
src/protocol/pool_proto2.c | 134 +-
src/protocol/pool_proto_modules.c | 766 +-
src/query_cache/pool_memqcache.c | 260 +-
src/rewrite/pool_lobj.c | 1 +
src/rewrite/pool_timestamp.c | 4 +-
src/sample/pgpool.conf | 27 +
src/sample/pgpool.conf.sample | 26 +
src/sample/pgpool.conf.sample-master-slave | 26 +
src/sample/pgpool.conf.sample-replication | 26 +
src/sample/pgpool.conf.sample-stream | 26 +
src/streaming_replication/pool_worker_child.c | 113 +-
src/system_db/pool_system.c | 256 +-
src/test/pgpool_setup | 2 +-
src/tools/Makefile.in | 288 +-
src/tools/fe_memutils.c | 131 +
src/tools/pcp/Makefile.am | 26 +-
src/tools/pcp/Makefile.in | 385 +-
src/tools/pgmd5/Makefile.am | 5 +-
src/tools/pgmd5/Makefile.in | 369 +-
src/utils/error/elog.c | 2449 ++++++
src/utils/mmgr/aset.c | 1383 ++++
src/utils/mmgr/mcxt.c | 860 +++
utils}/pcp/pcp_error.c | 0
utils}/pcp/pcp_stream.c | 76 +-
src/utils/pcp/pcp_timeout.c | 12 +
src/utils/pool_error.c | 2 +-
src/utils/pool_ip.c | 9 +
src/utils/pool_params.c | 65 +-
src/utils/pool_process_reporting.c | 47 +-
src/utils/pool_select_walker.c | 14 +-
src/utils/pool_shmem.c | 85 +-
src/utils/pool_stream.c | 334 +-
src/utils/ps_status.c | 1 +
src/watchdog/Makefile.in | 244 +-
src/watchdog/watchdog.c | 26 +-
104 files changed, 20963 insertions(+), 15520 deletions(-)
diff --cc src/config/pool_config.c
index d2f24a78f,fb22b9b0a..9227f8003
--- a/src/config/pool_config.c
+++ b/src/config/pool_config.c
@@@ -541,7 -563,7 +554,7 @@@ static char *extract_string(char *value
static char **extract_string_tokens(char *str, char *delim, int *n);
static void clear_host_entry(int slot);
- #line 545 "config/pool_config.c"
-#line 567 "config/pool_config.c"
++#line 558 "config/pool_config.c"
#define INITIAL 0
@@@ -721,10 -748,10 +734,10 @@@ YY_DEC
register char *yy_cp, *yy_bp;
register int yy_act;
- #line 85 "pool_config.l"
+ #line 98 "pool_config.l"
- #line 728 "config/pool_config.c"
-#line 755 "config/pool_config.c"
++#line 741 "config/pool_config.c"
if ( !(yy_init) )
{
@@@ -859,10 -886,10 +872,10 @@@ return POOL_PARSE_ERROR
YY_BREAK
case 11:
YY_RULE_SETUP
- #line 100 "pool_config.l"
+ #line 113 "pool_config.l"
ECHO;
YY_BREAK
- #line 866 "config/pool_config.c"
-#line 893 "config/pool_config.c"
++#line 879 "config/pool_config.c"
case YY_STATE_EOF(INITIAL):
yyterminate();
[parent: d892a537839e]