From c561432fe0a7547a741e52288402538a684583f8 Mon Sep 17 00:00:00 2001 From: radek Date: Mon, 4 Feb 2008 23:06:38 +0000 Subject: [PATCH] - merge from POSTGRESQL_8_3 Changed files: postgresql-ac_version.patch -> 1.3 postgresql-conf.patch -> 1.5 --- postgresql-ac_version.patch | 8 ++++---- postgresql-conf.patch | 32 ++++++++++++++------------------ 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/postgresql-ac_version.patch b/postgresql-ac_version.patch index ddbf8cf..d648bc5 100644 --- a/postgresql-ac_version.patch +++ b/postgresql-ac_version.patch @@ -1,8 +1,8 @@ ---- postgresql-8.2.6/configure.in~ 2008-01-03 21:40:50.000000000 +0000 -+++ postgresql-8.2.6/configure.in 2008-01-07 20:30:11.857224928 +0000 +--- postgresql-8.3RC1/configure.in.orig 2008-01-07 22:23:47.888774598 +0000 ++++ postgresql-8.3RC1/configure.in 2008-01-07 22:23:50.888568429 +0000 @@ -19,10 +19,10 @@ - AC_INIT([PostgreSQL], [8.2.6], [pgsql-bugs@postgresql.org]) + AC_INIT([PostgreSQL], [8.3RC1], [pgsql-bugs@postgresql.org]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required. -Untested combinations of 'autoconf' and PostgreSQL versions are not @@ -12,6 +12,6 @@ +dnl Untested combinations of 'autoconf' and PostgreSQL versions are not +dnl recommended. You can remove the check from 'configure.in' but it is then +dnl your responsibility whether the result works or not.])]) - AC_COPYRIGHT([Copyright (c) 1996-2006, PostgreSQL Global Development Group]) + AC_COPYRIGHT([Copyright (c) 1996-2008, PostgreSQL Global Development Group]) AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) AC_CONFIG_AUX_DIR(config) diff --git a/postgresql-conf.patch b/postgresql-conf.patch index f1b6597..d0b9c89 100644 --- a/postgresql-conf.patch +++ b/postgresql-conf.patch @@ -1,16 +1,16 @@ ---- postgresql-8.1.0/src/backend/utils/misc/postgresql.conf.sample.orig 2005-10-08 20:32:58.000000000 +0100 -+++ postgresql-8.1.0/src/backend/utils/misc/postgresql.conf.sample 2005-11-11 16:11:18.000000000 +0000 -@@ -206,7 +206,7 @@ +--- postgresql-8.3RC1/src/backend/utils/misc/postgresql.conf.sample.orig 2007-12-07 16:44:56.000000000 +0000 ++++ postgresql-8.3RC1/src/backend/utils/misc/postgresql.conf.sample 2008-01-07 22:19:56.904649611 +0000 +@@ -231,7 +231,7 @@ # - Where to Log - --#log_destination = 'stderr' # Valid values are combinations of -+log_destination = 'syslog' # Valid values are combinations of - # stderr, syslog and eventlog, - # depending on platform. - -@@ -235,8 +235,8 @@ - # output. 0 to disable. +-#log_destination = 'stderr' # Valid values are combinations of ++log_destination = 'syslog' # Valid values are combinations of + # stderr, csvlog, syslog and eventlog, + # depending on platform. csvlog + # requires logging_collector to be on. +@@ -262,8 +262,8 @@ + # 0 to disable. # These are relevant when logging to syslog: -#syslog_facility = 'LOCAL0' @@ -20,16 +20,12 @@ # - When to Log - -@@ -292,10 +292,10 @@ - #debug_print_rewritten = off +@@ -324,7 +324,7 @@ #debug_print_plan = off #debug_pretty_print = off + #log_checkpoints = off -#log_connections = off -+log_connections = true ++log_connections = on #log_disconnections = off #log_duration = off --#log_line_prefix = '' # Special values: -+log_line_prefix = '<%p> ' # Special values: - # %u = user name - # %d = database name - # %r = remote host and port + #log_hostname = off -- 2.44.0