Merge commit '1084f317702e1a039696ab8a37caf900e55ec8f2' into int-pgxc

Merge 9.0 PostgreSQL release into PGXC. Resolve conflicts thrown by git
and fix some issues raised during compilation. We still don't compile fine
at this point, but we should have resolved many conflicts to make further
progress.

Some of the changes in the regression tests are merged to reflect whats
there in 9.0 release. Those are easy to fix later when we run regressions

Conflicts:
	contrib/Makefile
	contrib/pgbench/pgbench.c
	src/Makefile
	src/backend/Makefile
	src/backend/access/transam/varsup.c
	src/backend/catalog/Makefile
	src/backend/catalog/dependency.c
	src/backend/catalog/genbki.sh
	src/backend/commands/dbcommands.c
	src/backend/commands/explain.c
	src/backend/commands/vacuum.c
	src/backend/executor/execMain.c
	src/backend/executor/execProcnode.c
	src/backend/executor/execTuples.c
	src/backend/parser/analyze.c
	src/backend/parser/gram.y
	src/backend/parser/parse_utilcmd.c
	src/backend/postmaster/postmaster.c
	src/backend/rewrite/rewriteHandler.c
	src/backend/storage/ipc/procarray.c
	src/backend/storage/lmgr/proc.c
	src/backend/tcop/postgres.c
	src/backend/tcop/utility.c
	src/backend/utils/cache/relcache.c
	src/backend/utils/init/postinit.c
	src/backend/utils/misc/guc.c
	src/bin/pg_ctl/pg_ctl.c
	src/include/Makefile
	src/include/access/twophase.h
	src/include/bootstrap/bootstrap.h
	src/include/catalog/catversion.h
	src/include/catalog/dependency.h
	src/include/catalog/indexing.h
	src/include/catalog/pg_proc.h
	src/include/nodes/nodes.h
	src/include/storage/lwlock.h
	src/include/storage/proc.h
	src/include/storage/procarray.h
	src/include/utils/lsyscache.h
	src/test/regress/expected/delete.out
	src/test/regress/expected/float4.out
	src/test/regress/expected/float8.out
	src/test/regress/expected/geometry.out
	src/test/regress/expected/join.out
	src/test/regress/expected/point.out
	src/test/regress/expected/rowtypes.out
	src/test/regress/expected/timestamp.out
	src/test/regress/expected/timestamptz.out
	src/test/regress/expected/tsearch.out
	src/test/regress/sql/numeric.sql
	src/test/regress/sql/point.sql

2185 files changed, 215083 insertions, 125943 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index 2e36725abb..b773b4d9c2 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
 PostgreSQL Database Management System
 (formerly known as Postgres, then as Postgres95)
 
-Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
+Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
 
 Portions Copyright (c) 1994, The Regents of the University of California
 
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 56a42ada0f..86623a3854 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,7 +1,7 @@
 #
 # PostgreSQL top level makefile
 #
-# $PostgreSQL: pgsql/GNUmakefile.in,v 1.50 2009/01/15 01:53:49 momjian Exp $
+# $PostgreSQL: pgsql/GNUmakefile.in,v 1.58 2010/03/30 00:10:46 petere Exp $
 #
 
 subdir =
@@ -9,18 +9,39 @@ top_builddir = .
 include $(top_builddir)/src/Makefile.global
 
 all:
-	$(MAKE) -C doc all
 	$(MAKE) -C src all
 	$(MAKE) -C config all
 	@echo "All of PostgreSQL successfully made. Ready to install."
 
-install:
+docs:
+	$(MAKE) -C doc all
+
+world:
+	$(MAKE) -C doc all
+	$(MAKE) -C src all
+	$(MAKE) -C config all
+	$(MAKE) -C contrib all
+	@echo "PostgreSQL, contrib, and documentation successfully made. Ready to install."
+
+html man:
 	$(MAKE) -C doc $@
+
+install:
 	$(MAKE) -C src $@
 	$(MAKE) -C config $@
 	@echo "PostgreSQL installation complete."
 
-installdirs uninstall:
+install-docs:
+	$(MAKE) -C doc install
+
+install-world:
+	$(MAKE) -C doc install
+	$(MAKE) -C src install
+	$(MAKE) -C config install
+	$(MAKE) -C contrib install
+	@echo "PostgreSQL, contrib, and documentation installation complete."
+
+installdirs uninstall coverage:
 	$(MAKE) -C doc $@
 	$(MAKE) -C src $@
 	$(MAKE) -C config $@
@@ -57,63 +78,32 @@ check: all
 check installcheck installcheck-parallel:
 	$(MAKE) -C src/test $@
 
+installcheck-world:
+	$(MAKE) -C src/test installcheck
+	$(MAKE) -C src/pl installcheck
+	$(MAKE) -C src/interfaces/ecpg installcheck
+	$(MAKE) -C contrib installcheck
+
 GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
 	./config.status $@
 
 
 ##########################################################################
 
-coverage:
-	$(MAKE) -C src/backend $@
-
-.PHONY: coverage-html
-coverage-html: coverage
-	rm -rf coverage
-	mkdir coverage
-	$(GENHTML) --show-details --legend --output-directory=coverage --title=PostgreSQL --num-spaces=4 --prefix=$(abs_top_srcdir)/src `find src/backend -name lcov.info -print`
-
-ifeq ($(enable_coverage),yes)
-clean distclean maintainer-clean: clean-coverage-local
-.PHONY: clean-coverage-local
-clean-coverage-local:
-	rm -rf coverage
-endif
-
-
-##########################################################################
-
 distdir	= postgresql-$(VERSION)
 dummy	= =install=
 garbage = =*  "#"*  ."#"*  *~*  *.orig  *.rej  core  postgresql-*
 
-dist: $(distdir).tar.gz 
-ifeq ($(split-dist), yes)
-dist: postgresql-base-$(VERSION).tar.gz postgresql-docs-$(VERSION).tar.gz postgresql-opt-$(VERSION).tar.gz postgresql-test-$(VERSION).tar.gz 
-endif
-dist:
+dist: $(distdir).tar.gz $(distdir).tar.bz2
 	rm -rf $(distdir)
 
 $(distdir).tar: distdir
 	$(TAR) chf $@ $(distdir)
 
-opt_files = \
-	src/tools src/tutorial \
-	$(addprefix src/pl/, plperl plpython tcl)
-
-docs_files = doc/postgres.tar.gz doc/src doc/TODO.detail
-
-postgresql-base-$(VERSION).tar: distdir
-	$(TAR) -c $(addprefix --exclude $(distdir)/, $(docs_files) $(opt_files) src/test) \
-	  -f $@ $(distdir)
-
-postgresql-docs-$(VERSION).tar: distdir
-	$(TAR) cf $@ $(addprefix $(distdir)/, $(docs_files))
-
-postgresql-opt-$(VERSION).tar: distdir
-	$(TAR) cf $@ $(addprefix $(distdir)/, $(opt_files))
+.INTERMEDIATE: $(distdir).tar
 
-postgresql-test-$(VERSION).tar: distdir
-	$(TAR) cf $@ $(distdir)/src/test
+distdir-location:
+	@echo $(distdir)
 
 distdir:
 	rm -rf $(distdir)* $(dummy)
@@ -134,10 +124,10 @@ distdir:
 	$(MAKE) -C $(distdir) distclean
 	rm -f $(distdir)/README.CVS
 
-distcheck: $(distdir).tar.gz
+distcheck: dist
 	rm -rf $(dummy)
 	mkdir $(dummy)
-	$(GZIP) -d -c $< | $(TAR) xf -
+	$(GZIP) -d -c $(distdir).tar.gz | $(TAR) xf -
 	install_prefix=`cd $(dummy) && pwd`; \
 	cd $(distdir) \
 	&& ./configure --prefix="$$install_prefix"
@@ -153,5 +143,4 @@ distcheck: $(distdir).tar.gz
 	rm -rf $(distdir) $(dummy)
 	@echo "Distribution integrity checks out."
 
-.PHONY: dist distdir distcheck
-unexport split-dist
+.PHONY: dist distdir distcheck docs install-docs
diff --git a/Makefile b/Makefile
index accf677e25..b5b2ea54c0 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@
 # GNUmakefile won't exist yet, so we catch that case as well.
 
 
-all check install installdirs installcheck installcheck-parallel uninstall clean distclean maintainer-clean:
+all check install installdirs installcheck installcheck-parallel uninstall clean distclean maintainer-clean dist distcheck world install-world installcheck-world:
 	@if [ ! -f GNUmakefile ] ; then \
 	   echo "You need to run the 'configure' program first. See the file"; \
 	   echo "'INSTALL' for installation instructions." ; \
diff --git a/config/Makefile b/config/Makefile
index c5ec0f7da4..2e881b7704 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/config/Makefile,v 1.2 2005/12/09 21:19:34 petere Exp $
+# $PostgreSQL: pgsql/config/Makefile,v 1.3 2009/08/26 22:24:42 petere Exp $
 
 subdir = config
 top_builddir = ..
@@ -7,10 +7,9 @@ include $(top_builddir)/src/Makefile.global
 
 install: all installdirs
 	$(INSTALL_SCRIPT) $(srcdir)/install-sh '$(DESTDIR)$(pgxsdir)/config/install-sh'
-	$(INSTALL_SCRIPT) $(srcdir)/mkinstalldirs '$(DESTDIR)$(pgxsdir)/config/mkinstalldirs'
 
 installdirs:
-	$(mkinstalldirs) '$(DESTDIR)$(pgxsdir)/config'
+	$(MKDIR_P) '$(DESTDIR)$(pgxsdir)/config'
 
 uninstall:
-	rm -f '$(DESTDIR)$(pgxsdir)/config/install-sh' '$(DESTDIR)$(pgxsdir)/config/mkinstalldirs'
+	rm -f '$(DESTDIR)$(pgxsdir)/config/install-sh'
diff --git a/config/c-compiler.m4 b/config/c-compiler.m4
index eeb2ee9494..a8df61b649 100644
--- a/config/c-compiler.m4
+++ b/config/c-compiler.m4
@@ -1,5 +1,5 @@
 # Macros to detect C compiler features
-# $PostgreSQL: pgsql/config/c-compiler.m4,v 1.19 2008/06/27 00:36:16 tgl Exp $
+# $PostgreSQL: pgsql/config/c-compiler.m4,v 1.22 2010/05/25 17:28:20 meskes Exp $
 
 
 # PGAC_C_SIGNED
@@ -17,6 +17,30 @@ fi])# PGAC_C_SIGNED
 
 
 
+# PGAC_C_INLINE
+# -------------
+# Check if the C compiler understands inline functions.
+# Defines: inline, USE_INLINE
+AC_DEFUN([PGAC_C_INLINE],
+[AC_C_INLINE
+AC_CACHE_CHECK([for quiet inline (no complaint if unreferenced)], pgac_cv_c_inline_quietly,
+  [pgac_cv_c_inline_quietly=no
+  if test "$ac_cv_c_inline" != no; then
+    pgac_c_inline_save_werror=$ac_c_werror_flag
+    ac_c_werror_flag=yes
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([static inline int fun () {return 0;}],[])],
+                   [pgac_cv_c_inline_quietly=yes])
+    ac_c_werror_flag=$pgac_c_inline_save_werror
+  fi])
+if test "$pgac_cv_c_inline_quietly" != no; then
+  AC_DEFINE_UNQUOTED([USE_INLINE], 1,
+    [Define to 1 if "static inline" works without unwanted warnings from ]
+    [compilations where static inline functions are defined but not called.])
+fi
+])# PGAC_C_INLINE
+
+
+
 # PGAC_TYPE_64BIT_INT(TYPE)
 # -------------------------
 # Check if TYPE is a working 64 bit integer type. Set HAVE_TYPE_64 to
@@ -131,3 +155,4 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([extern void $2 (); void (*fptr) () = $2;],[])],
               [LDFLAGS="$pgac_save_LDFLAGS"
                AC_MSG_RESULT(assuming no)])
 ])# PGAC_PROG_CC_LDFLAGS_OPT
+
diff --git a/config/c-library.m4 b/config/c-library.m4
index 74754b20e8..5d44685ec0 100644
--- a/config/c-library.m4
+++ b/config/c-library.m4
@@ -1,5 +1,5 @@
 # Macros that test various C library quirks
-# $PostgreSQL: pgsql/config/c-library.m4,v 1.33 2008/08/21 13:53:28 petere Exp $
+# $PostgreSQL: pgsql/config/c-library.m4,v 1.34 2009/07/02 18:55:40 petere Exp $
 
 
 # PGAC_VAR_INT_TIMEZONE
@@ -297,29 +297,3 @@ int main()
 ])dnl AC_CACHE_VAL
 AC_MSG_RESULT([$pgac_cv_printf_arg_control])
 ])# PGAC_FUNC_PRINTF_ARG_CONTROL
-
-
-# backport from Autoconf 2.61a
-# http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=f0c325537a22105536ac8c4e88656e50f9946486
-
-# AC_FUNC_FSEEKO
-# --------------
-AN_FUNCTION([ftello], [AC_FUNC_FSEEKO])
-AN_FUNCTION([fseeko], [AC_FUNC_FSEEKO])
-AC_DEFUN([AC_FUNC_FSEEKO],
-[_AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
-   [ac_cv_sys_largefile_source],
-   [Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).],
-   [[#include <sys/types.h> /* for off_t */
-     #include <stdio.h>]],
-   [[int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);]])
-
-# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
-# in glibc 2.1.3, but that breaks too many other things.
-# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-if test $ac_cv_sys_largefile_source != unknown; then
-  AC_DEFINE(HAVE_FSEEKO, 1,
-    [Define to 1 if fseeko (and presumably ftello) exists and is declared.])
-fi
-])# AC_FUNC_FSEEKO
diff --git a/config/config.guess b/config/config.guess
index e5716eea73..115f944a61 100755
--- a/config/config.guess
+++ b/config/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-02-03'
+timestamp='2010-04-03'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@ timestamp='2009-02-03'
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <[email protected]>.
-# Please send patches to <[email protected]>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <[email protected]> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +56,9 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -91,7 +92,7 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
+trap 'exit 1' HUP INT TERM
 
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
@@ -105,7 +106,7 @@ trap 'exit 1' 1 2 15
 
 set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
 : ${TMPDIR=/tmp} ;
  { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
@@ -170,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -324,12 +325,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -653,7 +660,7 @@ EOF
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -804,12 +811,12 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
+    *:Interix*:*)
     	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd | genuineintel)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -819,6 +826,9 @@ EOF
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -848,6 +858,20 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -870,6 +894,17 @@ EOF
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
 	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
@@ -879,78 +914,34 @@ EOF
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips64
-	#undef mips64el
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -959,8 +950,11 @@ EOF
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
@@ -983,66 +977,6 @@ EOF
     xtensa*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1071,7 +1005,7 @@ EOF
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1115,8 +1049,11 @@ EOF
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
+        # the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
         exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
@@ -1176,7 +1113,7 @@ EOF
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1269,6 +1206,16 @@ EOF
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
diff --git a/config/config.sub b/config/config.sub
index d546a94b95..ae35431611 100755
--- a/config/config.sub
+++ b/config/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-02-03'
+timestamp='2010-03-22'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@ timestamp='2009-02-03'
 
 
 # Please send patches to <[email protected]>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -72,8 +75,9 @@ Report bugs and patches to <[email protected]>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,10 +153,13 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -272,6 +279,7 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| moxie \
 	| mt \
 	| msp430 \
 	| nios | nios2 \
@@ -280,20 +288,31 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -324,7 +343,7 @@ case $basic_machine in
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
@@ -336,7 +355,7 @@ case $basic_machine in
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -364,15 +383,17 @@ case $basic_machine in
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
 	| tron-* \
+	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -466,6 +487,19 @@ case $basic_machine in
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -718,6 +752,9 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -1056,17 +1093,10 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
+        # This must be matched before tile*.
+        tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
 		;;
 	tile*)
 		basic_machine=tile-unknown
@@ -1239,6 +1269,9 @@ case $os in
         # First match some system type aliases
         # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+        -auroraux)
+	        os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1259,9 +1292,9 @@ case $os in
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -kopensolaris* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1282,7 +1315,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1415,6 +1448,8 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
+        -nacl*)
+	        ;;
 	-none)
 		;;
 	*)
@@ -1455,6 +1490,15 @@ case $basic_machine in
         c4x-* | tic4x-*)
         	os=-coff
 		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1612,7 +1656,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
diff --git a/config/docbook.m4 b/config/docbook.m4
index 491d329d53..0d8c1fad7e 100644
--- a/config/docbook.m4
+++ b/config/docbook.m4
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/config/docbook.m4,v 1.10 2008/11/26 11:26:54 petere Exp $
+# $PostgreSQL: pgsql/config/docbook.m4,v 1.11 2009/08/04 22:04:37 petere Exp $
 
 # PGAC_PROG_JADE
 # --------------
@@ -97,32 +97,3 @@ if test -n "$DOCBOOKSTYLE"; then
 else
   AC_PATH_PROGS(COLLATEINDEX, collateindex.pl)
 fi])# PGAC_PATH_COLLATEINDEX
-
-
-# PGAC_PATH_DOCBOOK2MAN
-# ---------------------
-# Find docbook2man program from the docbook2X package.  Upstream calls
-# this program docbook2man, but there is also a different docbook2man
-# out there from the docbook-utils package.  Thus, the program we want
-# is called docbook2x-man on Debian and db2x_docbook2man on Fedora.
-#
-# (Consider rewriting this macro using AC_PATH_PROGS_FEATURE_CHECK
-# when switching to Autoconf 2.62+.)
-AC_DEFUN([PGAC_PATH_DOCBOOK2MAN],
-[AC_CACHE_CHECK([for docbook2man], [ac_cv_path_DOCBOOK2MAN],
-[if test -z "$DOCBOOK2MAN"; then
-  _AS_PATH_WALK([],
-  [for ac_prog in docbook2x-man db2x_docbook2man docbook2man; do
-    ac_path="$as_dir/$ac_prog"
-    AS_EXECUTABLE_P(["$ac_path"]) || continue
-    if "$ac_path" --version 2>/dev/null | $GREP docbook2x >/dev/null 2>&1; then
-      ac_cv_path_DOCBOOK2MAN=$ac_path
-      break
-    fi
-  done])
-else
-  ac_cv_path_DOCBOOK2MAN=$DOCBOOK2MAN
-fi])
-DOCBOOK2MAN=$ac_cv_path_DOCBOOK2MAN
-AC_SUBST(DOCBOOK2MAN)
-])# PGAC_PATH_DOCBOOK2MAN
diff --git a/config/general.m4 b/config/general.m4
index aa3413b316..52f850ea25 100644
--- a/config/general.m4
+++ b/config/general.m4
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/config/general.m4,v 1.10 2008/10/29 09:27:24 petere Exp $
+# $PostgreSQL: pgsql/config/general.m4,v 1.11 2009/07/02 18:55:40 petere Exp $
 
 # This file defines new macros to process configure command line
 # arguments, to replace the brain-dead AC_ARG_WITH and AC_ARG_ENABLE.
@@ -33,7 +33,6 @@ m4_define([pgac_arg_to_variable],
 
 AC_DEFUN([PGAC_ARG],
 [
-pgac_args="$pgac_args pgac_arg_to_variable([$1],[$2])"
 m4_case([$1],
 
 enable, [
@@ -74,22 +73,6 @@ AC_ARG_WITH([$2], [AS_HELP_STRING([--]m4_if($3, -, without, with)[-$2]m4_if($3,
 )
 ])# PGAC_ARG
 
-# PGAC_ARG_CHECK()
-# ----------------
-# Checks if the user passed any --with/without/enable/disable
-# arguments that were not defined. Just prints out a warning message,
-# so this should be called near the end, so the user will see it.
-
-AC_DEFUN([PGAC_ARG_CHECK],
-[for pgac_var in `set | sed 's/=.*//' | $EGREP 'with_|enable_'`; do
-  for pgac_arg in $pgac_args with_gnu_ld; do
-    if test "$pgac_var" = "$pgac_arg"; then
-      continue 2
-    fi
-  done
-  pgac_txt=`echo $pgac_var | sed 's/_/-/g'`
-  AC_MSG_WARN([option ignored: --$pgac_txt])
-done])# PGAC_ARG_CHECK
 
 # PGAC_ARG_BOOL(TYPE, NAME, DEFAULT, HELP-STRING-RHS,
 #               [ACTION-IF-YES], [ACTION-IF-NO])
diff --git a/config/install-sh b/config/install-sh
index 8692ce9fd9..bdcfd39c63 100755
--- a/config/install-sh
+++ b/config/install-sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-# $PostgreSQL: pgsql/config/install-sh,v 1.7 2007/11/13 18:50:54 momjian Exp $
+# $PostgreSQL: pgsql/config/install-sh,v 1.8 2009/08/26 22:24:42 petere Exp $
 
-scriptversion=2005-02-02.21
+scriptversion=2009-08-26.20
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -41,44 +41,74 @@ scriptversion=2005-02-02.21
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
 
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
 
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-# Darwin normal strip removes symbols from shared libraries
-# that are later needed for dynamic linking, so use strip -x.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+# Darwin normal strip removes symbols from shared libraries that are
+# later needed for dynamic linking, so use strip -x.
 # http://archives.postgresql.org/pgsql-hackers/2007-10/msg01470.php
-if test `expr "\`uname -a\`" : 'Darwin'` -ne 0
-then	stripprog="${STRIPPROG-strip -x}"
-else	stripprog="${STRIPPROG-strip}"
-fi
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+case `uname -s` in
+  Darwin) stripprog="${STRIPPROG-strip -x}";;
+esac
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
 
-chmodcmd="$chmodprog 0755"
-chowncmd=
 chgrpcmd=
-stripcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
 rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
 src=
 dst=
 dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
 no_target_directory=
 
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    or: $0 [OPTION]... -d DIRECTORIES...
@@ -88,81 +118,86 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
 In the 4th, create DIRECTORIES.
 
 Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
 "
 
-while test -n "$1"; do
+while test $# -ne 0; do
   case $1 in
-    -c) shift
-        continue;;
+    -c) ;;
+
+    -C) copy_on_change=true;;
 
-    -d) dir_arg=true
-        shift
-        continue;;
+    -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
     --help) echo "$usage"; exit $?;;
 
-    -m) chmodcmd="$chmodprog $2"
-        shift
-        shift
-        continue;;
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
 
     -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
+    -s) stripcmd=$stripprog;;
 
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
+    -t) dst_arg=$2
+	shift;;
 
-    -T) no_target_directory=true
-	shift
-	continue;;
+    -T) no_target_directory=true;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
+    --)	shift
 	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
   esac
+  shift
 done
 
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+  done
+fi
+
+if test $# -eq 0; then
   if test -z "$dir_arg"; then
     echo "$0: no input file specified." >&2
     exit 1
@@ -172,24 +207,47 @@ if test -z "$1"; then
   exit 0
 fi
 
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
 for src
 do
   # Protect names starting with `-'.
   case $src in
-    -*) src=./$src ;;
+    -*) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
     dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
   else
+
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
     # if $src (and thus $dsttmp) contains '*'.
@@ -198,71 +256,199 @@ do
       exit 1
     fi
 
-    if test -z "$dstarg"; then
+    if test -z "$dst_arg"; then
       echo "$0: no destination specified." >&2
       exit 1
     fi
 
-    dst=$dstarg
+    dst=$dst_arg
     # Protect names starting with `-'.
     case $dst in
-      -*) dst=./$dst ;;
+      -*) dst=./$dst;;
     esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
       if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
+	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
       fi
-      dst=$dst/`basename "$src"`
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
     fi
   fi
 
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
 
-  # Make sure that the destination directory exists.
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
 
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
-	 '
-    IFS="${IFS-$defaultIFS}"
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
 
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
+      case $dstdir in
+	/*) prefix='/';;
+	-*) prefix='./';;
+	*)  prefix='';;
+      esac
 
-    pathcomp=
+      eval "$initialize_posix_glob"
 
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
       shift
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
-	# mkdir can fail with a `File exist' error in case several
-	# install-sh are creating the directory concurrently.  This
-	# is OK.
-	test -d "$pathcomp" || exit
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
       fi
-      pathcomp=$pathcomp/
-    done
+    fi
   fi
 
   if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
   else
-    dstfile=`basename "$dst"`
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
@@ -270,10 +456,9 @@ do
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
 
     # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -281,48 +466,59 @@ do
     # ignore errors from any of these, just make sure not to ignore
     # errors from the above "$doit $cpprog $src $dsttmp" command.
     #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-	 }
-    }
-  fi || { (exit 1); exit 1; }
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
 done
 
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
-
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
diff --git a/config/missing b/config/missing
index 16e31756f6..5426c6d2ec 100755
--- a/config/missing
+++ b/config/missing
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $PostgreSQL: pgsql/config/missing,v 1.5 2009/06/23 03:46:00 tgl Exp $
+# $PostgreSQL: pgsql/config/missing,v 1.7 2010/02/22 21:16:50 momjian Exp $
 
 # This is *not* the GNU `missing' script, although it is similar in
 # concept. You can call it from the makefiles to get consistent
diff --git a/config/mkinstalldirs b/config/mkinstalldirs
deleted file mode 100755
index 070b418022..0000000000
--- a/config/mkinstalldirs
+++ /dev/null
@@ -1,152 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-# $PostgreSQL: pgsql/config/mkinstalldirs,v 1.5 2006/03/11 04:38:28 momjian Exp $
-
-scriptversion=2005-02-02.21
-
-# Original author: Noah Friedman <[email protected]>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <[email protected]> or send patches to
-# <[email protected]>.
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <[email protected]>."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage"
-      exit $?
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --version)
-      echo "$0 $scriptversion"
-      exit $?
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error.  This is a problem when calling mkinstalldirs
-# from a parallel make.  We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
-  '')
-    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    else
-      # On NextStep and OpenStep, the `mkdir' command does not
-      # recognize any option.  It will interpret all options as
-      # directories to create, and then abort because `.' already
-      # exists.
-      test -d ./-p && rmdir ./-p
-      test -d ./--version && rmdir ./--version
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-       test ! -d ./--version; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    else
-      # Clean up after NextStep and OpenStep mkdir.
-      for d in ./-m ./-p ./--version "./$dirmode";
-      do
-        test -d $d && rmdir $d
-      done
-    fi
-    ;;
-esac
-
-for file
-do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-  shift
-
-  pathcomp=
-  for d
-  do
-    pathcomp="$pathcomp$d"
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-	errstatus=$lasterr
-      else
-	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-	  lasterr=""
-	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	  if test ! -z "$lasterr"; then
-	    errstatus=$lasterr
-	  fi
-	fi
-      fi
-    fi
-
-    pathcomp="$pathcomp/"
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/config/perl.m4 b/config/perl.m4
index 6ca8b524fa..165034b0fd 100644
--- a/config/perl.m4
+++ b/config/perl.m4
@@ -1,10 +1,35 @@
-# $PostgreSQL: pgsql/config/perl.m4,v 1.4 2008/11/12 00:00:05 adunstan Exp $
+# $PostgreSQL: pgsql/config/perl.m4,v 1.9 2010/02/23 18:35:06 tgl Exp $
 
 
 # PGAC_PATH_PERL
 # --------------
 AC_DEFUN([PGAC_PATH_PERL],
-[AC_PATH_PROG(PERL, perl)])
+[# Let the user override the search
+if test -z "$PERL"; then
+  AC_PATH_PROG(PERL, perl)
+fi
+
+if test "$PERL"; then
+  pgac_perl_version=`$PERL -v 2>/dev/null | sed -n ['s/This is perl.*v[a-z ]*\([0-9]\.[0-9][0-9.]*\).*$/\1/p']`
+  AC_MSG_NOTICE([using perl $pgac_perl_version])
+  if echo "$pgac_perl_version" | sed ['s/[.a-z_]/ /g'] | \
+    $AWK '{ if ([$]1 = 5 && [$]2 >= 8) exit 1; else exit 0;}'
+  then
+    AC_MSG_WARN([
+*** The installed version of Perl, $PERL, is too old to use with PostgreSQL.
+*** Perl version 5.8 or later is required, but this is $pgac_perl_version.])
+    PERL=""
+  fi
+fi
+
+if test -z "$PERL"; then
+  AC_MSG_WARN([
+*** Without Perl you will not be able to build PostgreSQL from CVS.
+*** You can obtain Perl from any CPAN mirror site.
+*** (If you are using the official distribution of PostgreSQL then you do not
+*** need to worry about this, because the Perl output is pre-generated.)])
+fi
+])# PGAC_PATH_PERL
 
 
 # PGAC_CHECK_PERL_CONFIG(NAME)
@@ -25,12 +50,16 @@ AC_DEFUN([PGAC_CHECK_PERL_CONFIGS],
 
 # PGAC_CHECK_PERL_EMBED_LDFLAGS
 # -----------------------------
+# We are after Embed's ldopts, but without the subset mentioned in
+# Config's ccdlflags; and also without any -arch flags, which recent
+# Apple releases put in unhelpfully.  (If you want a multiarch build
+# you'd better be specifying it in more places than plperl's final link.)
 AC_DEFUN([PGAC_CHECK_PERL_EMBED_LDFLAGS],
 [AC_REQUIRE([PGAC_PATH_PERL])
 AC_MSG_CHECKING(for flags to link embedded Perl)
 pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
 pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
-perl_embed_ldflags=`echo X"$pgac_tmp1" | sed "s/^X//;s%$pgac_tmp2%%"`
+perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]`
 AC_SUBST(perl_embed_ldflags)dnl
 if test -z "$perl_embed_ldflags" ; then
 	AC_MSG_RESULT(no)
diff --git a/config/programs.m4 b/config/programs.m4
index 589be5e310..594729cbb1 100644
--- a/config/programs.m4
+++ b/config/programs.m4
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/config/programs.m4,v 1.24 2008/08/29 13:02:32 petere Exp $
+# $PostgreSQL: pgsql/config/programs.m4,v 1.28 2010/02/22 21:16:50 momjian Exp $
 
 
 # PGAC_PATH_BISON
@@ -10,7 +10,7 @@
 AC_DEFUN([PGAC_PATH_BISON],
 [# Let the user override the search
 if test -z "$BISON"; then
-  AC_CHECK_PROGS(BISON, bison)
+  AC_PATH_PROGS(BISON, bison)
 fi
 
 if test "$BISON"; then
@@ -19,8 +19,8 @@ if test "$BISON"; then
   if echo "$pgac_bison_version" | $AWK '{ if ([$]4 < 1.875) exit 0; else exit 1;}'
   then
     AC_MSG_WARN([
-*** The installed version of Bison is too old to use with PostgreSQL.
-*** Bison version 1.875 or later is required.])
+*** The installed version of Bison, $BISON, is too old to use with PostgreSQL.
+*** Bison version 1.875 or later is required, but this is $pgac_bison_version.])
     BISON=""
   fi
 fi
@@ -42,8 +42,11 @@ AC_SUBST(BISONFLAGS)
 # PGAC_PATH_FLEX
 # --------------
 # Look for Flex, set the output variable FLEX to its path if found.
-# Avoid the buggy version 2.5.3. Also find Flex if its installed
-# under `lex', but do not accept other Lex programs.
+# Reject versions before 2.5.31, as we need a reasonably non-buggy reentrant
+# scanner.  (Note: the well-publicized security problem in 2.5.31 does not
+# affect Postgres, and there are still distros shipping patched 2.5.31,
+# so allow it.)  Also find Flex if its installed under `lex', but do not
+# accept other Lex programs.
 
 AC_DEFUN([PGAC_PATH_FLEX],
 [AC_CACHE_CHECK([for flex], pgac_cv_path_flex,
@@ -65,13 +68,16 @@ else
       then
         echo '%%'  > conftest.l
         if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null 2>&1; then
-          if $pgac_candidate --version | grep ' 2\.5\.3$' >/dev/null 2>&1; then
-            pgac_broken_flex=$pgac_candidate
-            continue
+          pgac_flex_version=`$pgac_candidate --version 2>/dev/null`
+          if echo "$pgac_flex_version" | sed ['s/[.a-z]/ /g'] | $AWK '{ if ([$]1 = 2 && [$]2 = 5 && [$]3 >= 31) exit 0; else exit 1;}'
+          then
+            pgac_cv_path_flex=$pgac_candidate
+            break 2
+          else
+            AC_MSG_WARN([
+*** The installed version of Flex, $pgac_candidate, is too old to use with PostgreSQL.
+*** Flex version 2.5.31 or later is required, but this is $pgac_flex_version.])
           fi
-
-          pgac_cv_path_flex=$pgac_candidate
-          break 2
         fi
       fi
     done
@@ -82,14 +88,8 @@ fi
 ])[]dnl AC_CACHE_CHECK
 
 if test x"$pgac_cv_path_flex" = x"no"; then
-  if test -n "$pgac_broken_flex"; then
-    AC_MSG_WARN([
-*** The Flex version 2.5.3 you have at $pgac_broken_flex contains a bug. You
-*** should get version 2.5.4 or later.])
-  fi
-
   AC_MSG_WARN([
-*** Without Flex you will not be able to build PostgreSQL from CVS or
+*** Without Flex you will not be able to build PostgreSQL from CVS nor
 *** change any of the scanner definition files.  You can obtain Flex from
 *** a GNU mirror site.  (If you are using the official distribution of
 *** PostgreSQL then you do not need to worry about this because the Flex
@@ -98,7 +98,7 @@ if test x"$pgac_cv_path_flex" = x"no"; then
   FLEX=
 else
   FLEX=$pgac_cv_path_flex
-  pgac_flex_version=`$FLEX -V 2>/dev/null`
+  pgac_flex_version=`$FLEX --version 2>/dev/null`
   AC_MSG_NOTICE([using $pgac_flex_version])
 fi
 
diff --git a/config/python.m4 b/config/python.m4
index 24805c4b6c..7b6a14ed21 100644
--- a/config/python.m4
+++ b/config/python.m4
@@ -1,7 +1,7 @@
 #
 # Autoconf macros for configuring the build of Python extension modules
 #
-# $PostgreSQL: pgsql/config/python.m4,v 1.15 2009/01/04 00:54:15 petere Exp $
+# $PostgreSQL: pgsql/config/python.m4,v 1.18 2010/03/17 22:02:44 petere Exp $
 #
 
 # PGAC_PATH_PYTHON
@@ -22,7 +22,7 @@ fi
 AC_DEFUN([_PGAC_CHECK_PYTHON_DIRS],
 [AC_REQUIRE([PGAC_PATH_PYTHON])
 AC_MSG_CHECKING([for Python distutils module])
-if "${PYTHON}" 2>&- -c 'import distutils'
+if "${PYTHON}" -c 'import distutils' 2>&AS_MESSAGE_LOG_FD
 then
     AC_MSG_RESULT(yes)
 else
@@ -30,10 +30,12 @@ else
     AC_MSG_ERROR([distutils module not found])
 fi
 AC_MSG_CHECKING([Python configuration directory])
+python_majorversion=`${PYTHON} -c "import sys; print(sys.version[[0]])"`
 python_version=`${PYTHON} -c "import sys; print(sys.version[[:3]])"`
 python_configdir=`${PYTHON} -c "from distutils.sysconfig import get_python_lib as f; import os; print(os.path.join(f(plat_specific=1,standard_lib=1),'config'))"`
 python_includespec=`${PYTHON} -c "import distutils.sysconfig; print('-I'+distutils.sysconfig.get_python_inc())"`
 
+AC_SUBST(python_majorversion)[]dnl
 AC_SUBST(python_version)[]dnl
 AC_SUBST(python_configdir)[]dnl
 AC_SUBST(python_includespec)[]dnl
@@ -70,7 +72,7 @@ else
 	python_libspec="-L${python_libdir} -lpython${python_version}"
 fi
 
-python_additional_libs=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','LOCALMODLIBS','BASEMODLIBS'))))"`
+python_additional_libs=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"`
 
 AC_MSG_RESULT([${python_libspec} ${python_additional_libs}])
 
diff --git a/configure b/configure
index 86f56b8ca9..57676d71ce 100755
--- a/configure
+++ b/configure
@@ -1,15 +1,15 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for PostgreSQL 8.4.0.
+# Generated by GNU Autoconf 2.63 for PostgreSQL 9.0beta3.
 #
 # Report bugs to <[email protected]>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# Copyright (c) 1996-2009, PostgreSQL Global Development Group
+# Copyright (c) 1996-2010, PostgreSQL Global Development Group
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -19,7 +19,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -42,17 +42,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -68,8 +96,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -92,7 +118,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -105,17 +131,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -137,7 +156,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -163,7 +182,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -245,7 +264,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -266,7 +285,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -346,10 +365,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -418,9 +437,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell [email protected] about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell [email protected] about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -456,7 +476,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -484,7 +504,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -497,19 +516,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -534,10 +556,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -577,8 +599,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='PostgreSQL'
 PACKAGE_TARNAME='postgresql'
-PACKAGE_VERSION='8.4.0'
-PACKAGE_STRING='PostgreSQL 8.4.0'
+PACKAGE_VERSION='9.0beta3'
+PACKAGE_STRING='PostgreSQL 9.0beta3'
 PACKAGE_BUGREPORT='[email protected]'
 
 ac_unique_file="src/backend/access/common/heaptuple.c"
@@ -619,164 +641,214 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-configure_args
-PG_MAJORVERSION
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
+ac_subst_vars='LTLIBOBJS
+vpath_build
+OSX
+XSLTPROC
+COLLATEINDEX
+DOCBOOKSTYLE
+have_docbook
+JADE
+NSGMLS
+TCL_SHLIB_LD_LIBS
+TCL_SHARED_BUILD
+TCL_LIB_SPEC
+TCL_LIBS
+TCL_LIB_FILE
+TCL_INCLUDE_SPEC
+TCL_CONFIG_SH
+TCLSH
+XGETTEXT
+MSGMERGE
+MSGFMT
+HAVE_POSIX_SIGNALS
+LDAP_LIBS_BE
+LDAP_LIBS_FE
+PTHREAD_CFLAGS
+PTHREAD_LIBS
+PTHREAD_CC
+acx_pthread_config
+HAVE_IPV6
+LIBOBJS
+OSSP_UUID_LIBS
+ZIC
+python_additional_libs
+python_libspec
+python_libdir
+python_includespec
+python_configdir
+python_version
+python_majorversion
+PYTHON
+perl_embed_ldflags
+perl_useshrplib
+perl_privlibexp
+perl_archlibexp
+PERL
+FLEXFLAGS
+FLEX
+BISONFLAGS
+BISON
+MKDIR_P
+AWK
+LN_S
+TAR
+WINDRES
+DLLWRAP
+DLLTOOL
+AR
+STRIP_SHARED_LIB
+STRIP_STATIC_LIB
+STRIP
+RANLIB
+ld_R_works
+with_gnu_ld
+LD
+LDFLAGS_SL
+LDFLAGS_EX
+ELF_SYS
+EGREP
+GREP
+with_zlib
+with_system_tzdata
+with_libxslt
+with_libxml
+XML2_CONFIG
+with_ossp_uuid
+with_openssl
+with_bonjour
+with_ldap
+with_pam
+krb_srvtab
+with_krb5
+with_gssapi
+with_python
+with_perl
+with_tcl
+enable_thread_safety
+INCLUDES
+autodepend
+TAS
+GCC
+CPP
+SUN_STUDIO_CC
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+enable_dtrace
+DTRACEFLAGS
+DTRACE
+enable_coverage
+GENHTML
+LCOV
+GCOV
+enable_profiling
+enable_debug
+enable_rpath
+enable_shared
+default_port
+WANTED_LANGUAGES
+enable_nls
 PORTNAME
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+PG_MAJORVERSION
+configure_args
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+with_template
+with_includes
+with_libraries
+with_libs
+enable_integer_datetimes
 enable_nls
-WANTED_LANGUAGES
-default_port
+with_pgport
 enable_shared
 enable_rpath
+enable_spinlocks
 enable_debug
 enable_profiling
-GCOV
-LCOV
-GENHTML
 enable_coverage
-DTRACE
-DTRACEFLAGS
 enable_dtrace
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-SUN_STUDIO_CC
-CPP
-GCC
-TAS
-autodepend
-INCLUDES
+with_blocksize
+with_segsize
+with_wal_blocksize
+with_wal_segsize
+with_CC
+enable_depend
+enable_cassert
 enable_thread_safety
 with_tcl
+with_tclconfig
 with_perl
 with_python
 with_gssapi
 with_krb5
-krb_srvtab
+with_krb_srvnam
 with_pam
 with_ldap
 with_bonjour
 with_openssl
+with_readline
+with_libedit_preferred
 with_ossp_uuid
-XML2_CONFIG
 with_libxml
 with_libxslt
 with_system_tzdata
 with_zlib
-GREP
-EGREP
-ELF_SYS
-LDFLAGS_SL
-LD
 with_gnu_ld
-ld_R_works
-RANLIB
-STRIP
-STRIP_STATIC_LIB
-STRIP_SHARED_LIB
-AR
-DLLTOOL
-DLLWRAP
-WINDRES
-TAR
-LN_S
-AWK
-BISON
-BISONFLAGS
-FLEX
-FLEXFLAGS
-PERL
-perl_archlibexp
-perl_privlibexp
-perl_useshrplib
-perl_embed_ldflags
-PYTHON
-python_version
-python_configdir
-python_includespec
-python_libdir
-python_libspec
-python_additional_libs
-ZIC
-OSSP_UUID_LIBS
-HAVE_IPV6
-LIBOBJS
-acx_pthread_config
-PTHREAD_CC
-PTHREAD_LIBS
-PTHREAD_CFLAGS
-LDAP_LIBS_FE
-LDAP_LIBS_BE
-HAVE_POSIX_SIGNALS
-MSGFMT
-MSGMERGE
-XGETTEXT
-TCLSH
-TCL_CONFIG_SH
-TCL_INCLUDE_SPEC
-TCL_LIB_FILE
-TCL_LIBS
-TCL_LIB_SPEC
-TCL_SHARED_BUILD
-TCL_SHLIB_LD_LIBS
-NSGMLS
-JADE
-have_docbook
-DOCBOOKSTYLE
-COLLATEINDEX
-SGMLSPL
-DOCBOOK2MAN
-vpath_build
-LTLIBOBJS'
-ac_subst_files=''
+enable_largefile
+enable_float4_byval
+enable_float8_byval
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -786,6 +858,7 @@ LDFLAGS
 LIBS
 CPPFLAGS
 CPP
+LDFLAGS_EX
 LDFLAGS_SL
 DOCBOOKSTYLE'
 
@@ -793,6 +866,8 @@ DOCBOOKSTYLE'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -891,13 +966,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -910,13 +993,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1107,22 +1198,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1142,7 +1249,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1151,16 +1258,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1169,22 +1276,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1199,7 +1322,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1215,10 +1338,10 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1226,12 +1349,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1258,12 +1381,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1290,7 +1413,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures PostgreSQL 8.4.0 to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 9.0beta3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1312,9 +1435,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1324,25 +1447,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/postgresql]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/postgresql]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1355,11 +1478,12 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PostgreSQL 8.4.0:";;
+     short | recursive ) echo "Configuration of PostgreSQL 9.0beta3:";;
    esac
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-integer-datetimes
@@ -1376,12 +1500,10 @@ Optional Features:
   --enable-dtrace         build with DTrace support
   --enable-depend         turn on automatic dependency tracking
   --enable-cassert        enable assertion checks (for debugging)
-  --enable-thread-safety  make client libraries thread-safe
-  --enable-thread-safety-force
-                          force thread-safety despite thread test failure
+  --disable-thread-safety disable thread-safety in client libraries
+  --disable-largefile     omit support for large files
   --disable-float4-byval  disable float4 passed by value
   --disable-float8-byval  disable float8 passed by value
-  --disable-largefile     omit support for large files
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1432,7 +1554,8 @@ Some influential environment variables:
   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
-  LDFLAGS_SL  linker flags for shared library linking
+  LDFLAGS_EX  extra linker flags for linking executables only
+  LDFLAGS_SL  extra linker flags for linking shared libraries only
   DOCBOOKSTYLE
               location of DocBook stylesheets
 
@@ -1447,15 +1570,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1491,7 +1616,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1500,15 +1625,15 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PostgreSQL configure 8.4.0
-generated by GNU Autoconf 2.61
+PostgreSQL configure 9.0beta3
+generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-Copyright (c) 1996-2009, PostgreSQL Global Development Group
+Copyright (c) 1996-2010, PostgreSQL Global Development Group
 _ACEOF
   exit
 fi
@@ -1516,8 +1641,8 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by PostgreSQL $as_me 8.4.0, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+It was created by PostgreSQL $as_me 9.0beta3, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
 
@@ -1553,7 +1678,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1588,7 +1713,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1640,11 +1765,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1674,9 +1800,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1691,9 +1817,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1709,8 +1835,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1752,21 +1878,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1776,16 +1905,16 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1799,29 +1928,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1831,10 +1969,12 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1890,8 +2030,8 @@ for ac_dir in config "$srcdir"/config; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1923,34 +2063,34 @@ _ACEOF
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
 if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
@@ -1967,27 +2107,27 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
 if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
@@ -2006,11 +2146,10 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 template=
-{ echo "$as_me:$LINENO: checking which template to use" >&5
-echo $ECHO_N "checking which template to use... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking which template to use" >&5
+$as_echo_n "checking which template to use... " >&6; }
 
 
-pgac_args="$pgac_args with_template"
 
 
 # Check whether --with-template was given.
@@ -2018,13 +2157,13 @@ if test "${with_template+set}" = set; then
   withval=$with_template;
   case $withval in
     yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-template option" >&5
-echo "$as_me: error: argument required for --with-template option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-template option" >&5
+$as_echo "$as_me: error: argument required for --with-template option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-template option" >&5
-echo "$as_me: error: argument required for --with-template option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-template option" >&5
+$as_echo "$as_me: error: argument required for --with-template option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     *)
@@ -2034,8 +2173,8 @@ echo "$as_me: error: argument required for --with-template option" >&2;}
     *)      if test -f "$srcdir/src/template/$with_template" ; then
               template=$withval
             else
-              { { echo "$as_me:$LINENO: error: '$withval' is not a valid template name. Use 'list' for a list." >&5
-echo "$as_me: error: '$withval' is not a valid template name. Use 'list' for a list." >&2;}
+              { { $as_echo "$as_me:$LINENO: error: '$withval' is not a valid template name. Use 'list' for a list." >&5
+$as_echo "$as_me: error: '$withval' is not a valid template name. Use 'list' for a list." >&2;}
    { (exit 1); exit 1; }; }
             fi;;
   esac
@@ -2076,7 +2215,7 @@ nextstep*) template=nextstep ;;
 esac
 
   if test x"$template" = x"" ; then
-    { { echo "$as_me:$LINENO: error:
+    { { $as_echo "$as_me:$LINENO: error:
 *******************************************************************
 PostgreSQL has apparently not been ported to your platform yet.
 To try a manual configuration, look into the src/template directory
@@ -2087,7 +2226,7 @@ rectifying this.  Include the above 'checking host system type...'
 line.
 *******************************************************************
 " >&5
-echo "$as_me: error:
+$as_echo "$as_me: error:
 *******************************************************************
 PostgreSQL has apparently not been ported to your platform yet.
 To try a manual configuration, look into the src/template directory
@@ -2106,8 +2245,8 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: result: $template" >&5
-echo "${ECHO_T}$template" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $template" >&5
+$as_echo "$template" >&6; }
 
 PORTNAME=$template
 
@@ -2128,7 +2267,6 @@ tas_file=dummy.s
 # Add non-standard directories to the include path
 #
 
-pgac_args="$pgac_args with_includes"
 
 
 # Check whether --with-includes was given.
@@ -2136,13 +2274,13 @@ if test "${with_includes+set}" = set; then
   withval=$with_includes;
   case $withval in
     yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-includes option" >&5
-echo "$as_me: error: argument required for --with-includes option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-includes option" >&5
+$as_echo "$as_me: error: argument required for --with-includes option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-includes option" >&5
-echo "$as_me: error: argument required for --with-includes option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-includes option" >&5
+$as_echo "$as_me: error: argument required for --with-includes option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     *)
@@ -2159,7 +2297,6 @@ fi
 # Add non-standard directories to the library search path
 #
 
-pgac_args="$pgac_args with_libraries"
 
 
 # Check whether --with-libraries was given.
@@ -2167,13 +2304,13 @@ if test "${with_libraries+set}" = set; then
   withval=$with_libraries;
   case $withval in
     yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-libraries option" >&5
-echo "$as_me: error: argument required for --with-libraries option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-libraries option" >&5
+$as_echo "$as_me: error: argument required for --with-libraries option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-libraries option" >&5
-echo "$as_me: error: argument required for --with-libraries option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-libraries option" >&5
+$as_echo "$as_me: error: argument required for --with-libraries option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     *)
@@ -2186,7 +2323,6 @@ fi
 
 
 
-pgac_args="$pgac_args with_libs"
 
 
 # Check whether --with-libs was given.
@@ -2194,13 +2330,13 @@ if test "${with_libs+set}" = set; then
   withval=$with_libs;
   case $withval in
     yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-libs option" >&5
-echo "$as_me: error: argument required for --with-libs option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-libs option" >&5
+$as_echo "$as_me: error: argument required for --with-libs option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-libs option" >&5
-echo "$as_me: error: argument required for --with-libs option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-libs option" >&5
+$as_echo "$as_me: error: argument required for --with-libs option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     *)
@@ -2216,10 +2352,9 @@ fi
 #
 # 64-bit integer date/time storage: enabled by default.
 #
-{ echo "$as_me:$LINENO: checking whether to build with 64-bit integer date/time support" >&5
-echo $ECHO_N "checking whether to build with 64-bit integer date/time support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build with 64-bit integer date/time support" >&5
+$as_echo_n "checking whether to build with 64-bit integer date/time support... " >&6; }
 
-pgac_args="$pgac_args enable_integer_datetimes"
 
 # Check whether --enable-integer-datetimes was given.
 if test "${enable_integer_datetimes+set}" = set; then
@@ -2236,8 +2371,8 @@ _ACEOF
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-integer-datetimes option" >&5
-echo "$as_me: error: no argument expected for --enable-integer-datetimes option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --enable-integer-datetimes option" >&5
+$as_echo "$as_me: error: no argument expected for --enable-integer-datetimes option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -2252,17 +2387,16 @@ _ACEOF
 fi
 
 
-{ echo "$as_me:$LINENO: result: $enable_integer_datetimes" >&5
-echo "${ECHO_T}$enable_integer_datetimes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_integer_datetimes" >&5
+$as_echo "$enable_integer_datetimes" >&6; }
 
 
 #
 # NLS
 #
-{ echo "$as_me:$LINENO: checking whether NLS is wanted" >&5
-echo $ECHO_N "checking whether NLS is wanted... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether NLS is wanted" >&5
+$as_echo_n "checking whether NLS is wanted... " >&6; }
 
-pgac_args="$pgac_args enable_nls"
 
 # Check whether --enable-nls was given.
 if test "${enable_nls+set}" = set; then
@@ -2294,18 +2428,17 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: result: $enable_nls" >&5
-echo "${ECHO_T}$enable_nls" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_nls" >&5
+$as_echo "$enable_nls" >&6; }
 
 
 
 #
 # Default port number (--with-pgport), default 5432
 #
-{ echo "$as_me:$LINENO: checking for default port number" >&5
-echo $ECHO_N "checking for default port number... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for default port number" >&5
+$as_echo_n "checking for default port number... " >&6; }
 
-pgac_args="$pgac_args with_pgport"
 
 
 # Check whether --with-pgport was given.
@@ -2313,13 +2446,13 @@ if test "${with_pgport+set}" = set; then
   withval=$with_pgport;
   case $withval in
     yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-pgport option" >&5
-echo "$as_me: error: argument required for --with-pgport option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-pgport option" >&5
+$as_echo "$as_me: error: argument required for --with-pgport option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-pgport option" >&5
-echo "$as_me: error: argument required for --with-pgport option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-pgport option" >&5
+$as_echo "$as_me: error: argument required for --with-pgport option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     *)
@@ -2332,8 +2465,8 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: result: $default_port" >&5
-echo "${ECHO_T}$default_port" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $default_port" >&5
+$as_echo "$default_port" >&6; }
 # Need both of these because some places want an integer and some a string
 
 cat >>confdefs.h <<_ACEOF
@@ -2351,7 +2484,6 @@ _ACEOF
 # Option to disable shared libraries
 #
 
-pgac_args="$pgac_args enable_shared"
 
 # Check whether --enable-shared was given.
 if test "${enable_shared+set}" = set; then
@@ -2364,8 +2496,8 @@ if test "${enable_shared+set}" = set; then
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-shared option" >&5
-echo "$as_me: error: no argument expected for --enable-shared option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --enable-shared option" >&5
+$as_echo "$as_me: error: no argument expected for --enable-shared option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -2382,7 +2514,6 @@ fi
 # '-rpath'-like feature can be disabled
 #
 
-pgac_args="$pgac_args enable_rpath"
 
 # Check whether --enable-rpath was given.
 if test "${enable_rpath+set}" = set; then
@@ -2395,8 +2526,8 @@ if test "${enable_rpath+set}" = set; then
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-rpath option" >&5
-echo "$as_me: error: no argument expected for --enable-rpath option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --enable-rpath option" >&5
+$as_echo "$as_me: error: no argument expected for --enable-rpath option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -2413,7 +2544,6 @@ fi
 # Spinlocks
 #
 
-pgac_args="$pgac_args enable_spinlocks"
 
 # Check whether --enable-spinlocks was given.
 if test "${enable_spinlocks+set}" = set; then
@@ -2426,8 +2556,8 @@ if test "${enable_spinlocks+set}" = set; then
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-spinlocks option" >&5
-echo "$as_me: error: no argument expected for --enable-spinlocks option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --enable-spinlocks option" >&5
+$as_echo "$as_me: error: no argument expected for --enable-spinlocks option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -2443,7 +2573,6 @@ fi
 # --enable-debug adds -g to compiler flags
 #
 
-pgac_args="$pgac_args enable_debug"
 
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then
@@ -2456,8 +2585,8 @@ if test "${enable_debug+set}" = set; then
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-debug option" >&5
-echo "$as_me: error: no argument expected for --enable-debug option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --enable-debug option" >&5
+$as_echo "$as_me: error: no argument expected for --enable-debug option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -2474,7 +2603,6 @@ fi
 # --enable-profiling enables gcc profiling
 #
 
-pgac_args="$pgac_args enable_profiling"
 
 # Check whether --enable-profiling was given.
 if test "${enable_profiling+set}" = set; then
@@ -2487,8 +2615,8 @@ if test "${enable_profiling+set}" = set; then
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-profiling option" >&5
-echo "$as_me: error: no argument expected for --enable-profiling option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --enable-profiling option" >&5
+$as_echo "$as_me: error: no argument expected for --enable-profiling option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -2505,7 +2633,6 @@ fi
 # --enable-coverage enables generation of code coverage metrics with gcov
 #
 
-pgac_args="$pgac_args enable_coverage"
 
 # Check whether --enable-coverage was given.
 if test "${enable_coverage+set}" = set; then
@@ -2516,10 +2643,10 @@ if test "${enable_coverage+set}" = set; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_GCOV+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$GCOV"; then
   ac_cv_prog_GCOV="$GCOV" # Let the user override the test.
@@ -2532,7 +2659,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_GCOV="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2543,11 +2670,11 @@ fi
 fi
 GCOV=$ac_cv_prog_GCOV
 if test -n "$GCOV"; then
-  { echo "$as_me:$LINENO: result: $GCOV" >&5
-echo "${ECHO_T}$GCOV" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $GCOV" >&5
+$as_echo "$GCOV" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2555,18 +2682,18 @@ fi
 done
 
 if test -z "$GCOV"; then
-  { { echo "$as_me:$LINENO: error: gcov not found" >&5
-echo "$as_me: error: gcov not found" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: gcov not found" >&5
+$as_echo "$as_me: error: gcov not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 for ac_prog in lcov
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_LCOV+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$LCOV"; then
   ac_cv_prog_LCOV="$LCOV" # Let the user override the test.
@@ -2579,7 +2706,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LCOV="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2590,11 +2717,11 @@ fi
 fi
 LCOV=$ac_cv_prog_LCOV
 if test -n "$LCOV"; then
-  { echo "$as_me:$LINENO: result: $LCOV" >&5
-echo "${ECHO_T}$LCOV" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LCOV" >&5
+$as_echo "$LCOV" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2602,18 +2729,18 @@ fi
 done
 
 if test -z "$LCOV"; then
-  { { echo "$as_me:$LINENO: error: lcov not found" >&5
-echo "$as_me: error: lcov not found" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: lcov not found" >&5
+$as_echo "$as_me: error: lcov not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 for ac_prog in genhtml
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_GENHTML+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$GENHTML"; then
   ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test.
@@ -2626,7 +2753,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_GENHTML="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2637,11 +2764,11 @@ fi
 fi
 GENHTML=$ac_cv_prog_GENHTML
 if test -n "$GENHTML"; then
-  { echo "$as_me:$LINENO: result: $GENHTML" >&5
-echo "${ECHO_T}$GENHTML" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $GENHTML" >&5
+$as_echo "$GENHTML" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2649,8 +2776,8 @@ fi
 done
 
 if test -z "$GENHTML"; then
-  { { echo "$as_me:$LINENO: error: genhtml not found" >&5
-echo "$as_me: error: genhtml not found" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: genhtml not found" >&5
+$as_echo "$as_me: error: genhtml not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
       ;;
@@ -2658,8 +2785,8 @@ fi
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-coverage option" >&5
-echo "$as_me: error: no argument expected for --enable-coverage option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --enable-coverage option" >&5
+$as_echo "$as_me: error: no argument expected for --enable-coverage option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -2676,7 +2803,6 @@ fi
 # DTrace
 #
 
-pgac_args="$pgac_args enable_dtrace"
 
 # Check whether --enable-dtrace was given.
 if test "${enable_dtrace+set}" = set; then
@@ -2692,10 +2818,10 @@ for ac_prog in dtrace
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_DTRACE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$DTRACE"; then
   ac_cv_prog_DTRACE="$DTRACE" # Let the user override the test.
@@ -2708,7 +2834,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DTRACE="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2719,11 +2845,11 @@ fi
 fi
 DTRACE=$ac_cv_prog_DTRACE
 if test -n "$DTRACE"; then
-  { echo "$as_me:$LINENO: result: $DTRACE" >&5
-echo "${ECHO_T}$DTRACE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $DTRACE" >&5
+$as_echo "$DTRACE" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2731,8 +2857,8 @@ fi
 done
 
 if test -z "$DTRACE"; then
-  { { echo "$as_me:$LINENO: error: dtrace not found" >&5
-echo "$as_me: error: dtrace not found" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: dtrace not found" >&5
+$as_echo "$as_me: error: dtrace not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2741,8 +2867,8 @@ fi
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-dtrace option" >&5
-echo "$as_me: error: no argument expected for --enable-dtrace option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --enable-dtrace option" >&5
+$as_echo "$as_me: error: no argument expected for --enable-dtrace option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -2758,10 +2884,9 @@ fi
 #
 # Block size
 #
-{ echo "$as_me:$LINENO: checking for block size" >&5
-echo $ECHO_N "checking for block size... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for block size" >&5
+$as_echo_n "checking for block size... " >&6; }
 
-pgac_args="$pgac_args with_blocksize"
 
 
 # Check whether --with-blocksize was given.
@@ -2769,13 +2894,13 @@ if test "${with_blocksize+set}" = set; then
   withval=$with_blocksize;
   case $withval in
     yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-blocksize option" >&5
-echo "$as_me: error: argument required for --with-blocksize option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-blocksize option" >&5
+$as_echo "$as_me: error: argument required for --with-blocksize option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-blocksize option" >&5
-echo "$as_me: error: argument required for --with-blocksize option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-blocksize option" >&5
+$as_echo "$as_me: error: argument required for --with-blocksize option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     *)
@@ -2795,12 +2920,12 @@ case ${blocksize} in
   8) BLCKSZ=8192;;
  16) BLCKSZ=16384;;
  32) BLCKSZ=32768;;
-  *) { { echo "$as_me:$LINENO: error: Invalid block size. Allowed values are 1,2,4,8,16,32." >&5
-echo "$as_me: error: Invalid block size. Allowed values are 1,2,4,8,16,32." >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: Invalid block size. Allowed values are 1,2,4,8,16,32." >&5
+$as_echo "$as_me: error: Invalid block size. Allowed values are 1,2,4,8,16,32." >&2;}
    { (exit 1); exit 1; }; }
 esac
-{ echo "$as_me:$LINENO: result: ${blocksize}kB" >&5
-echo "${ECHO_T}${blocksize}kB" >&6; }
+{ $as_echo "$as_me:$LINENO: result: ${blocksize}kB" >&5
+$as_echo "${blocksize}kB" >&6; }
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2811,10 +2936,9 @@ _ACEOF
 #
 # Relation segment size
 #
-{ echo "$as_me:$LINENO: checking for segment size" >&5
-echo $ECHO_N "checking for segment size... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for segment size" >&5
+$as_echo_n "checking for segment size... " >&6; }
 
-pgac_args="$pgac_args with_segsize"
 
 
 # Check whether --with-segsize was given.
@@ -2822,13 +2946,13 @@ if test "${with_segsize+set}" = set; then
   withval=$with_segsize;
   case $withval in
     yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-segsize option" >&5
-echo "$as_me: error: argument required for --with-segsize option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-segsize option" >&5
+$as_echo "$as_me: error: argument required for --with-segsize option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-segsize option" >&5
-echo "$as_me: error: argument required for --with-segsize option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-segsize option" >&5
+$as_echo "$as_me: error: argument required for --with-segsize option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     *)
@@ -2845,8 +2969,8 @@ fi
 # blocksize is already guaranteed to be a factor of 1024
 RELSEG_SIZE=`expr '(' 1024 / ${blocksize} ')' '*' ${segsize} '*' 1024`
 test $? -eq 0 || exit 1
-{ echo "$as_me:$LINENO: result: ${segsize}GB" >&5
-echo "${ECHO_T}${segsize}GB" >&6; }
+{ $as_echo "$as_me:$LINENO: result: ${segsize}GB" >&5
+$as_echo "${segsize}GB" >&6; }
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2857,10 +2981,9 @@ _ACEOF
 #
 # WAL block size
 #
-{ echo "$as_me:$LINENO: checking for WAL block size" >&5
-echo $ECHO_N "checking for WAL block size... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for WAL block size" >&5
+$as_echo_n "checking for WAL block size... " >&6; }
 
-pgac_args="$pgac_args with_wal_blocksize"
 
 
 # Check whether --with-wal-blocksize was given.
@@ -2868,13 +2991,13 @@ if test "${with_wal_blocksize+set}" = set; then
   withval=$with_wal_blocksize;
   case $withval in
     yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-wal-blocksize option" >&5
-echo "$as_me: error: argument required for --with-wal-blocksize option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-wal-blocksize option" >&5
+$as_echo "$as_me: error: argument required for --with-wal-blocksize option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-wal-blocksize option" >&5
-echo "$as_me: error: argument required for --with-wal-blocksize option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-wal-blocksize option" >&5
+$as_echo "$as_me: error: argument required for --with-wal-blocksize option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     *)
@@ -2895,12 +3018,12 @@ case ${wal_blocksize} in
  16) XLOG_BLCKSZ=16384;;
  32) XLOG_BLCKSZ=32768;;
  64) XLOG_BLCKSZ=65536;;
-  *) { { echo "$as_me:$LINENO: error: Invalid WAL block size. Allowed values are 1,2,4,8,16,32,64." >&5
-echo "$as_me: error: Invalid WAL block size. Allowed values are 1,2,4,8,16,32,64." >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: Invalid WAL block size. Allowed values are 1,2,4,8,16,32,64." >&5
+$as_echo "$as_me: error: Invalid WAL block size. Allowed values are 1,2,4,8,16,32,64." >&2;}
    { (exit 1); exit 1; }; }
 esac
-{ echo "$as_me:$LINENO: result: ${wal_blocksize}kB" >&5
-echo "${ECHO_T}${wal_blocksize}kB" >&6; }
+{ $as_echo "$as_me:$LINENO: result: ${wal_blocksize}kB" >&5
+$as_echo "${wal_blocksize}kB" >&6; }
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2911,10 +3034,9 @@ _ACEOF
 #
 # WAL segment size
 #
-{ echo "$as_me:$LINENO: checking for WAL segment size" >&5
-echo $ECHO_N "checking for WAL segment size... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for WAL segment size" >&5
+$as_echo_n "checking for WAL segment size... " >&6; }
 
-pgac_args="$pgac_args with_wal_segsize"
 
 
 # Check whether --with-wal-segsize was given.
@@ -2922,13 +3044,13 @@ if test "${with_wal_segsize+set}" = set; then
   withval=$with_wal_segsize;
   case $withval in
     yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-wal-segsize option" >&5
-echo "$as_me: error: argument required for --with-wal-segsize option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-wal-segsize option" >&5
+$as_echo "$as_me: error: argument required for --with-wal-segsize option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-wal-segsize option" >&5
-echo "$as_me: error: argument required for --with-wal-segsize option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-wal-segsize option" >&5
+$as_echo "$as_me: error: argument required for --with-wal-segsize option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     *)
@@ -2949,12 +3071,12 @@ case ${wal_segsize} in
  16) ;;
  32) ;;
  64) ;;
-  *) { { echo "$as_me:$LINENO: error: Invalid WAL segment size. Allowed values are 1,2,4,8,16,32,64." >&5
-echo "$as_me: error: Invalid WAL segment size. Allowed values are 1,2,4,8,16,32,64." >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: Invalid WAL segment size. Allowed values are 1,2,4,8,16,32,64." >&5
+$as_echo "$as_me: error: Invalid WAL segment size. Allowed values are 1,2,4,8,16,32,64." >&2;}
    { (exit 1); exit 1; }; }
 esac
-{ echo "$as_me:$LINENO: result: ${wal_segsize}MB" >&5
-echo "${ECHO_T}${wal_segsize}MB" >&6; }
+{ $as_echo "$as_me:$LINENO: result: ${wal_segsize}MB" >&5
+$as_echo "${wal_segsize}MB" >&6; }
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2970,7 +3092,6 @@ _ACEOF
 # to use, although the standard way to do this is to set the CC environment
 # variable.
 
-pgac_args="$pgac_args with_CC"
 
 
 # Check whether --with-CC was given.
@@ -2978,13 +3099,13 @@ if test "${with_CC+set}" = set; then
   withval=$with_CC;
   case $withval in
     yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-CC option" >&5
-echo "$as_me: error: argument required for --with-CC option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-CC option" >&5
+$as_echo "$as_me: error: argument required for --with-CC option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-CC option" >&5
-echo "$as_me: error: argument required for --with-CC option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-CC option" >&5
+$as_echo "$as_me: error: argument required for --with-CC option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     *)
@@ -3012,10 +3133,10 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3028,7 +3149,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3039,11 +3160,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3056,10 +3177,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -3072,7 +3193,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3083,11 +3204,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3099,12 +3220,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [email protected]." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [email protected]." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3112,44 +3229,50 @@ esac
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -3168,27 +3291,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -3199,10 +3317,11 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -3213,7 +3332,7 @@ for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -3240,25 +3359,27 @@ else
   ac_file=''
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -3267,49 +3388,53 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -3318,31 +3443,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3365,40 +3492,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3424,20 +3554,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -3447,15 +3578,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -3482,20 +3617,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -3520,20 +3656,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -3559,20 +3696,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3587,8 +3725,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3604,10 +3742,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -3678,20 +3816,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3707,15 +3846,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -3753,20 +3892,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ICC=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ICC=no
@@ -3799,20 +3939,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   SUN_STUDIO_CC=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	SUN_STUDIO_CC=no
@@ -3859,8 +4000,8 @@ fi
 if test "$GCC" = yes -a "$ICC" = no; then
   CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith"
   # These work in some but not all gcc versions
-  { echo "$as_me:$LINENO: checking if $CC supports -Wdeclaration-after-statement" >&5
-echo $ECHO_N "checking if $CC supports -Wdeclaration-after-statement... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if $CC supports -Wdeclaration-after-statement" >&5
+$as_echo_n "checking if $CC supports -Wdeclaration-after-statement... " >&6; }
 pgac_save_CFLAGS=$CFLAGS
 CFLAGS="$pgac_save_CFLAGS -Wdeclaration-after-statement"
 cat >conftest.$ac_ext <<_ACEOF
@@ -3884,32 +4025,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS="$pgac_save_CFLAGS"
-                    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-  { echo "$as_me:$LINENO: checking if $CC supports -Wendif-labels" >&5
-echo $ECHO_N "checking if $CC supports -Wendif-labels... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if $CC supports -Wendif-labels" >&5
+$as_echo_n "checking if $CC supports -Wendif-labels... " >&6; }
 pgac_save_CFLAGS=$CFLAGS
 CFLAGS="$pgac_save_CFLAGS -Wendif-labels"
 cat >conftest.$ac_ext <<_ACEOF
@@ -3933,33 +4075,34 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS="$pgac_save_CFLAGS"
-                    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
   # Disable strict-aliasing rules; needed for gcc 3.3+
-  { echo "$as_me:$LINENO: checking if $CC supports -fno-strict-aliasing" >&5
-echo $ECHO_N "checking if $CC supports -fno-strict-aliasing... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if $CC supports -fno-strict-aliasing" >&5
+$as_echo_n "checking if $CC supports -fno-strict-aliasing... " >&6; }
 pgac_save_CFLAGS=$CFLAGS
 CFLAGS="$pgac_save_CFLAGS -fno-strict-aliasing"
 cat >conftest.$ac_ext <<_ACEOF
@@ -3983,33 +4126,34 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS="$pgac_save_CFLAGS"
-                    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
   # Disable optimizations that assume no overflow; needed for gcc 4.3+
-  { echo "$as_me:$LINENO: checking if $CC supports -fwrapv" >&5
-echo $ECHO_N "checking if $CC supports -fwrapv... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if $CC supports -fwrapv" >&5
+$as_echo_n "checking if $CC supports -fwrapv... " >&6; }
 pgac_save_CFLAGS=$CFLAGS
 CFLAGS="$pgac_save_CFLAGS -fwrapv"
 cat >conftest.$ac_ext <<_ACEOF
@@ -4033,26 +4177,27 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS="$pgac_save_CFLAGS"
-                    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -4060,8 +4205,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 elif test "$ICC" = yes; then
   # Intel's compiler has a bug/misoptimization in checking for
   # division by NAN (NaN == 0), -mp1 fixes it, so add it to the CFLAGS.
-  { echo "$as_me:$LINENO: checking if $CC supports -mp1" >&5
-echo $ECHO_N "checking if $CC supports -mp1... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if $CC supports -mp1" >&5
+$as_echo_n "checking if $CC supports -mp1... " >&6; }
 pgac_save_CFLAGS=$CFLAGS
 CFLAGS="$pgac_save_CFLAGS -mp1"
 cat >conftest.$ac_ext <<_ACEOF
@@ -4085,33 +4230,34 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS="$pgac_save_CFLAGS"
-                    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
   # Make sure strict aliasing is off (though this is said to be the default)
-  { echo "$as_me:$LINENO: checking if $CC supports -fno-strict-aliasing" >&5
-echo $ECHO_N "checking if $CC supports -fno-strict-aliasing... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if $CC supports -fno-strict-aliasing" >&5
+$as_echo_n "checking if $CC supports -fno-strict-aliasing... " >&6; }
 pgac_save_CFLAGS=$CFLAGS
 CFLAGS="$pgac_save_CFLAGS -fno-strict-aliasing"
 cat >conftest.$ac_ext <<_ACEOF
@@ -4135,34 +4281,35 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS="$pgac_save_CFLAGS"
-                    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 elif test "$PORTNAME" = "aix"; then
   # AIX's xlc has to have strict aliasing turned off too
-  { echo "$as_me:$LINENO: checking if $CC supports -qnoansialias" >&5
-echo $ECHO_N "checking if $CC supports -qnoansialias... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if $CC supports -qnoansialias" >&5
+$as_echo_n "checking if $CC supports -qnoansialias... " >&6; }
 pgac_save_CFLAGS=$CFLAGS
 CFLAGS="$pgac_save_CFLAGS -qnoansialias"
 cat >conftest.$ac_ext <<_ACEOF
@@ -4186,26 +4333,27 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS="$pgac_save_CFLAGS"
-                    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -4222,8 +4370,8 @@ if test "$enable_coverage" = yes; then
   if test "$GCC" = yes; then
     CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
   else
-    { { echo "$as_me:$LINENO: error: --enable-coverage is supported only when using GCC" >&5
-echo "$as_me: error: --enable-coverage is supported only when using GCC" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: --enable-coverage is supported only when using GCC" >&5
+$as_echo "$as_me: error: --enable-coverage is supported only when using GCC" >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -4238,8 +4386,8 @@ _ACEOF
 
     CFLAGS="$CFLAGS -pg $PLATFORM_PROFILE_FLAGS"
   else
-    { { echo "$as_me:$LINENO: error: --enable-profiling is supported only when using GCC" >&5
-echo "$as_me: error: --enable-profiling is supported only when using GCC" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: --enable-profiling is supported only when using GCC" >&5
+$as_echo "$as_me: error: --enable-profiling is supported only when using GCC" >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -4250,8 +4398,8 @@ if test "$PORTNAME" = "win32"; then
 fi
 
 # Check if the compiler still works with the template settings
-{ echo "$as_me:$LINENO: checking whether the C compiler still works" >&5
-echo $ECHO_N "checking whether the C compiler still works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler still works" >&5
+$as_echo_n "checking whether the C compiler still works... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4273,31 +4421,35 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-   { { echo "$as_me:$LINENO: error: cannot proceed" >&5
-echo "$as_me: error: cannot proceed" >&2;}
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+   { { $as_echo "$as_me:$LINENO: error: cannot proceed" >&5
+$as_echo "$as_me: error: cannot proceed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
@@ -4326,24 +4478,25 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	{ { echo "$as_me:$LINENO: error: do not put -ffast-math in CFLAGS" >&5
-echo "$as_me: error: do not put -ffast-math in CFLAGS" >&2;}
+	{ { $as_echo "$as_me:$LINENO: error: do not put -ffast-math in CFLAGS" >&5
+$as_echo "$as_me: error: do not put -ffast-math in CFLAGS" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -4355,15 +4508,15 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -4395,20 +4548,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4432,13 +4586,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4446,7 +4601,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4471,8 +4626,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -4500,20 +4655,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4537,13 +4693,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4551,7 +4708,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4567,11 +4724,13 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=c
@@ -4602,7 +4761,6 @@ fi
 # Automatic dependency tracking
 #
 
-pgac_args="$pgac_args enable_depend"
 
 # Check whether --enable-depend was given.
 if test "${enable_depend+set}" = set; then
@@ -4615,8 +4773,8 @@ if test "${enable_depend+set}" = set; then
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-depend option" >&5
-echo "$as_me: error: no argument expected for --enable-depend option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --enable-depend option" >&5
+$as_echo "$as_me: error: no argument expected for --enable-depend option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -4634,7 +4792,6 @@ fi
 # Enable assert checks
 #
 
-pgac_args="$pgac_args enable_cassert"
 
 # Check whether --enable-cassert was given.
 if test "${enable_cassert+set}" = set; then
@@ -4651,8 +4808,8 @@ _ACEOF
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-cassert option" >&5
-echo "$as_me: error: no argument expected for --enable-cassert option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --enable-cassert option" >&5
+$as_echo "$as_me: error: no argument expected for --enable-cassert option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -4675,8 +4832,8 @@ for dir in $with_includes $SRCH_INC; do
   if test -d "$dir"; then
     INCLUDES="$INCLUDES -I$dir"
   else
-    { echo "$as_me:$LINENO: WARNING: *** Include directory $dir does not exist." >&5
-echo "$as_me: WARNING: *** Include directory $dir does not exist." >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: *** Include directory $dir does not exist." >&5
+$as_echo "$as_me: WARNING: *** Include directory $dir does not exist." >&2;}
   fi
 done
 IFS=$ac_save_IFS
@@ -4693,8 +4850,8 @@ for dir in $LIBRARY_DIRS $SRCH_LIB; do
   if test -d "$dir"; then
     LIBDIRS="$LIBDIRS -L$dir"
   else
-    { echo "$as_me:$LINENO: WARNING: *** Library directory $dir does not exist." >&5
-echo "$as_me: WARNING: *** Library directory $dir does not exist." >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: *** Library directory $dir does not exist." >&5
+$as_echo "$as_me: WARNING: *** Library directory $dir does not exist." >&2;}
   fi
 done
 IFS=$ac_save_IFS
@@ -4702,11 +4859,9 @@ IFS=$ac_save_IFS
 #
 # Enable thread-safe client libraries
 #
-{ echo "$as_me:$LINENO: checking allow thread-safe client libraries" >&5
-echo $ECHO_N "checking allow thread-safe client libraries... $ECHO_C" >&6; }
-if test "$PORTNAME" != "win32"; then
+{ $as_echo "$as_me:$LINENO: checking allow thread-safe client libraries" >&5
+$as_echo_n "checking allow thread-safe client libraries... " >&6; }
 
-pgac_args="$pgac_args enable_thread_safety"
 
 # Check whether --enable-thread-safety was given.
 if test "${enable_thread_safety+set}" = set; then
@@ -4719,36 +4874,8 @@ if test "${enable_thread_safety+set}" = set; then
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-thread-safety option" >&5
-echo "$as_me: error: no argument expected for --enable-thread-safety option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  enable_thread_safety=no
-
-fi
-
-
-else
-# Win32 should always use threads
-
-pgac_args="$pgac_args enable_thread_safety"
-
-# Check whether --enable-thread-safety was given.
-if test "${enable_thread_safety+set}" = set; then
-  enableval=$enable_thread_safety;
-  case $enableval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-thread-safety option" >&5
-echo "$as_me: error: no argument expected for --enable-thread-safety option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --enable-thread-safety option" >&5
+$as_echo "$as_me: error: no argument expected for --enable-thread-safety option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -4759,54 +4886,23 @@ else
 fi
 
 
-fi
-
-
-pgac_args="$pgac_args enable_thread_safety_force"
-
-# Check whether --enable-thread-safety-force was given.
-if test "${enable_thread_safety_force+set}" = set; then
-  enableval=$enable_thread_safety_force;
-  case $enableval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-thread-safety-force option" >&5
-echo "$as_me: error: no argument expected for --enable-thread-safety-force option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  enable_thread_safety_force=no
-
-fi
-
-
-if test "$enable_thread_safety" = yes -o \
-        "$enable_thread_safety_force" = yes; then
-  enable_thread_safety="yes"	# for 'force'
+if test "$enable_thread_safety" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define ENABLE_THREAD_SAFETY 1
 _ACEOF
 
 fi
-{ echo "$as_me:$LINENO: result: $enable_thread_safety" >&5
-echo "${ECHO_T}$enable_thread_safety" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_thread_safety" >&5
+$as_echo "$enable_thread_safety" >&6; }
 
 
 #
 # Optionally build Tcl modules (PL/Tcl)
 #
-{ echo "$as_me:$LINENO: checking whether to build with Tcl" >&5
-echo $ECHO_N "checking whether to build with Tcl... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build with Tcl" >&5
+$as_echo_n "checking whether to build with Tcl... " >&6; }
 
-pgac_args="$pgac_args with_tcl"
 
 
 # Check whether --with-tcl was given.
@@ -4820,8 +4916,8 @@ if test "${with_tcl+set}" = set; then
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-tcl option" >&5
-echo "$as_me: error: no argument expected for --with-tcl option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --with-tcl option" >&5
+$as_echo "$as_me: error: no argument expected for --with-tcl option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -4832,15 +4928,14 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: result: $with_tcl" >&5
-echo "${ECHO_T}$with_tcl" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $with_tcl" >&5
+$as_echo "$with_tcl" >&6; }
 
 
 # We see if the path to the Tcl/Tk configuration scripts is specified.
 # This will override the use of tclsh to find the paths to search.
 
 
-pgac_args="$pgac_args with_tclconfig"
 
 
 # Check whether --with-tclconfig was given.
@@ -4848,13 +4943,13 @@ if test "${with_tclconfig+set}" = set; then
   withval=$with_tclconfig;
   case $withval in
     yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-tclconfig option" >&5
-echo "$as_me: error: argument required for --with-tclconfig option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-tclconfig option" >&5
+$as_echo "$as_me: error: argument required for --with-tclconfig option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-tclconfig option" >&5
-echo "$as_me: error: argument required for --with-tclconfig option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-tclconfig option" >&5
+$as_echo "$as_me: error: argument required for --with-tclconfig option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     *)
@@ -4869,10 +4964,9 @@ fi
 #
 # Optionally build Perl modules (PL/Perl)
 #
-{ echo "$as_me:$LINENO: checking whether to build Perl modules" >&5
-echo $ECHO_N "checking whether to build Perl modules... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build Perl modules" >&5
+$as_echo_n "checking whether to build Perl modules... " >&6; }
 
-pgac_args="$pgac_args with_perl"
 
 
 # Check whether --with-perl was given.
@@ -4886,8 +4980,8 @@ if test "${with_perl+set}" = set; then
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-perl option" >&5
-echo "$as_me: error: no argument expected for --with-perl option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --with-perl option" >&5
+$as_echo "$as_me: error: no argument expected for --with-perl option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -4898,17 +4992,16 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: result: $with_perl" >&5
-echo "${ECHO_T}$with_perl" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $with_perl" >&5
+$as_echo "$with_perl" >&6; }
 
 
 #
 # Optionally build Python modules (PL/Python)
 #
-{ echo "$as_me:$LINENO: checking whether to build Python modules" >&5
-echo $ECHO_N "checking whether to build Python modules... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build Python modules" >&5
+$as_echo_n "checking whether to build Python modules... " >&6; }
 
-pgac_args="$pgac_args with_python"
 
 
 # Check whether --with-python was given.
@@ -4922,8 +5015,8 @@ if test "${with_python+set}" = set; then
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-python option" >&5
-echo "$as_me: error: no argument expected for --with-python option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --with-python option" >&5
+$as_echo "$as_me: error: no argument expected for --with-python option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -4934,17 +5027,16 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: result: $with_python" >&5
-echo "${ECHO_T}$with_python" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $with_python" >&5
+$as_echo "$with_python" >&6; }
 
 
 #
 # GSSAPI
 #
-{ echo "$as_me:$LINENO: checking whether to build with GSSAPI support" >&5
-echo $ECHO_N "checking whether to build with GSSAPI support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build with GSSAPI support" >&5
+$as_echo_n "checking whether to build with GSSAPI support... " >&6; }
 
-pgac_args="$pgac_args with_gssapi"
 
 
 # Check whether --with-gssapi was given.
@@ -4965,8 +5057,8 @@ _ACEOF
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-gssapi option" >&5
-echo "$as_me: error: no argument expected for --with-gssapi option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --with-gssapi option" >&5
+$as_echo "$as_me: error: no argument expected for --with-gssapi option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -4977,17 +5069,16 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: result: $with_gssapi" >&5
-echo "${ECHO_T}$with_gssapi" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $with_gssapi" >&5
+$as_echo "$with_gssapi" >&6; }
 
 
 #
 # Kerberos 5
 #
-{ echo "$as_me:$LINENO: checking whether to build with Kerberos 5 support" >&5
-echo $ECHO_N "checking whether to build with Kerberos 5 support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build with Kerberos 5 support" >&5
+$as_echo_n "checking whether to build with Kerberos 5 support... " >&6; }
 
-pgac_args="$pgac_args with_krb5"
 
 
 # Check whether --with-krb5 was given.
@@ -5008,8 +5099,8 @@ _ACEOF
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-krb5 option" >&5
-echo "$as_me: error: no argument expected for --with-krb5 option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --with-krb5 option" >&5
+$as_echo "$as_me: error: no argument expected for --with-krb5 option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -5020,8 +5111,8 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: result: $with_krb5" >&5
-echo "${ECHO_T}$with_krb5" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $with_krb5" >&5
+$as_echo "$with_krb5" >&6; }
 
 
 
@@ -5032,7 +5123,6 @@ echo "${ECHO_T}$with_krb5" >&6; }
 # Kerberos configuration parameters
 #
 
-pgac_args="$pgac_args with_krb_srvnam"
 
 
 # Check whether --with-krb-srvnam was given.
@@ -5040,13 +5130,13 @@ if test "${with_krb_srvnam+set}" = set; then
   withval=$with_krb_srvnam;
   case $withval in
     yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-krb-srvnam option" >&5
-echo "$as_me: error: argument required for --with-krb-srvnam option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-krb-srvnam option" >&5
+$as_echo "$as_me: error: argument required for --with-krb-srvnam option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-krb-srvnam option" >&5
-echo "$as_me: error: argument required for --with-krb-srvnam option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-krb-srvnam option" >&5
+$as_echo "$as_me: error: argument required for --with-krb-srvnam option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     *)
@@ -5069,10 +5159,9 @@ _ACEOF
 #
 # PAM
 #
-{ echo "$as_me:$LINENO: checking whether to build with PAM support" >&5
-echo $ECHO_N "checking whether to build with PAM support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build with PAM support" >&5
+$as_echo_n "checking whether to build with PAM support... " >&6; }
 
-pgac_args="$pgac_args with_pam"
 
 
 # Check whether --with-pam was given.
@@ -5090,8 +5179,8 @@ _ACEOF
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-pam option" >&5
-echo "$as_me: error: no argument expected for --with-pam option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --with-pam option" >&5
+$as_echo "$as_me: error: no argument expected for --with-pam option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -5102,18 +5191,17 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: result: $with_pam" >&5
-echo "${ECHO_T}$with_pam" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $with_pam" >&5
+$as_echo "$with_pam" >&6; }
 
 
 
 #
 # LDAP
 #
-{ echo "$as_me:$LINENO: checking whether to build with LDAP support" >&5
-echo $ECHO_N "checking whether to build with LDAP support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build with LDAP support" >&5
+$as_echo_n "checking whether to build with LDAP support... " >&6; }
 
-pgac_args="$pgac_args with_ldap"
 
 
 # Check whether --with-ldap was given.
@@ -5131,8 +5219,8 @@ _ACEOF
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-ldap option" >&5
-echo "$as_me: error: no argument expected for --with-ldap option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --with-ldap option" >&5
+$as_echo "$as_me: error: no argument expected for --with-ldap option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -5143,18 +5231,17 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: result: $with_ldap" >&5
-echo "${ECHO_T}$with_ldap" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $with_ldap" >&5
+$as_echo "$with_ldap" >&6; }
 
 
 
 #
 # Bonjour
 #
-{ echo "$as_me:$LINENO: checking whether to build with Bonjour support" >&5
-echo $ECHO_N "checking whether to build with Bonjour support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build with Bonjour support" >&5
+$as_echo_n "checking whether to build with Bonjour support... " >&6; }
 
-pgac_args="$pgac_args with_bonjour"
 
 
 # Check whether --with-bonjour was given.
@@ -5172,8 +5259,8 @@ _ACEOF
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-bonjour option" >&5
-echo "$as_me: error: no argument expected for --with-bonjour option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --with-bonjour option" >&5
+$as_echo "$as_me: error: no argument expected for --with-bonjour option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -5184,18 +5271,17 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: result: $with_bonjour" >&5
-echo "${ECHO_T}$with_bonjour" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $with_bonjour" >&5
+$as_echo "$with_bonjour" >&6; }
 
 
 
 #
 # OpenSSL
 #
-{ echo "$as_me:$LINENO: checking whether to build with OpenSSL support" >&5
-echo $ECHO_N "checking whether to build with OpenSSL support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build with OpenSSL support" >&5
+$as_echo_n "checking whether to build with OpenSSL support... " >&6; }
 
-pgac_args="$pgac_args with_openssl"
 
 
 # Check whether --with-openssl was given.
@@ -5213,8 +5299,8 @@ _ACEOF
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-openssl option" >&5
-echo "$as_me: error: no argument expected for --with-openssl option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --with-openssl option" >&5
+$as_echo "$as_me: error: no argument expected for --with-openssl option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -5225,8 +5311,8 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: result: $with_openssl" >&5
-echo "${ECHO_T}$with_openssl" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $with_openssl" >&5
+$as_echo "$with_openssl" >&6; }
 
 
 
@@ -5234,7 +5320,6 @@ echo "${ECHO_T}$with_openssl" >&6; }
 # Readline
 #
 
-pgac_args="$pgac_args with_readline"
 
 
 # Check whether --with-readline was given.
@@ -5248,8 +5333,8 @@ if test "${with_readline+set}" = set; then
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-readline option" >&5
-echo "$as_me: error: no argument expected for --with-readline option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --with-readline option" >&5
+$as_echo "$as_me: error: no argument expected for --with-readline option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -5265,8 +5350,8 @@ fi
 # Therefore disable its use until we understand the cause. 2004-07-20
 if test "$PORTNAME" = "win32"; then
   if test "$with_readline" = yes; then
-    { echo "$as_me:$LINENO: WARNING: *** Readline does not work on MinGW --- disabling" >&5
-echo "$as_me: WARNING: *** Readline does not work on MinGW --- disabling" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: *** Readline does not work on MinGW --- disabling" >&5
+$as_echo "$as_me: WARNING: *** Readline does not work on MinGW --- disabling" >&2;}
     with_readline=no
   fi
 fi
@@ -5276,7 +5361,6 @@ fi
 # Prefer libedit
 #
 
-pgac_args="$pgac_args with_libedit_preferred"
 
 
 # Check whether --with-libedit-preferred was given.
@@ -5290,8 +5374,8 @@ if test "${with_libedit_preferred+set}" = set; then
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-libedit-preferred option" >&5
-echo "$as_me: error: no argument expected for --with-libedit-preferred option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --with-libedit-preferred option" >&5
+$as_echo "$as_me: error: no argument expected for --with-libedit-preferred option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -5308,7 +5392,6 @@ fi
 # OSSP UUID library
 #
 
-pgac_args="$pgac_args with_ossp_uuid"
 
 
 # Check whether --with-ossp-uuid was given.
@@ -5322,8 +5405,8 @@ if test "${with_ossp_uuid+set}" = set; then
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-ossp-uuid option" >&5
-echo "$as_me: error: no argument expected for --with-ossp-uuid option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --with-ossp-uuid option" >&5
+$as_echo "$as_me: error: no argument expected for --with-ossp-uuid option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -5341,7 +5424,6 @@ fi
 # XML
 #
 
-pgac_args="$pgac_args with_libxml"
 
 
 # Check whether --with-libxml was given.
@@ -5359,8 +5441,8 @@ _ACEOF
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-libxml option" >&5
-echo "$as_me: error: no argument expected for --with-libxml option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --with-libxml option" >&5
+$as_echo "$as_me: error: no argument expected for --with-libxml option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -5377,10 +5459,10 @@ if test "$with_libxml" = yes ; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_XML2_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$XML2_CONFIG"; then
   ac_cv_prog_XML2_CONFIG="$XML2_CONFIG" # Let the user override the test.
@@ -5393,7 +5475,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_XML2_CONFIG="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5404,11 +5486,11 @@ fi
 fi
 XML2_CONFIG=$ac_cv_prog_XML2_CONFIG
 if test -n "$XML2_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $XML2_CONFIG" >&5
-echo "${ECHO_T}$XML2_CONFIG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $XML2_CONFIG" >&5
+$as_echo "$XML2_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5435,7 +5517,6 @@ fi
 # XSLT
 #
 
-pgac_args="$pgac_args with_libxslt"
 
 
 # Check whether --with-libxslt was given.
@@ -5453,8 +5534,8 @@ _ACEOF
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-libxslt option" >&5
-echo "$as_me: error: no argument expected for --with-libxslt option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --with-libxslt option" >&5
+$as_echo "$as_me: error: no argument expected for --with-libxslt option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -5473,7 +5554,6 @@ fi
 # tzdata
 #
 
-pgac_args="$pgac_args with_system_tzdata"
 
 
 # Check whether --with-system-tzdata was given.
@@ -5481,13 +5561,13 @@ if test "${with_system_tzdata+set}" = set; then
   withval=$with_system_tzdata;
   case $withval in
     yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-system-tzdata option" >&5
-echo "$as_me: error: argument required for --with-system-tzdata option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-system-tzdata option" >&5
+$as_echo "$as_me: error: argument required for --with-system-tzdata option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-system-tzdata option" >&5
-echo "$as_me: error: argument required for --with-system-tzdata option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: argument required for --with-system-tzdata option" >&5
+$as_echo "$as_me: error: argument required for --with-system-tzdata option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
     *)
@@ -5504,7 +5584,6 @@ fi
 # Zlib
 #
 
-pgac_args="$pgac_args with_zlib"
 
 
 # Check whether --with-zlib was given.
@@ -5518,8 +5597,8 @@ if test "${with_zlib+set}" = set; then
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-zlib option" >&5
-echo "$as_me: error: no argument expected for --with-zlib option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --with-zlib option" >&5
+$as_echo "$as_me: error: no argument expected for --with-zlib option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -5544,42 +5623,37 @@ case $host_os in
 esac
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -5594,74 +5668,60 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -5676,33 +5736,24 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
@@ -5741,6 +5792,7 @@ LDFLAGS="$LDFLAGS $LIBDIRS"
 
 
 
+
 # Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
@@ -5751,8 +5803,8 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for ld used by GCC" >&5
+$as_echo_n "checking for ld used by GCC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -5781,14 +5833,14 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if test "${ac_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
@@ -5814,19 +5866,19 @@ fi
 
 LD="$ac_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${ac_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
@@ -5835,18 +5887,18 @@ else
   ac_cv_prog_gnu_ld=no
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$ac_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_gnu_ld" >&5
+$as_echo "$ac_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$ac_cv_prog_gnu_ld
 
 
 
 
 case $host_os in sysv5*)
-  { echo "$as_me:$LINENO: checking whether ld -R works" >&5
-echo $ECHO_N "checking whether ld -R works... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether ld -R works" >&5
+$as_echo_n "checking whether ld -R works... " >&6; }
 if test "${pgac_cv_prog_ld_R+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/lib"
@@ -5871,43 +5923,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   pgac_cv_prog_ld_R=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	pgac_cv_prog_ld_R=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     LDFLAGS=$pgac_save_LDFLAGS
 
 fi
-{ echo "$as_me:$LINENO: result: $pgac_cv_prog_ld_R" >&5
-echo "${ECHO_T}$pgac_cv_prog_ld_R" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $pgac_cv_prog_ld_R" >&5
+$as_echo "$pgac_cv_prog_ld_R" >&6; }
   ld_R_works=$pgac_cv_prog_ld_R
 
 esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -5920,7 +5976,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5931,11 +5987,11 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5944,10 +6000,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -5960,7 +6016,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5971,11 +6027,11 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -5983,12 +6039,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [email protected]." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [email protected]." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -6001,10 +6053,10 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -6017,7 +6069,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6028,11 +6080,11 @@ fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6041,10 +6093,10 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -6057,7 +6109,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6068,11 +6120,11 @@ fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -6080,12 +6132,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [email protected]." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [email protected]." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -6095,18 +6143,18 @@ else
 fi
 
 
-  { echo "$as_me:$LINENO: checking whether it is possible to strip libraries" >&5
-echo $ECHO_N "checking whether it is possible to strip libraries... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether it is possible to strip libraries" >&5
+$as_echo_n "checking whether it is possible to strip libraries... " >&6; }
   if test x"$STRIP" != x"" && "$STRIP" -V 2>&1 | grep "GNU strip" >/dev/null; then
     STRIP_STATIC_LIB="$STRIP -x"
     STRIP_SHARED_LIB="$STRIP --strip-unneeded"
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   else
     STRIP_STATIC_LIB=:
     STRIP_SHARED_LIB=:
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
@@ -6114,10 +6162,10 @@ echo "${ECHO_T}no" >&6; }
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -6130,7 +6178,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6141,11 +6189,11 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6154,10 +6202,10 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@ -6170,7 +6218,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6181,11 +6229,11 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -6193,12 +6241,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [email protected]." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [email protected]." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -6211,10 +6255,10 @@ if test "$PORTNAME" = "win32"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$DLLTOOL"; then
   ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
@@ -6227,7 +6271,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6238,11 +6282,11 @@ fi
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-echo "${ECHO_T}$DLLTOOL" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6251,10 +6295,10 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DLLTOOL"; then
   ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
@@ -6267,7 +6311,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6278,11 +6322,11 @@ fi
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -6290,12 +6334,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [email protected]." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [email protected]." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -6307,10 +6347,10 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dllwrap", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dllwrap; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_DLLWRAP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$DLLWRAP"; then
   ac_cv_prog_DLLWRAP="$DLLWRAP" # Let the user override the test.
@@ -6323,7 +6363,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DLLWRAP="${ac_tool_prefix}dllwrap"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6334,11 +6374,11 @@ fi
 fi
 DLLWRAP=$ac_cv_prog_DLLWRAP
 if test -n "$DLLWRAP"; then
-  { echo "$as_me:$LINENO: result: $DLLWRAP" >&5
-echo "${ECHO_T}$DLLWRAP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $DLLWRAP" >&5
+$as_echo "$DLLWRAP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6347,10 +6387,10 @@ if test -z "$ac_cv_prog_DLLWRAP"; then
   ac_ct_DLLWRAP=$DLLWRAP
   # Extract the first word of "dllwrap", so it can be a program name with args.
 set dummy dllwrap; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_DLLWRAP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DLLWRAP"; then
   ac_cv_prog_ac_ct_DLLWRAP="$ac_ct_DLLWRAP" # Let the user override the test.
@@ -6363,7 +6403,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DLLWRAP="dllwrap"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6374,11 +6414,11 @@ fi
 fi
 ac_ct_DLLWRAP=$ac_cv_prog_ac_ct_DLLWRAP
 if test -n "$ac_ct_DLLWRAP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_DLLWRAP" >&5
-echo "${ECHO_T}$ac_ct_DLLWRAP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLWRAP" >&5
+$as_echo "$ac_ct_DLLWRAP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLWRAP" = x; then
@@ -6386,12 +6426,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [email protected]." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [email protected]." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLWRAP=$ac_ct_DLLWRAP
@@ -6403,10 +6439,10 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_WINDRES+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$WINDRES"; then
   ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
@@ -6419,7 +6455,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6430,11 +6466,11 @@ fi
 fi
 WINDRES=$ac_cv_prog_WINDRES
 if test -n "$WINDRES"; then
-  { echo "$as_me:$LINENO: result: $WINDRES" >&5
-echo "${ECHO_T}$WINDRES" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5
+$as_echo "$WINDRES" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6443,10 +6479,10 @@ if test -z "$ac_cv_prog_WINDRES"; then
   ac_ct_WINDRES=$WINDRES
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_WINDRES"; then
   ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
@@ -6459,7 +6495,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_WINDRES="windres"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6470,11 +6506,11 @@ fi
 fi
 ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
 if test -n "$ac_ct_WINDRES"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
-echo "${ECHO_T}$ac_ct_WINDRES" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
+$as_echo "$ac_ct_WINDRES" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_WINDRES" = x; then
@@ -6482,12 +6518,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [email protected]." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [email protected]." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     WINDRES=$ac_ct_WINDRES
@@ -6500,10 +6532,10 @@ fi
 
 # Extract the first word of "tar", so it can be a program name with args.
 set dummy tar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_TAR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $TAR in
   [\\/]* | ?:[\\/]*)
@@ -6518,7 +6550,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6530,33 +6562,33 @@ esac
 fi
 TAR=$ac_cv_path_TAR
 if test -n "$TAR"; then
-  { echo "$as_me:$LINENO: result: $TAR" >&5
-echo "${ECHO_T}$TAR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $TAR" >&5
+$as_echo "$TAR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -6569,7 +6601,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6580,17 +6612,65 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+# When Autoconf chooses install-sh as mkdir -p program it tries to generate
+# a relative path to it in each makefile where it subsitutes it. This clashes
+# with our Makefile.global concept. This workaround helps.
+case $MKDIR_P in
+  *install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;
+esac
 
 # Let the user override the search
 if test -z "$BISON"; then
@@ -6598,38 +6678,41 @@ if test -z "$BISON"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_BISON+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$BISON"; then
-  ac_cv_prog_BISON="$BISON" # Let the user override the test.
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_BISON+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  case $BISON in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BISON="$BISON" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_BISON="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-BISON=$ac_cv_prog_BISON
+BISON=$ac_cv_path_BISON
 if test -n "$BISON"; then
-  { echo "$as_me:$LINENO: result: $BISON" >&5
-echo "${ECHO_T}$BISON" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $BISON" >&5
+$as_echo "$BISON" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6640,28 +6723,28 @@ fi
 
 if test "$BISON"; then
   pgac_bison_version=`$BISON --version 2>/dev/null | sed q`
-  { echo "$as_me:$LINENO: using $pgac_bison_version" >&5
-echo "$as_me: using $pgac_bison_version" >&6;}
+  { $as_echo "$as_me:$LINENO: using $pgac_bison_version" >&5
+$as_echo "$as_me: using $pgac_bison_version" >&6;}
   if echo "$pgac_bison_version" | $AWK '{ if ($4 < 1.875) exit 0; else exit 1;}'
   then
-    { echo "$as_me:$LINENO: WARNING:
-*** The installed version of Bison is too old to use with PostgreSQL.
-*** Bison version 1.875 or later is required." >&5
-echo "$as_me: WARNING:
-*** The installed version of Bison is too old to use with PostgreSQL.
-*** Bison version 1.875 or later is required." >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING:
+*** The installed version of Bison, $BISON, is too old to use with PostgreSQL.
+*** Bison version 1.875 or later is required, but this is $pgac_bison_version." >&5
+$as_echo "$as_me: WARNING:
+*** The installed version of Bison, $BISON, is too old to use with PostgreSQL.
+*** Bison version 1.875 or later is required, but this is $pgac_bison_version." >&2;}
     BISON=""
   fi
 fi
 
 if test -z "$BISON"; then
-  { echo "$as_me:$LINENO: WARNING:
+  { $as_echo "$as_me:$LINENO: WARNING:
 *** Without Bison you will not be able to build PostgreSQL from CVS nor
 *** change any of the parser definition files.  You can obtain Bison from
 *** a GNU mirror site.  (If you are using the official distribution of
 *** PostgreSQL then you do not need to worry about this, because the Bison
 *** output is pre-generated.)" >&5
-echo "$as_me: WARNING:
+$as_echo "$as_me: WARNING:
 *** Without Bison you will not be able to build PostgreSQL from CVS nor
 *** change any of the parser definition files.  You can obtain Bison from
 *** a GNU mirror site.  (If you are using the official distribution of
@@ -6671,10 +6754,10 @@ fi
 # We don't need AC_SUBST(BISON) because AC_PATH_PROG did it
 
 
-{ echo "$as_me:$LINENO: checking for flex" >&5
-echo $ECHO_N "checking for flex... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for flex" >&5
+$as_echo_n "checking for flex... " >&6; }
 if test "${pgac_cv_path_flex+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # Let the user override the test
 if test -n "$FLEX"; then
@@ -6694,13 +6777,19 @@ else
       then
         echo '%%'  > conftest.l
         if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null 2>&1; then
-          if $pgac_candidate --version | grep ' 2\.5\.3$' >/dev/null 2>&1; then
-            pgac_broken_flex=$pgac_candidate
-            continue
+          pgac_flex_version=`$pgac_candidate --version 2>/dev/null`
+          if echo "$pgac_flex_version" | sed 's/[.a-z]/ /g' | $AWK '{ if ($1 = 2 && $2 = 5 && $3 >= 31) exit 0; else exit 1;}'
+          then
+            pgac_cv_path_flex=$pgac_candidate
+            break 2
+          else
+            { $as_echo "$as_me:$LINENO: WARNING:
+*** The installed version of Flex, $pgac_candidate, is too old to use with PostgreSQL.
+*** Flex version 2.5.31 or later is required, but this is $pgac_flex_version." >&5
+$as_echo "$as_me: WARNING:
+*** The installed version of Flex, $pgac_candidate, is too old to use with PostgreSQL.
+*** Flex version 2.5.31 or later is required, but this is $pgac_flex_version." >&2;}
           fi
-
-          pgac_cv_path_flex=$pgac_candidate
-          break 2
         fi
       fi
     done
@@ -6710,26 +6799,17 @@ else
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $pgac_cv_path_flex" >&5
-echo "${ECHO_T}$pgac_cv_path_flex" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $pgac_cv_path_flex" >&5
+$as_echo "$pgac_cv_path_flex" >&6; }
 if test x"$pgac_cv_path_flex" = x"no"; then
-  if test -n "$pgac_broken_flex"; then
-    { echo "$as_me:$LINENO: WARNING:
-*** The Flex version 2.5.3 you have at $pgac_broken_flex contains a bug. You
-*** should get version 2.5.4 or later." >&5
-echo "$as_me: WARNING:
-*** The Flex version 2.5.3 you have at $pgac_broken_flex contains a bug. You
-*** should get version 2.5.4 or later." >&2;}
-  fi
-
-  { echo "$as_me:$LINENO: WARNING:
-*** Without Flex you will not be able to build PostgreSQL from CVS or
+  { $as_echo "$as_me:$LINENO: WARNING:
+*** Without Flex you will not be able to build PostgreSQL from CVS nor
 *** change any of the scanner definition files.  You can obtain Flex from
 *** a GNU mirror site.  (If you are using the official distribution of
 *** PostgreSQL then you do not need to worry about this because the Flex
 *** output is pre-generated.)" >&5
-echo "$as_me: WARNING:
-*** Without Flex you will not be able to build PostgreSQL from CVS or
+$as_echo "$as_me: WARNING:
+*** Without Flex you will not be able to build PostgreSQL from CVS nor
 *** change any of the scanner definition files.  You can obtain Flex from
 *** a GNU mirror site.  (If you are using the official distribution of
 *** PostgreSQL then you do not need to worry about this because the Flex
@@ -6738,21 +6818,23 @@ echo "$as_me: WARNING:
   FLEX=
 else
   FLEX=$pgac_cv_path_flex
-  pgac_flex_version=`$FLEX -V 2>/dev/null`
-  { echo "$as_me:$LINENO: using $pgac_flex_version" >&5
-echo "$as_me: using $pgac_flex_version" >&6;}
+  pgac_flex_version=`$FLEX --version 2>/dev/null`
+  { $as_echo "$as_me:$LINENO: using $pgac_flex_version" >&5
+$as_echo "$as_me: using $pgac_flex_version" >&6;}
 fi
 
 
 
 
 
-# Extract the first word of "perl", so it can be a program name with args.
+# Let the user override the search
+if test -z "$PERL"; then
+  # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_PERL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $PERL in
   [\\/]* | ?:[\\/]*)
@@ -6767,7 +6849,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6779,50 +6861,87 @@ esac
 fi
 PERL=$ac_cv_path_PERL
 if test -n "$PERL"; then
-  { echo "$as_me:$LINENO: result: $PERL" >&5
-echo "${ECHO_T}$PERL" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $PERL" >&5
+$as_echo "$PERL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
+fi
+
+if test "$PERL"; then
+  pgac_perl_version=`$PERL -v 2>/dev/null | sed -n 's/This is perl.*v[a-z ]*\([0-9]\.[0-9][0-9.]*\).*$/\1/p'`
+  { $as_echo "$as_me:$LINENO: using perl $pgac_perl_version" >&5
+$as_echo "$as_me: using perl $pgac_perl_version" >&6;}
+  if echo "$pgac_perl_version" | sed 's/[.a-z_]/ /g' | \
+    $AWK '{ if ($1 = 5 && $2 >= 8) exit 1; else exit 0;}'
+  then
+    { $as_echo "$as_me:$LINENO: WARNING:
+*** The installed version of Perl, $PERL, is too old to use with PostgreSQL.
+*** Perl version 5.8 or later is required, but this is $pgac_perl_version." >&5
+$as_echo "$as_me: WARNING:
+*** The installed version of Perl, $PERL, is too old to use with PostgreSQL.
+*** Perl version 5.8 or later is required, but this is $pgac_perl_version." >&2;}
+    PERL=""
+  fi
+fi
+
+if test -z "$PERL"; then
+  { $as_echo "$as_me:$LINENO: WARNING:
+*** Without Perl you will not be able to build PostgreSQL from CVS.
+*** You can obtain Perl from any CPAN mirror site.
+*** (If you are using the official distribution of PostgreSQL then you do not
+*** need to worry about this, because the Perl output is pre-generated.)" >&5
+$as_echo "$as_me: WARNING:
+*** Without Perl you will not be able to build PostgreSQL from CVS.
+*** You can obtain Perl from any CPAN mirror site.
+*** (If you are using the official distribution of PostgreSQL then you do not
+*** need to worry about this, because the Perl output is pre-generated.)" >&2;}
+fi
+
 if test "$with_perl" = yes; then
+  if test -z "$PERL"; then
+    { { $as_echo "$as_me:$LINENO: error: Perl not found" >&5
+$as_echo "$as_me: error: Perl not found" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
 
-{ echo "$as_me:$LINENO: checking for Perl archlibexp" >&5
-echo $ECHO_N "checking for Perl archlibexp... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for Perl archlibexp" >&5
+$as_echo_n "checking for Perl archlibexp... " >&6; }
 perl_archlibexp=`$PERL -MConfig -e 'print $Config{archlibexp}'`
-{ echo "$as_me:$LINENO: result: $perl_archlibexp" >&5
-echo "${ECHO_T}$perl_archlibexp" >&6; }
-{ echo "$as_me:$LINENO: checking for Perl privlibexp" >&5
-echo $ECHO_N "checking for Perl privlibexp... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $perl_archlibexp" >&5
+$as_echo "$perl_archlibexp" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for Perl privlibexp" >&5
+$as_echo_n "checking for Perl privlibexp... " >&6; }
 perl_privlibexp=`$PERL -MConfig -e 'print $Config{privlibexp}'`
-{ echo "$as_me:$LINENO: result: $perl_privlibexp" >&5
-echo "${ECHO_T}$perl_privlibexp" >&6; }
-{ echo "$as_me:$LINENO: checking for Perl useshrplib" >&5
-echo $ECHO_N "checking for Perl useshrplib... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $perl_privlibexp" >&5
+$as_echo "$perl_privlibexp" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for Perl useshrplib" >&5
+$as_echo_n "checking for Perl useshrplib... " >&6; }
 perl_useshrplib=`$PERL -MConfig -e 'print $Config{useshrplib}'`
-{ echo "$as_me:$LINENO: result: $perl_useshrplib" >&5
-echo "${ECHO_T}$perl_useshrplib" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $perl_useshrplib" >&5
+$as_echo "$perl_useshrplib" >&6; }
 
-{ echo "$as_me:$LINENO: checking for flags to link embedded Perl" >&5
-echo $ECHO_N "checking for flags to link embedded Perl... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for flags to link embedded Perl" >&5
+$as_echo_n "checking for flags to link embedded Perl... " >&6; }
 pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
 pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
-perl_embed_ldflags=`echo X"$pgac_tmp1" | sed "s/^X//;s%$pgac_tmp2%%"`
+perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"`
 if test -z "$perl_embed_ldflags" ; then
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-	{ { echo "$as_me:$LINENO: error: could not determine flags for linking embedded Perl.
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:$LINENO: error: could not determine flags for linking embedded Perl.
 This probably means that ExtUtils::Embed or ExtUtils::MakeMaker is not
 installed." >&5
-echo "$as_me: error: could not determine flags for linking embedded Perl.
+$as_echo "$as_me: error: could not determine flags for linking embedded Perl.
 This probably means that ExtUtils::Embed or ExtUtils::MakeMaker is not
 installed." >&2;}
    { (exit 1); exit 1; }; }
 else
-	{ echo "$as_me:$LINENO: result: $perl_embed_ldflags" >&5
-echo "${ECHO_T}$perl_embed_ldflags" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: $perl_embed_ldflags" >&5
+$as_echo "$perl_embed_ldflags" >&6; }
 fi
 
 fi
@@ -6830,10 +6949,10 @@ fi
 if test "$with_python" = yes; then
   # Extract the first word of "python", so it can be a program name with args.
 set dummy python; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_PYTHON+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $PYTHON in
   [\\/]* | ?:[\\/]*)
@@ -6848,7 +6967,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6860,47 +6979,48 @@ esac
 fi
 PYTHON=$ac_cv_path_PYTHON
 if test -n "$PYTHON"; then
-  { echo "$as_me:$LINENO: result: $PYTHON" >&5
-echo "${ECHO_T}$PYTHON" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
+$as_echo "$PYTHON" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test x"$PYTHON" = x""; then
-  { { echo "$as_me:$LINENO: error: Python not found" >&5
-echo "$as_me: error: Python not found" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: Python not found" >&5
+$as_echo "$as_me: error: Python not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-{ echo "$as_me:$LINENO: checking for Python distutils module" >&5
-echo $ECHO_N "checking for Python distutils module... $ECHO_C" >&6; }
-if "${PYTHON}" 2>&- -c 'import distutils'
+{ $as_echo "$as_me:$LINENO: checking for Python distutils module" >&5
+$as_echo_n "checking for Python distutils module... " >&6; }
+if "${PYTHON}" -c 'import distutils' 2>&5
 then
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-    { { echo "$as_me:$LINENO: error: distutils module not found" >&5
-echo "$as_me: error: distutils module not found" >&2;}
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+    { { $as_echo "$as_me:$LINENO: error: distutils module not found" >&5
+$as_echo "$as_me: error: distutils module not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
-{ echo "$as_me:$LINENO: checking Python configuration directory" >&5
-echo $ECHO_N "checking Python configuration directory... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking Python configuration directory" >&5
+$as_echo_n "checking Python configuration directory... " >&6; }
+python_majorversion=`${PYTHON} -c "import sys; print(sys.version[0])"`
 python_version=`${PYTHON} -c "import sys; print(sys.version[:3])"`
 python_configdir=`${PYTHON} -c "from distutils.sysconfig import get_python_lib as f; import os; print(os.path.join(f(plat_specific=1,standard_lib=1),'config'))"`
 python_includespec=`${PYTHON} -c "import distutils.sysconfig; print('-I'+distutils.sysconfig.get_python_inc())"`
 
 # This should be enough of a message.
-{ echo "$as_me:$LINENO: result: $python_configdir" >&5
-echo "${ECHO_T}$python_configdir" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $python_configdir" >&5
+$as_echo "$python_configdir" >&6; }
 
 
-{ echo "$as_me:$LINENO: checking how to link an embedded Python application" >&5
-echo $ECHO_N "checking how to link an embedded Python application... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to link an embedded Python application" >&5
+$as_echo_n "checking how to link an embedded Python application... " >&6; }
 
 python_libdir=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBDIR'))))"`
 python_ldlibrary=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDLIBRARY'))))"`
@@ -6918,29 +7038,29 @@ else
 	python_libspec="-L${python_libdir} -lpython${python_version}"
 fi
 
-python_additional_libs=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','LOCALMODLIBS','BASEMODLIBS'))))"`
+python_additional_libs=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"`
 
-{ echo "$as_me:$LINENO: result: ${python_libspec} ${python_additional_libs}" >&5
-echo "${ECHO_T}${python_libspec} ${python_additional_libs}" >&6; }
+{ $as_echo "$as_me:$LINENO: result: ${python_libspec} ${python_additional_libs}" >&5
+$as_echo "${python_libspec} ${python_additional_libs}" >&6; }
 
 
 # threaded python is not supported on bsd's
-{ echo "$as_me:$LINENO: checking whether Python is compiled with thread support" >&5
-echo $ECHO_N "checking whether Python is compiled with thread support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether Python is compiled with thread support" >&5
+$as_echo_n "checking whether Python is compiled with thread support... " >&6; }
 pythreads=`${PYTHON} -c "import sys; print(int('thread' in sys.builtin_module_names))"`
 if test "$pythreads" = "1"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   case $host_os in
   openbsd*|freebsd*)
-    { { echo "$as_me:$LINENO: error: threaded Python not supported on this platform" >&5
-echo "$as_me: error: threaded Python not supported on this platform" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: threaded Python not supported on this platform" >&5
+$as_echo "$as_me: error: threaded Python not supported on this platform" >&2;}
    { (exit 1); exit 1; }; }
     ;;
   esac
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6949,10 +7069,10 @@ fi
 if test "$cross_compiling" = yes && test -z "$with_system_tzdata"; then
   # Extract the first word of "zic", so it can be a program name with args.
 set dummy zic; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_ZIC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $ZIC in
   [\\/]* | ?:[\\/]*)
@@ -6967,7 +7087,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ZIC="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6979,20 +7099,20 @@ esac
 fi
 ZIC=$ac_cv_path_ZIC
 if test -n "$ZIC"; then
-  { echo "$as_me:$LINENO: result: $ZIC" >&5
-echo "${ECHO_T}$ZIC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ZIC" >&5
+$as_echo "$ZIC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   if test -z "$ZIC"; then
-    { { echo "$as_me:$LINENO: error:
+    { { $as_echo "$as_me:$LINENO: error:
 When cross-compiling, either use the option --with-system-tzdata to use
 existing time-zone data, or set the environment variable ZIC to a zic
 program to use during the build." >&5
-echo "$as_me: error:
+$as_echo "$as_me: error:
 When cross-compiling, either use the option --with-system-tzdata to use
 existing time-zone data, or set the environment variable ZIC to a zic
 program to use during the build." >&2;}
@@ -7011,10 +7131,10 @@ fi
 ##
 
 
-{ echo "$as_me:$LINENO: checking for main in -lm" >&5
-echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for main in -lm" >&5
+$as_echo_n "checking for main in -lm... " >&6; }
 if test "${ac_cv_lib_m_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
@@ -7040,33 +7160,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_m_main=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_m_main=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5
-echo "${ECHO_T}$ac_cv_lib_m_main" >&6; }
-if test $ac_cv_lib_m_main = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5
+$as_echo "$ac_cv_lib_m_main" >&6; }
+if test "x$ac_cv_lib_m_main" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
 _ACEOF
@@ -7075,10 +7199,10 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing setproctitle" >&5
-echo $ECHO_N "checking for library containing setproctitle... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for library containing setproctitle" >&5
+$as_echo_n "checking for library containing setproctitle... " >&6; }
 if test "${ac_cv_search_setproctitle+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -7116,26 +7240,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_setproctitle=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_setproctitle+set}" = set; then
@@ -7150,18 +7278,18 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_setproctitle" >&5
-echo "${ECHO_T}$ac_cv_search_setproctitle" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_setproctitle" >&5
+$as_echo "$ac_cv_search_setproctitle" >&6; }
 ac_res=$ac_cv_search_setproctitle
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing dlopen" >&5
-echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
 if test "${ac_cv_search_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -7199,26 +7327,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_dlopen=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_dlopen+set}" = set; then
@@ -7233,18 +7365,18 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
-echo "${ECHO_T}$ac_cv_search_dlopen" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
 ac_res=$ac_cv_search_dlopen
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing socket" >&5
-echo $ECHO_N "checking for library containing socket... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for library containing socket" >&5
+$as_echo_n "checking for library containing socket... " >&6; }
 if test "${ac_cv_search_socket+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -7282,26 +7414,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_socket=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_socket+set}" = set; then
@@ -7316,18 +7452,18 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5
-echo "${ECHO_T}$ac_cv_search_socket" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5
+$as_echo "$ac_cv_search_socket" >&6; }
 ac_res=$ac_cv_search_socket
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing shl_load" >&5
-echo $ECHO_N "checking for library containing shl_load... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for library containing shl_load" >&5
+$as_echo_n "checking for library containing shl_load... " >&6; }
 if test "${ac_cv_search_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -7365,26 +7501,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_shl_load=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_shl_load+set}" = set; then
@@ -7399,8 +7539,8 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_shl_load" >&5
-echo "${ECHO_T}$ac_cv_search_shl_load" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_shl_load" >&5
+$as_echo "$ac_cv_search_shl_load" >&6; }
 ac_res=$ac_cv_search_shl_load
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -7410,10 +7550,10 @@ fi
 # We only use libld in port/dynloader/aix.c
 case $host_os in
      aix*)
-	{ echo "$as_me:$LINENO: checking for library containing ldopen" >&5
-echo $ECHO_N "checking for library containing ldopen... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:$LINENO: checking for library containing ldopen" >&5
+$as_echo_n "checking for library containing ldopen... " >&6; }
 if test "${ac_cv_search_ldopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -7451,26 +7591,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_ldopen=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_ldopen+set}" = set; then
@@ -7485,8 +7629,8 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_ldopen" >&5
-echo "${ECHO_T}$ac_cv_search_ldopen" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_ldopen" >&5
+$as_echo "$ac_cv_search_ldopen" >&6; }
 ac_res=$ac_cv_search_ldopen
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -7495,10 +7639,10 @@ fi
 
 	;;
 esac
-{ echo "$as_me:$LINENO: checking for library containing getopt_long" >&5
-echo $ECHO_N "checking for library containing getopt_long... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for library containing getopt_long" >&5
+$as_echo_n "checking for library containing getopt_long... " >&6; }
 if test "${ac_cv_search_getopt_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -7536,26 +7680,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_getopt_long=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_getopt_long+set}" = set; then
@@ -7570,18 +7718,18 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_getopt_long" >&5
-echo "${ECHO_T}$ac_cv_search_getopt_long" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_getopt_long" >&5
+$as_echo "$ac_cv_search_getopt_long" >&6; }
 ac_res=$ac_cv_search_getopt_long
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing crypt" >&5
-echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for library containing crypt" >&5
+$as_echo_n "checking for library containing crypt... " >&6; }
 if test "${ac_cv_search_crypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -7619,26 +7767,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_crypt=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_crypt+set}" = set; then
@@ -7653,8 +7805,8 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
-echo "${ECHO_T}$ac_cv_search_crypt" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
+$as_echo "$ac_cv_search_crypt" >&6; }
 ac_res=$ac_cv_search_crypt
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -7662,10 +7814,10 @@ if test "$ac_res" != no; then
 fi
 
 # Solaris:
-{ echo "$as_me:$LINENO: checking for library containing fdatasync" >&5
-echo $ECHO_N "checking for library containing fdatasync... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for library containing fdatasync" >&5
+$as_echo_n "checking for library containing fdatasync... " >&6; }
 if test "${ac_cv_search_fdatasync+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -7703,26 +7855,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_fdatasync=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_fdatasync+set}" = set; then
@@ -7737,8 +7893,8 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_fdatasync" >&5
-echo "${ECHO_T}$ac_cv_search_fdatasync" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_fdatasync" >&5
+$as_echo "$ac_cv_search_fdatasync" >&6; }
 ac_res=$ac_cv_search_fdatasync
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -7747,10 +7903,10 @@ fi
 
 # Required for thread_test.c on Solaris 2.5:
 # Other ports use it too (HP-UX) so test unconditionally
-{ echo "$as_me:$LINENO: checking for library containing gethostbyname_r" >&5
-echo $ECHO_N "checking for library containing gethostbyname_r... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for library containing gethostbyname_r" >&5
+$as_echo_n "checking for library containing gethostbyname_r... " >&6; }
 if test "${ac_cv_search_gethostbyname_r+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -7788,26 +7944,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_gethostbyname_r=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_gethostbyname_r+set}" = set; then
@@ -7822,8 +7982,8 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname_r" >&5
-echo "${ECHO_T}$ac_cv_search_gethostbyname_r" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname_r" >&5
+$as_echo "$ac_cv_search_gethostbyname_r" >&6; }
 ac_res=$ac_cv_search_gethostbyname_r
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -7831,10 +7991,10 @@ if test "$ac_res" != no; then
 fi
 
 # Cygwin:
-{ echo "$as_me:$LINENO: checking for library containing shmget" >&5
-echo $ECHO_N "checking for library containing shmget... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for library containing shmget" >&5
+$as_echo_n "checking for library containing shmget... " >&6; }
 if test "${ac_cv_search_shmget+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -7872,26 +8032,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_shmget=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_shmget+set}" = set; then
@@ -7906,8 +8070,8 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_shmget" >&5
-echo "${ECHO_T}$ac_cv_search_shmget" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_shmget" >&5
+$as_echo "$ac_cv_search_shmget" >&6; }
 ac_res=$ac_cv_search_shmget
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -7919,7 +8083,7 @@ if test "$with_readline" = yes; then
 
 
 if test "${pgac_cv_check_readline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   pgac_cv_check_readline=no
 pgac_save_LIBS=$LIBS
@@ -7928,8 +8092,8 @@ then	READLINE_ORDER="-lreadline -ledit"
 else	READLINE_ORDER="-ledit -lreadline"
 fi
 for pgac_rllib in $READLINE_ORDER ; do
-  { echo "$as_me:$LINENO: checking for ${pgac_rllib}" >&5
-echo $ECHO_N "checking for ${pgac_rllib}... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for ${pgac_rllib}" >&5
+$as_echo_n "checking for ${pgac_rllib}... " >&6; }
   for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
     LIBS="${pgac_rllib}${pgac_lib} $pgac_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
@@ -7960,18 +8124,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
       # Older NetBSD, OpenBSD, and Irix have a broken linker that does not
       # recognize dependent libraries; assume curses is needed if we didn't
@@ -7987,22 +8154,23 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
       break
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   done
   if test "$pgac_cv_check_readline" != no ; then
-    { echo "$as_me:$LINENO: result: yes ($pgac_cv_check_readline)" >&5
-echo "${ECHO_T}yes ($pgac_cv_check_readline)" >&6; }
+    { $as_echo "$as_me:$LINENO: result: yes ($pgac_cv_check_readline)" >&5
+$as_echo "yes ($pgac_cv_check_readline)" >&6; }
     break
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   fi
 done
 LIBS=$pgac_save_LIBS
@@ -8020,11 +8188,11 @@ fi
 
 
   if test x"$pgac_cv_check_readline" = x"no"; then
-    { { echo "$as_me:$LINENO: error: readline library not found
+    { { $as_echo "$as_me:$LINENO: error: readline library not found
 If you have readline already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-readline to disable readline support." >&5
-echo "$as_me: error: readline library not found
+$as_echo "$as_me: error: readline library not found
 If you have readline already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-readline to disable readline support." >&2;}
@@ -8034,10 +8202,10 @@ fi
 
 if test "$with_zlib" = yes; then
 
-{ echo "$as_me:$LINENO: checking for inflate in -lz" >&5
-echo $ECHO_N "checking for inflate in -lz... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for inflate in -lz" >&5
+$as_echo_n "checking for inflate in -lz... " >&6; }
 if test "${ac_cv_lib_z_inflate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
@@ -8069,33 +8237,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_z_inflate=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_z_inflate=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflate" >&5
-echo "${ECHO_T}$ac_cv_lib_z_inflate" >&6; }
-if test $ac_cv_lib_z_inflate = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflate" >&5
+$as_echo "$ac_cv_lib_z_inflate" >&6; }
+if test "x$ac_cv_lib_z_inflate" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBZ 1
 _ACEOF
@@ -8103,11 +8275,11 @@ _ACEOF
   LIBS="-lz $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: zlib library not found
+  { { $as_echo "$as_me:$LINENO: error: zlib library not found
 If you have zlib already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-zlib to disable zlib support." >&5
-echo "$as_me: error: zlib library not found
+$as_echo "$as_me: error: zlib library not found
 If you have zlib already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-zlib to disable zlib support." >&2;}
@@ -8123,18 +8295,18 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 else
-  { echo "$as_me:$LINENO: WARNING:
+  { $as_echo "$as_me:$LINENO: WARNING:
 *** Not using spinlocks will cause poor performance." >&5
-echo "$as_me: WARNING:
+$as_echo "$as_me: WARNING:
 *** Not using spinlocks will cause poor performance." >&2;}
 fi
 
 if test "$with_gssapi" = yes ; then
   if test "$PORTNAME" != "win32"; then
-    { echo "$as_me:$LINENO: checking for library containing gss_init_sec_context" >&5
-echo $ECHO_N "checking for library containing gss_init_sec_context... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for library containing gss_init_sec_context" >&5
+$as_echo_n "checking for library containing gss_init_sec_context... " >&6; }
 if test "${ac_cv_search_gss_init_sec_context+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -8172,26 +8344,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_gss_init_sec_context=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_gss_init_sec_context+set}" = set; then
@@ -8206,15 +8382,15 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_gss_init_sec_context" >&5
-echo "${ECHO_T}$ac_cv_search_gss_init_sec_context" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gss_init_sec_context" >&5
+$as_echo "$ac_cv_search_gss_init_sec_context" >&6; }
 ac_res=$ac_cv_search_gss_init_sec_context
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: could not find function 'gss_init_sec_context' required for GSSAPI" >&5
-echo "$as_me: error: could not find function 'gss_init_sec_context' required for GSSAPI" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: could not find function 'gss_init_sec_context' required for GSSAPI" >&5
+$as_echo "$as_me: error: could not find function 'gss_init_sec_context' required for GSSAPI" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -8225,10 +8401,10 @@ fi
 
 if test "$with_krb5" = yes ; then
   if test "$PORTNAME" != "win32"; then
-     { echo "$as_me:$LINENO: checking for library containing com_err" >&5
-echo $ECHO_N "checking for library containing com_err... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$LINENO: checking for library containing com_err" >&5
+$as_echo_n "checking for library containing com_err... " >&6; }
 if test "${ac_cv_search_com_err+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -8266,26 +8442,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_com_err=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_com_err+set}" = set; then
@@ -8300,22 +8480,22 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_com_err" >&5
-echo "${ECHO_T}$ac_cv_search_com_err" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_com_err" >&5
+$as_echo "$ac_cv_search_com_err" >&6; }
 ac_res=$ac_cv_search_com_err
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: could not find function 'com_err' required for Kerberos 5" >&5
-echo "$as_me: error: could not find function 'com_err' required for Kerberos 5" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: could not find function 'com_err' required for Kerberos 5" >&5
+$as_echo "$as_me: error: could not find function 'com_err' required for Kerberos 5" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-     { echo "$as_me:$LINENO: checking for library containing krb5_sendauth" >&5
-echo $ECHO_N "checking for library containing krb5_sendauth... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$LINENO: checking for library containing krb5_sendauth" >&5
+$as_echo_n "checking for library containing krb5_sendauth... " >&6; }
 if test "${ac_cv_search_krb5_sendauth+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -8353,26 +8533,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_krb5_sendauth=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_krb5_sendauth+set}" = set; then
@@ -8387,23 +8571,23 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_krb5_sendauth" >&5
-echo "${ECHO_T}$ac_cv_search_krb5_sendauth" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_krb5_sendauth" >&5
+$as_echo "$ac_cv_search_krb5_sendauth" >&6; }
 ac_res=$ac_cv_search_krb5_sendauth
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: could not find function 'krb5_sendauth' required for Kerberos 5" >&5
-echo "$as_me: error: could not find function 'krb5_sendauth' required for Kerberos 5" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: could not find function 'krb5_sendauth' required for Kerberos 5" >&5
+$as_echo "$as_me: error: could not find function 'krb5_sendauth' required for Kerberos 5" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
   else
-     { echo "$as_me:$LINENO: checking for library containing com_err" >&5
-echo $ECHO_N "checking for library containing com_err... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$LINENO: checking for library containing com_err" >&5
+$as_echo_n "checking for library containing com_err... " >&6; }
 if test "${ac_cv_search_com_err+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -8441,26 +8625,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_com_err=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_com_err+set}" = set; then
@@ -8475,15 +8663,15 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_com_err" >&5
-echo "${ECHO_T}$ac_cv_search_com_err" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_com_err" >&5
+$as_echo "$ac_cv_search_com_err" >&6; }
 ac_res=$ac_cv_search_com_err
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: could not find function 'com_err' required for Kerberos 5" >&5
-echo "$as_me: error: could not find function 'com_err' required for Kerberos 5" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: could not find function 'com_err' required for Kerberos 5" >&5
+$as_echo "$as_me: error: could not find function 'com_err' required for Kerberos 5" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -8493,10 +8681,10 @@ fi
 if test "$with_openssl" = yes ; then
     if test "$PORTNAME" != "win32"; then
 
-{ echo "$as_me:$LINENO: checking for CRYPTO_new_ex_data in -lcrypto" >&5
-echo $ECHO_N "checking for CRYPTO_new_ex_data in -lcrypto... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for CRYPTO_new_ex_data in -lcrypto" >&5
+$as_echo_n "checking for CRYPTO_new_ex_data in -lcrypto... " >&6; }
 if test "${ac_cv_lib_crypto_CRYPTO_new_ex_data+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypto  $LIBS"
@@ -8528,33 +8716,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_crypto_CRYPTO_new_ex_data=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_crypto_CRYPTO_new_ex_data=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_new_ex_data" >&5
-echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_new_ex_data" >&6; }
-if test $ac_cv_lib_crypto_CRYPTO_new_ex_data = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_new_ex_data" >&5
+$as_echo "$ac_cv_lib_crypto_CRYPTO_new_ex_data" >&6; }
+if test "x$ac_cv_lib_crypto_CRYPTO_new_ex_data" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBCRYPTO 1
 _ACEOF
@@ -8562,16 +8754,16 @@ _ACEOF
   LIBS="-lcrypto $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: library 'crypto' is required for OpenSSL" >&5
-echo "$as_me: error: library 'crypto' is required for OpenSSL" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: library 'crypto' is required for OpenSSL" >&5
+$as_echo "$as_me: error: library 'crypto' is required for OpenSSL" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-{ echo "$as_me:$LINENO: checking for SSL_library_init in -lssl" >&5
-echo $ECHO_N "checking for SSL_library_init in -lssl... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for SSL_library_init in -lssl" >&5
+$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
 if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lssl  $LIBS"
@@ -8603,33 +8795,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ssl_SSL_library_init=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ssl_SSL_library_init=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_library_init" >&5
-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_library_init" >&6; }
-if test $ac_cv_lib_ssl_SSL_library_init = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_library_init" >&5
+$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
+if test "x$ac_cv_lib_ssl_SSL_library_init" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSSL 1
 _ACEOF
@@ -8637,17 +8833,17 @@ _ACEOF
   LIBS="-lssl $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: library 'ssl' is required for OpenSSL" >&5
-echo "$as_me: error: library 'ssl' is required for OpenSSL" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: library 'ssl' is required for OpenSSL" >&5
+$as_echo "$as_me: error: library 'ssl' is required for OpenSSL" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
   else
 
-{ echo "$as_me:$LINENO: checking for CRYPTO_new_ex_data in -leay32" >&5
-echo $ECHO_N "checking for CRYPTO_new_ex_data in -leay32... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for CRYPTO_new_ex_data in -leay32" >&5
+$as_echo_n "checking for CRYPTO_new_ex_data in -leay32... " >&6; }
 if test "${ac_cv_lib_eay32_CRYPTO_new_ex_data+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-leay32  $LIBS"
@@ -8679,33 +8875,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_eay32_CRYPTO_new_ex_data=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_eay32_CRYPTO_new_ex_data=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_eay32_CRYPTO_new_ex_data" >&5
-echo "${ECHO_T}$ac_cv_lib_eay32_CRYPTO_new_ex_data" >&6; }
-if test $ac_cv_lib_eay32_CRYPTO_new_ex_data = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_eay32_CRYPTO_new_ex_data" >&5
+$as_echo "$ac_cv_lib_eay32_CRYPTO_new_ex_data" >&6; }
+if test "x$ac_cv_lib_eay32_CRYPTO_new_ex_data" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBEAY32 1
 _ACEOF
@@ -8713,16 +8913,16 @@ _ACEOF
   LIBS="-leay32 $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: library 'eay32' is required for OpenSSL" >&5
-echo "$as_me: error: library 'eay32' is required for OpenSSL" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: library 'eay32' is required for OpenSSL" >&5
+$as_echo "$as_me: error: library 'eay32' is required for OpenSSL" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-{ echo "$as_me:$LINENO: checking for SSL_library_init in -lssleay32" >&5
-echo $ECHO_N "checking for SSL_library_init in -lssleay32... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for SSL_library_init in -lssleay32" >&5
+$as_echo_n "checking for SSL_library_init in -lssleay32... " >&6; }
 if test "${ac_cv_lib_ssleay32_SSL_library_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lssleay32  $LIBS"
@@ -8754,33 +8954,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ssleay32_SSL_library_init=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ssleay32_SSL_library_init=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssleay32_SSL_library_init" >&5
-echo "${ECHO_T}$ac_cv_lib_ssleay32_SSL_library_init" >&6; }
-if test $ac_cv_lib_ssleay32_SSL_library_init = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ssleay32_SSL_library_init" >&5
+$as_echo "$ac_cv_lib_ssleay32_SSL_library_init" >&6; }
+if test "x$ac_cv_lib_ssleay32_SSL_library_init" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSSLEAY32 1
 _ACEOF
@@ -8788,8 +8992,8 @@ _ACEOF
   LIBS="-lssleay32 $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: library 'ssleay32' is required for OpenSSL" >&5
-echo "$as_me: error: library 'ssleay32' is required for OpenSSL" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: library 'ssleay32' is required for OpenSSL" >&5
+$as_echo "$as_me: error: library 'ssleay32' is required for OpenSSL" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -8798,10 +9002,10 @@ fi
 
 if test "$with_pam" = yes ; then
 
-{ echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
-echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
+$as_echo_n "checking for pam_start in -lpam... " >&6; }
 if test "${ac_cv_lib_pam_pam_start+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpam  $LIBS"
@@ -8833,33 +9037,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_pam_pam_start=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_pam_pam_start=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
-echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6; }
-if test $ac_cv_lib_pam_pam_start = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
+$as_echo "$ac_cv_lib_pam_pam_start" >&6; }
+if test "x$ac_cv_lib_pam_pam_start" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPAM 1
 _ACEOF
@@ -8867,8 +9075,8 @@ _ACEOF
   LIBS="-lpam $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: library 'pam' is required for PAM" >&5
-echo "$as_me: error: library 'pam' is required for PAM" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: library 'pam' is required for PAM" >&5
+$as_echo "$as_me: error: library 'pam' is required for PAM" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -8876,10 +9084,10 @@ fi
 
 if test "$with_libxml" = yes ; then
 
-{ echo "$as_me:$LINENO: checking for xmlSaveToBuffer in -lxml2" >&5
-echo $ECHO_N "checking for xmlSaveToBuffer in -lxml2... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for xmlSaveToBuffer in -lxml2" >&5
+$as_echo_n "checking for xmlSaveToBuffer in -lxml2... " >&6; }
 if test "${ac_cv_lib_xml2_xmlSaveToBuffer+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lxml2  $LIBS"
@@ -8911,33 +9119,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_xml2_xmlSaveToBuffer=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_xml2_xmlSaveToBuffer=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlSaveToBuffer" >&5
-echo "${ECHO_T}$ac_cv_lib_xml2_xmlSaveToBuffer" >&6; }
-if test $ac_cv_lib_xml2_xmlSaveToBuffer = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlSaveToBuffer" >&5
+$as_echo "$ac_cv_lib_xml2_xmlSaveToBuffer" >&6; }
+if test "x$ac_cv_lib_xml2_xmlSaveToBuffer" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXML2 1
 _ACEOF
@@ -8945,8 +9157,8 @@ _ACEOF
   LIBS="-lxml2 $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: library 'xml2' (version >= 2.6.23) is required for XML support" >&5
-echo "$as_me: error: library 'xml2' (version >= 2.6.23) is required for XML support" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: library 'xml2' (version >= 2.6.23) is required for XML support" >&5
+$as_echo "$as_me: error: library 'xml2' (version >= 2.6.23) is required for XML support" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -8954,10 +9166,10 @@ fi
 
 if test "$with_libxslt" = yes ; then
 
-{ echo "$as_me:$LINENO: checking for xsltCleanupGlobals in -lxslt" >&5
-echo $ECHO_N "checking for xsltCleanupGlobals in -lxslt... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for xsltCleanupGlobals in -lxslt" >&5
+$as_echo_n "checking for xsltCleanupGlobals in -lxslt... " >&6; }
 if test "${ac_cv_lib_xslt_xsltCleanupGlobals+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lxslt  $LIBS"
@@ -8989,33 +9201,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_xslt_xsltCleanupGlobals=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_xslt_xsltCleanupGlobals=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_xslt_xsltCleanupGlobals" >&5
-echo "${ECHO_T}$ac_cv_lib_xslt_xsltCleanupGlobals" >&6; }
-if test $ac_cv_lib_xslt_xsltCleanupGlobals = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xslt_xsltCleanupGlobals" >&5
+$as_echo "$ac_cv_lib_xslt_xsltCleanupGlobals" >&6; }
+if test "x$ac_cv_lib_xslt_xsltCleanupGlobals" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXSLT 1
 _ACEOF
@@ -9023,8 +9239,8 @@ _ACEOF
   LIBS="-lxslt $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: library 'xslt' is required for XSLT support" >&5
-echo "$as_me: error: library 'xslt' is required for XSLT support" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: library 'xslt' is required for XSLT support" >&5
+$as_echo "$as_me: error: library 'xslt' is required for XSLT support" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -9032,10 +9248,10 @@ fi
 
 # for contrib/uuid-ossp
 if test "$with_ossp_uuid" = yes ; then
-  { echo "$as_me:$LINENO: checking for uuid_export in -lossp-uuid" >&5
-echo $ECHO_N "checking for uuid_export in -lossp-uuid... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for uuid_export in -lossp-uuid" >&5
+$as_echo_n "checking for uuid_export in -lossp-uuid... " >&6; }
 if test "${ac_cv_lib_ossp_uuid_uuid_export+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lossp-uuid  $LIBS"
@@ -9067,39 +9283,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ossp_uuid_uuid_export=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ossp_uuid_uuid_export=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ossp_uuid_uuid_export" >&5
-echo "${ECHO_T}$ac_cv_lib_ossp_uuid_uuid_export" >&6; }
-if test $ac_cv_lib_ossp_uuid_uuid_export = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ossp_uuid_uuid_export" >&5
+$as_echo "$ac_cv_lib_ossp_uuid_uuid_export" >&6; }
+if test "x$ac_cv_lib_ossp_uuid_uuid_export" = x""yes; then
   OSSP_UUID_LIBS="-lossp-uuid"
 else
-  { echo "$as_me:$LINENO: checking for uuid_export in -luuid" >&5
-echo $ECHO_N "checking for uuid_export in -luuid... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for uuid_export in -luuid" >&5
+$as_echo_n "checking for uuid_export in -luuid... " >&6; }
 if test "${ac_cv_lib_uuid_uuid_export+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-luuid  $LIBS"
@@ -9131,37 +9351,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_uuid_uuid_export=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_uuid_uuid_export=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_uuid_uuid_export" >&5
-echo "${ECHO_T}$ac_cv_lib_uuid_uuid_export" >&6; }
-if test $ac_cv_lib_uuid_uuid_export = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_uuid_uuid_export" >&5
+$as_echo "$ac_cv_lib_uuid_uuid_export" >&6; }
+if test "x$ac_cv_lib_uuid_uuid_export" = x""yes; then
   OSSP_UUID_LIBS="-luuid"
 else
-  { { echo "$as_me:$LINENO: error: library 'ossp-uuid' or 'uuid' is required for OSSP-UUID" >&5
-echo "$as_me: error: library 'ossp-uuid' or 'uuid' is required for OSSP-UUID" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: library 'ossp-uuid' or 'uuid' is required for OSSP-UUID" >&5
+$as_echo "$as_me: error: library 'ossp-uuid' or 'uuid' is required for OSSP-UUID" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -9175,10 +9399,10 @@ fi
 ## Header files
 ##
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9205,20 +9429,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -9310,37 +9535,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -9362,11 +9590,11 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9384,20 +9612,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -9405,12 +9634,15 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -9445,22 +9677,26 @@ done
 
 
 
-for ac_header in crypt.h dld.h fp_class.h getopt.h ieeefp.h langinfo.h poll.h pwd.h sys/ipc.h sys/poll.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/tas.h sys/time.h sys/un.h termios.h ucred.h utime.h wchar.h wctype.h kernel/OS.h kernel/image.h SupportDefs.h
+
+
+
+for ac_header in crypt.h dld.h fp_class.h getopt.h ieeefp.h ifaddrs.h langinfo.h poll.h pwd.h sys/ioctl.h sys/ipc.h sys/poll.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/socket.h sys/sockio.h sys/tas.h sys/time.h sys/un.h termios.h ucred.h utime.h wchar.h wctype.h kernel/OS.h kernel/image.h SupportDefs.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9476,32 +9712,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9515,51 +9752,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -9568,21 +9806,93 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+# On BSD, cpp test for net/if.h will fail unless sys/socket.h
+# is included first.
+
+for ac_header in net/if.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -9595,20 +9905,21 @@ done
 
 for ac_header in netinet/in.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9624,32 +9935,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9663,51 +9975,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -9716,21 +10029,24 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -9740,11 +10056,11 @@ done
 
 for ac_header in netinet/tcp.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9766,20 +10082,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -9787,12 +10104,15 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -9804,20 +10124,21 @@ if expr x"$pgac_cv_check_readline" : 'x-lreadline' >/dev/null ; then
 
 for ac_header in readline/readline.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9833,32 +10154,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9872,51 +10194,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -9925,41 +10248,45 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
 
 for ac_header in readline.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9975,32 +10302,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -10014,51 +10342,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -10067,29 +10396,32 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  { { echo "$as_me:$LINENO: error: readline header not found
+  { { $as_echo "$as_me:$LINENO: error: readline header not found
 If you have readline already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-readline to disable readline support." >&5
-echo "$as_me: error: readline header not found
+$as_echo "$as_me: error: readline header not found
 If you have readline already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-readline to disable readline support." >&2;}
@@ -10105,20 +10437,21 @@ done
 
 for ac_header in readline/history.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -10134,32 +10467,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -10173,51 +10507,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -10226,41 +10561,45 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
 
 for ac_header in history.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -10276,32 +10615,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -10315,51 +10655,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -10368,29 +10709,32 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  { { echo "$as_me:$LINENO: error: history header not found
+  { { $as_echo "$as_me:$LINENO: error: history header not found
 If you have readline already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-readline to disable readline support." >&5
-echo "$as_me: error: history header not found
+$as_echo "$as_me: error: history header not found
 If you have readline already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-readline to disable readline support." >&2;}
@@ -10413,20 +10757,21 @@ if expr x"$pgac_cv_check_readline" : 'x-ledit' >/dev/null ; then
 
 for ac_header in editline/readline.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -10442,32 +10787,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -10481,51 +10827,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -10534,41 +10881,45 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
 
 for ac_header in readline.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -10584,32 +10935,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -10623,51 +10975,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -10676,41 +11029,45 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
 
 for ac_header in readline/readline.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -10726,32 +11083,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -10765,51 +11123,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -10818,29 +11177,32 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  { { echo "$as_me:$LINENO: error: readline header not found
+  { { $as_echo "$as_me:$LINENO: error: readline header not found
 If you have libedit already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-readline to disable libedit support." >&5
-echo "$as_me: error: readline header not found
+$as_echo "$as_me: error: readline header not found
 If you have libedit already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-readline to disable libedit support." >&2;}
@@ -10863,20 +11225,21 @@ done
 
 for ac_header in editline/history.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -10892,32 +11255,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -10931,51 +11295,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -10984,41 +11349,45 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
 
 for ac_header in history.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11034,32 +11403,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11073,51 +11443,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -11126,41 +11497,45 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
 
 for ac_header in readline/history.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11176,32 +11551,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11215,51 +11591,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -11268,21 +11645,24 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -11301,17 +11681,17 @@ fi
 
 if test "$with_zlib" = yes; then
   if test "${ac_cv_header_zlib_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for zlib.h" >&5
-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
+$as_echo_n "checking for zlib.h... " >&6; }
 if test "${ac_cv_header_zlib_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+$as_echo "$ac_cv_header_zlib_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking zlib.h usability" >&5
-echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking zlib.h usability" >&5
+$as_echo_n "checking zlib.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11327,32 +11707,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking zlib.h presence" >&5
-echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking zlib.h presence" >&5
+$as_echo_n "checking zlib.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11366,51 +11747,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zlib.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: zlib.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: zlib.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -11419,25 +11801,25 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for zlib.h" >&5
-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
+$as_echo_n "checking for zlib.h... " >&6; }
 if test "${ac_cv_header_zlib_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_zlib_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+$as_echo "$ac_cv_header_zlib_h" >&6; }
 
 fi
-if test $ac_cv_header_zlib_h = yes; then
+if test "x$ac_cv_header_zlib_h" = x""yes; then
   :
 else
-  { { echo "$as_me:$LINENO: error: zlib header not found
+  { { $as_echo "$as_me:$LINENO: error: zlib header not found
 If you have zlib already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-zlib to disable zlib support." >&5
-echo "$as_me: error: zlib header not found
+$as_echo "$as_me: error: zlib header not found
 If you have zlib already installed, see config.log for details on the
 failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-zlib to disable zlib support." >&2;}
@@ -11451,20 +11833,21 @@ if test "$with_gssapi" = yes ; then
 
 for ac_header in gssapi/gssapi.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11480,32 +11863,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11519,51 +11903,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -11572,41 +11957,45 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
 
 for ac_header in gssapi.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11622,32 +12011,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11661,51 +12051,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -11714,26 +12105,29 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  { { echo "$as_me:$LINENO: error: gssapi.h header file is required for GSSAPI" >&5
-echo "$as_me: error: gssapi.h header file is required for GSSAPI" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: gssapi.h header file is required for GSSAPI" >&5
+$as_echo "$as_me: error: gssapi.h header file is required for GSSAPI" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -11747,17 +12141,17 @@ fi
 
 if test "$with_krb5" = yes ; then
   if test "${ac_cv_header_krb5_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for krb5.h" >&5
-echo $ECHO_N "checking for krb5.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for krb5.h" >&5
+$as_echo_n "checking for krb5.h... " >&6; }
 if test "${ac_cv_header_krb5_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_krb5_h" >&5
-echo "${ECHO_T}$ac_cv_header_krb5_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_krb5_h" >&5
+$as_echo "$ac_cv_header_krb5_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking krb5.h usability" >&5
-echo $ECHO_N "checking krb5.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking krb5.h usability" >&5
+$as_echo_n "checking krb5.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11773,32 +12167,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking krb5.h presence" >&5
-echo $ECHO_N "checking krb5.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking krb5.h presence" >&5
+$as_echo_n "checking krb5.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11812,51 +12207,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: krb5.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: krb5.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: krb5.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: krb5.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: krb5.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: krb5.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: krb5.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: krb5.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: krb5.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: krb5.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: krb5.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: krb5.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: krb5.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: krb5.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: krb5.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: krb5.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: krb5.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: krb5.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: krb5.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: krb5.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: krb5.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: krb5.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: krb5.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: krb5.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: krb5.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: krb5.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: krb5.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: krb5.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: krb5.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: krb5.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: krb5.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: krb5.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -11865,22 +12261,22 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for krb5.h" >&5
-echo $ECHO_N "checking for krb5.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for krb5.h" >&5
+$as_echo_n "checking for krb5.h... " >&6; }
 if test "${ac_cv_header_krb5_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_krb5_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_krb5_h" >&5
-echo "${ECHO_T}$ac_cv_header_krb5_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_krb5_h" >&5
+$as_echo "$ac_cv_header_krb5_h" >&6; }
 
 fi
-if test $ac_cv_header_krb5_h = yes; then
+if test "x$ac_cv_header_krb5_h" = x""yes; then
   :
 else
-  { { echo "$as_me:$LINENO: error: header file <krb5.h> is required for Kerberos 5" >&5
-echo "$as_me: error: header file <krb5.h> is required for Kerberos 5" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: header file <krb5.h> is required for Kerberos 5" >&5
+$as_echo "$as_me: error: header file <krb5.h> is required for Kerberos 5" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -11889,17 +12285,17 @@ fi
 
 if test "$with_openssl" = yes ; then
   if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
-echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
+$as_echo_n "checking for openssl/ssl.h... " >&6; }
 if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
-echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
+$as_echo "$ac_cv_header_openssl_ssl_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking openssl/ssl.h usability" >&5
-echo $ECHO_N "checking openssl/ssl.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking openssl/ssl.h usability" >&5
+$as_echo_n "checking openssl/ssl.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11915,32 +12311,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking openssl/ssl.h presence" >&5
-echo $ECHO_N "checking openssl/ssl.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking openssl/ssl.h presence" >&5
+$as_echo_n "checking openssl/ssl.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11954,51 +12351,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: openssl/ssl.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: openssl/ssl.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: openssl/ssl.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: openssl/ssl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/ssl.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: openssl/ssl.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/ssl.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: openssl/ssl.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/ssl.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: openssl/ssl.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/ssl.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: openssl/ssl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -12007,38 +12405,38 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
-echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
+$as_echo_n "checking for openssl/ssl.h... " >&6; }
 if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_openssl_ssl_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
-echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
+$as_echo "$ac_cv_header_openssl_ssl_h" >&6; }
 
 fi
-if test $ac_cv_header_openssl_ssl_h = yes; then
+if test "x$ac_cv_header_openssl_ssl_h" = x""yes; then
   :
 else
-  { { echo "$as_me:$LINENO: error: header file <openssl/ssl.h> is required for OpenSSL" >&5
-echo "$as_me: error: header file <openssl/ssl.h> is required for OpenSSL" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: header file <openssl/ssl.h> is required for OpenSSL" >&5
+$as_echo "$as_me: error: header file <openssl/ssl.h> is required for OpenSSL" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
   if test "${ac_cv_header_openssl_err_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for openssl/err.h" >&5
-echo $ECHO_N "checking for openssl/err.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for openssl/err.h" >&5
+$as_echo_n "checking for openssl/err.h... " >&6; }
 if test "${ac_cv_header_openssl_err_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_err_h" >&5
-echo "${ECHO_T}$ac_cv_header_openssl_err_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_openssl_err_h" >&5
+$as_echo "$ac_cv_header_openssl_err_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking openssl/err.h usability" >&5
-echo $ECHO_N "checking openssl/err.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking openssl/err.h usability" >&5
+$as_echo_n "checking openssl/err.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12054,32 +12452,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking openssl/err.h presence" >&5
-echo $ECHO_N "checking openssl/err.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking openssl/err.h presence" >&5
+$as_echo_n "checking openssl/err.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12093,51 +12492,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: openssl/err.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: openssl/err.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/err.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: openssl/err.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/err.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: openssl/err.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/err.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: openssl/err.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: openssl/err.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: openssl/err.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/err.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: openssl/err.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/err.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: openssl/err.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/err.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: openssl/err.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/err.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: openssl/err.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/err.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: openssl/err.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/err.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: openssl/err.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/err.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: openssl/err.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/err.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: openssl/err.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/err.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: openssl/err.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/err.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: openssl/err.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/err.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: openssl/err.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -12146,22 +12546,22 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for openssl/err.h" >&5
-echo $ECHO_N "checking for openssl/err.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for openssl/err.h" >&5
+$as_echo_n "checking for openssl/err.h... " >&6; }
 if test "${ac_cv_header_openssl_err_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_openssl_err_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_err_h" >&5
-echo "${ECHO_T}$ac_cv_header_openssl_err_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_openssl_err_h" >&5
+$as_echo "$ac_cv_header_openssl_err_h" >&6; }
 
 fi
-if test $ac_cv_header_openssl_err_h = yes; then
+if test "x$ac_cv_header_openssl_err_h" = x""yes; then
   :
 else
-  { { echo "$as_me:$LINENO: error: header file <openssl/err.h> is required for OpenSSL" >&5
-echo "$as_me: error: header file <openssl/err.h> is required for OpenSSL" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: header file <openssl/err.h> is required for OpenSSL" >&5
+$as_echo "$as_me: error: header file <openssl/err.h> is required for OpenSSL" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -12169,11 +12569,11 @@ fi
 
 for ac_func in ERR_set_mark
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -12226,35 +12626,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -12266,20 +12673,21 @@ if test "$with_pam" = yes ; then
 
 for ac_header in security/pam_appl.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12295,32 +12703,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12334,51 +12743,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -12387,41 +12797,45 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
 
 for ac_header in pam/pam_appl.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12437,32 +12851,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12476,51 +12891,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -12529,26 +12945,29 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  { { echo "$as_me:$LINENO: error: header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM." >&5
-echo "$as_me: error: header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM." >&2;}
+  { { $as_echo "$as_me:$LINENO: error: header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM." >&5
+$as_echo "$as_me: error: header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -12562,17 +12981,17 @@ fi
 
 if test "$with_libxml" = yes ; then
   if test "${ac_cv_header_libxml_parser_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for libxml/parser.h" >&5
-echo $ECHO_N "checking for libxml/parser.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for libxml/parser.h" >&5
+$as_echo_n "checking for libxml/parser.h... " >&6; }
 if test "${ac_cv_header_libxml_parser_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_libxml_parser_h" >&5
-echo "${ECHO_T}$ac_cv_header_libxml_parser_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libxml_parser_h" >&5
+$as_echo "$ac_cv_header_libxml_parser_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking libxml/parser.h usability" >&5
-echo $ECHO_N "checking libxml/parser.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking libxml/parser.h usability" >&5
+$as_echo_n "checking libxml/parser.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12588,32 +13007,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking libxml/parser.h presence" >&5
-echo $ECHO_N "checking libxml/parser.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking libxml/parser.h presence" >&5
+$as_echo_n "checking libxml/parser.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12627,51 +13047,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: libxml/parser.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: libxml/parser.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libxml/parser.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: libxml/parser.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libxml/parser.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: libxml/parser.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libxml/parser.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: libxml/parser.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: libxml/parser.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: libxml/parser.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libxml/parser.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: libxml/parser.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libxml/parser.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: libxml/parser.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libxml/parser.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: libxml/parser.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libxml/parser.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: libxml/parser.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libxml/parser.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: libxml/parser.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libxml/parser.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: libxml/parser.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libxml/parser.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: libxml/parser.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libxml/parser.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: libxml/parser.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libxml/parser.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: libxml/parser.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libxml/parser.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: libxml/parser.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libxml/parser.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: libxml/parser.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -12680,22 +13101,22 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for libxml/parser.h" >&5
-echo $ECHO_N "checking for libxml/parser.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for libxml/parser.h" >&5
+$as_echo_n "checking for libxml/parser.h... " >&6; }
 if test "${ac_cv_header_libxml_parser_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_libxml_parser_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_libxml_parser_h" >&5
-echo "${ECHO_T}$ac_cv_header_libxml_parser_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libxml_parser_h" >&5
+$as_echo "$ac_cv_header_libxml_parser_h" >&6; }
 
 fi
-if test $ac_cv_header_libxml_parser_h = yes; then
+if test "x$ac_cv_header_libxml_parser_h" = x""yes; then
   :
 else
-  { { echo "$as_me:$LINENO: error: header file <libxml/parser.h> is required for XML support" >&5
-echo "$as_me: error: header file <libxml/parser.h> is required for XML support" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: header file <libxml/parser.h> is required for XML support" >&5
+$as_echo "$as_me: error: header file <libxml/parser.h> is required for XML support" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -12704,17 +13125,17 @@ fi
 
 if test "$with_libxslt" = yes ; then
   if test "${ac_cv_header_libxslt_xslt_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for libxslt/xslt.h" >&5
-echo $ECHO_N "checking for libxslt/xslt.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for libxslt/xslt.h" >&5
+$as_echo_n "checking for libxslt/xslt.h... " >&6; }
 if test "${ac_cv_header_libxslt_xslt_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_libxslt_xslt_h" >&5
-echo "${ECHO_T}$ac_cv_header_libxslt_xslt_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libxslt_xslt_h" >&5
+$as_echo "$ac_cv_header_libxslt_xslt_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking libxslt/xslt.h usability" >&5
-echo $ECHO_N "checking libxslt/xslt.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking libxslt/xslt.h usability" >&5
+$as_echo_n "checking libxslt/xslt.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12730,32 +13151,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking libxslt/xslt.h presence" >&5
-echo $ECHO_N "checking libxslt/xslt.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking libxslt/xslt.h presence" >&5
+$as_echo_n "checking libxslt/xslt.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12769,51 +13191,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: libxslt/xslt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: libxslt/xslt.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: libxslt/xslt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: libxslt/xslt.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: libxslt/xslt.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: libxslt/xslt.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: libxslt/xslt.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: libxslt/xslt.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: libxslt/xslt.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: libxslt/xslt.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: libxslt/xslt.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libxslt/xslt.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: libxslt/xslt.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: libxslt/xslt.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libxslt/xslt.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: libxslt/xslt.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: libxslt/xslt.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: libxslt/xslt.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -12822,22 +13245,22 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for libxslt/xslt.h" >&5
-echo $ECHO_N "checking for libxslt/xslt.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for libxslt/xslt.h" >&5
+$as_echo_n "checking for libxslt/xslt.h... " >&6; }
 if test "${ac_cv_header_libxslt_xslt_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_libxslt_xslt_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_libxslt_xslt_h" >&5
-echo "${ECHO_T}$ac_cv_header_libxslt_xslt_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libxslt_xslt_h" >&5
+$as_echo "$ac_cv_header_libxslt_xslt_h" >&6; }
 
 fi
-if test $ac_cv_header_libxslt_xslt_h = yes; then
+if test "x$ac_cv_header_libxslt_xslt_h" = x""yes; then
   :
 else
-  { { echo "$as_me:$LINENO: error: header file <libxslt/xslt.h> is required for XSLT support" >&5
-echo "$as_me: error: header file <libxslt/xslt.h> is required for XSLT support" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: header file <libxslt/xslt.h> is required for XSLT support" >&5
+$as_echo "$as_me: error: header file <libxslt/xslt.h> is required for XSLT support" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -12849,20 +13272,21 @@ if test "$with_ldap" = yes ; then
 
 for ac_header in ldap.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12878,32 +13302,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12917,51 +13342,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -12970,26 +13396,29 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  { { echo "$as_me:$LINENO: error: header file <ldap.h> is required for LDAP" >&5
-echo "$as_me: error: header file <ldap.h> is required for LDAP" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: header file <ldap.h> is required for LDAP" >&5
+$as_echo "$as_me: error: header file <ldap.h> is required for LDAP" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -12999,11 +13428,11 @@ done
 
 for ac_header in winldap.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -13023,20 +13452,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -13044,17 +13474,20 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  { { echo "$as_me:$LINENO: error: header file <winldap.h> is required for LDAP" >&5
-echo "$as_me: error: header file <winldap.h> is required for LDAP" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: header file <winldap.h> is required for LDAP" >&5
+$as_echo "$as_me: error: header file <winldap.h> is required for LDAP" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -13064,18 +13497,18 @@ done
 fi
 
 if test "$with_bonjour" = yes ; then
-  if test "${ac_cv_header_DNSServiceDiscovery_DNSServiceDiscovery_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for DNSServiceDiscovery/DNSServiceDiscovery.h" >&5
-echo $ECHO_N "checking for DNSServiceDiscovery/DNSServiceDiscovery.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_DNSServiceDiscovery_DNSServiceDiscovery_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test "${ac_cv_header_dns_sd_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for dns_sd.h" >&5
+$as_echo_n "checking for dns_sd.h... " >&6; }
+if test "${ac_cv_header_dns_sd_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_DNSServiceDiscovery_DNSServiceDiscovery_h" >&5
-echo "${ECHO_T}$ac_cv_header_DNSServiceDiscovery_DNSServiceDiscovery_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_dns_sd_h" >&5
+$as_echo "$ac_cv_header_dns_sd_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking DNSServiceDiscovery/DNSServiceDiscovery.h usability" >&5
-echo $ECHO_N "checking DNSServiceDiscovery/DNSServiceDiscovery.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dns_sd.h usability" >&5
+$as_echo_n "checking dns_sd.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13083,7 +13516,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <DNSServiceDiscovery/DNSServiceDiscovery.h>
+#include <dns_sd.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -13091,90 +13524,92 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking DNSServiceDiscovery/DNSServiceDiscovery.h presence" >&5
-echo $ECHO_N "checking DNSServiceDiscovery/DNSServiceDiscovery.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dns_sd.h presence" >&5
+$as_echo_n "checking dns_sd.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <DNSServiceDiscovery/DNSServiceDiscovery.h>
+#include <dns_sd.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: DNSServiceDiscovery/DNSServiceDiscovery.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: DNSServiceDiscovery/DNSServiceDiscovery.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: DNSServiceDiscovery/DNSServiceDiscovery.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: DNSServiceDiscovery/DNSServiceDiscovery.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: dns_sd.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: dns_sd.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: dns_sd.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: dns_sd.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: DNSServiceDiscovery/DNSServiceDiscovery.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: DNSServiceDiscovery/DNSServiceDiscovery.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: DNSServiceDiscovery/DNSServiceDiscovery.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: DNSServiceDiscovery/DNSServiceDiscovery.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: DNSServiceDiscovery/DNSServiceDiscovery.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: DNSServiceDiscovery/DNSServiceDiscovery.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: DNSServiceDiscovery/DNSServiceDiscovery.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: DNSServiceDiscovery/DNSServiceDiscovery.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: DNSServiceDiscovery/DNSServiceDiscovery.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: DNSServiceDiscovery/DNSServiceDiscovery.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: DNSServiceDiscovery/DNSServiceDiscovery.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: DNSServiceDiscovery/DNSServiceDiscovery.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: dns_sd.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: dns_sd.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: dns_sd.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: dns_sd.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: dns_sd.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: dns_sd.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: dns_sd.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: dns_sd.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: dns_sd.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: dns_sd.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: dns_sd.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: dns_sd.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -13183,22 +13618,22 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for DNSServiceDiscovery/DNSServiceDiscovery.h" >&5
-echo $ECHO_N "checking for DNSServiceDiscovery/DNSServiceDiscovery.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_DNSServiceDiscovery_DNSServiceDiscovery_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking for dns_sd.h" >&5
+$as_echo_n "checking for dns_sd.h... " >&6; }
+if test "${ac_cv_header_dns_sd_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  ac_cv_header_DNSServiceDiscovery_DNSServiceDiscovery_h=$ac_header_preproc
+  ac_cv_header_dns_sd_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_DNSServiceDiscovery_DNSServiceDiscovery_h" >&5
-echo "${ECHO_T}$ac_cv_header_DNSServiceDiscovery_DNSServiceDiscovery_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_dns_sd_h" >&5
+$as_echo "$ac_cv_header_dns_sd_h" >&6; }
 
 fi
-if test $ac_cv_header_DNSServiceDiscovery_DNSServiceDiscovery_h = yes; then
+if test "x$ac_cv_header_dns_sd_h" = x""yes; then
   :
 else
-  { { echo "$as_me:$LINENO: error: header file <DNSServiceDiscovery/DNSServiceDiscovery.h> is required for Bonjour" >&5
-echo "$as_me: error: header file <DNSServiceDiscovery/DNSServiceDiscovery.h> is required for Bonjour" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: header file <dns_sd.h> is required for Bonjour" >&5
+$as_echo "$as_me: error: header file <dns_sd.h> is required for Bonjour" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -13210,20 +13645,21 @@ if test "$with_ossp_uuid" = yes ; then
 
 for ac_header in ossp/uuid.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13239,32 +13675,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13278,51 +13715,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -13331,21 +13769,24 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
@@ -13353,20 +13794,21 @@ else
 
 for ac_header in uuid.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13382,32 +13824,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13421,51 +13864,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -13474,26 +13918,29 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  { { echo "$as_me:$LINENO: error: header file <ossp/uuid.h> or <uuid.h> is required for OSSP-UUID" >&5
-echo "$as_me: error: header file <ossp/uuid.h> or <uuid.h> is required for OSSP-UUID" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: header file <ossp/uuid.h> or <uuid.h> is required for OSSP-UUID" >&5
+$as_echo "$as_me: error: header file <ossp/uuid.h> or <uuid.h> is required for OSSP-UUID" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -13510,28 +13957,78 @@ fi
 ## Types, structures, compiler characteristics
 ##
 
- { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+
+ { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  # See if sys/param.h defines the BYTE_ORDER macro.
-cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are some -arch flags.  Note that *ppc* also matches
+	# ppc64.  This check is also rather less than ideal.
+	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
+	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
+	esac
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+	     #include <sys/param.h>
 
 int
 main ()
 {
-#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
- bogus endian macros
-#endif
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
 
   ;
   return 0;
@@ -13543,33 +14040,34 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
-cat >conftest.$ac_ext <<_ACEOF
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+		#include <sys/param.h>
 
 int
 main ()
 {
 #if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
+		 not big endian
+		#endif
 
   ;
   return 0;
@@ -13581,20 +14079,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_bigendian=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_bigendian=no
@@ -13602,29 +14101,31 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	# It does not; compile a test program.
-if test "$cross_compiling" = yes; then
-  # try to guess the endianness by grepping values into an object file
-  ac_cv_c_bigendian=unknown
-  cat >conftest.$ac_ext <<_ACEOF
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+#include <limits.h>
+
 int
 main ()
 {
- _ascii (); _ebcdic ();
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
   ;
   return 0;
 }
@@ -13635,30 +14136,139 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
   ac_cv_c_bigendian=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c_bigendian=no
 fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$ac_cv_c_bigendian" = unknown; then
-    ac_cv_c_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    ac_cv_c_bigendian=unknown
-  fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then
+  # Try to guess by grepping values from an object file.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -13677,14 +14287,14 @@ int
 main ()
 {
 
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long int l;
-    char c[sizeof (long int)];
-  } u;
-  u.l = 1;
-  return u.c[sizeof (long int) - 1] == 1;
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
 
   ;
   return 0;
@@ -13696,60 +14306,67 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=no
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_c_bigendian=yes
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
+    fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
-case $ac_cv_c_bigendian in
-  yes)
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     cat >>confdefs.h <<\_ACEOF
+#define WORDS_BIGENDIAN 1
+_ACEOF
+;; #(
+   no)
+      ;; #(
+   universal)
 
 cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
+#define AC_APPLE_UNIVERSAL_BUILD 1
 _ACEOF
- ;;
-  no)
-     ;;
-  *)
-    { { echo "$as_me:$LINENO: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+
+     ;; #(
+   *)
+     { { $as_echo "$as_me:$LINENO: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+$as_echo "$as_me: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
    { (exit 1); exit 1; }; } ;;
-esac
+ esac
 
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -13821,20 +14438,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_const=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_const=no
@@ -13842,20 +14460,20 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
 cat >>confdefs.h <<\_ACEOF
-#define const
+#define const /**/
 _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
 if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
@@ -13878,20 +14496,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_inline=$ac_kw
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -13902,8 +14521,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
 
 
 case $ac_cv_c_inline in
@@ -13921,10 +14540,79 @@ _ACEOF
     ;;
 esac
 
-{ echo "$as_me:$LINENO: checking for preprocessor stringizing operator" >&5
-echo $ECHO_N "checking for preprocessor stringizing operator... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for quiet inline (no complaint if unreferenced)" >&5
+$as_echo_n "checking for quiet inline (no complaint if unreferenced)... " >&6; }
+if test "${pgac_cv_c_inline_quietly+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  pgac_cv_c_inline_quietly=no
+  if test "$ac_cv_c_inline" != no; then
+    pgac_c_inline_save_werror=$ac_c_werror_flag
+    ac_c_werror_flag=yes
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+static inline int fun () {return 0;}
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  pgac_cv_c_inline_quietly=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+    ac_c_werror_flag=$pgac_c_inline_save_werror
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $pgac_cv_c_inline_quietly" >&5
+$as_echo "$pgac_cv_c_inline_quietly" >&6; }
+if test "$pgac_cv_c_inline_quietly" != no; then
+
+cat >>confdefs.h <<_ACEOF
+#define USE_INLINE 1
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for preprocessor stringizing operator" >&5
+$as_echo_n "checking for preprocessor stringizing operator... " >&6; }
 if test "${ac_cv_c_stringize+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -13945,8 +14633,8 @@ fi
 rm -f conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_stringize" >&5
-echo "${ECHO_T}$ac_cv_c_stringize" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stringize" >&5
+$as_echo "$ac_cv_c_stringize" >&6; }
 if test $ac_cv_c_stringize = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -13955,10 +14643,10 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for signed types" >&5
-echo $ECHO_N "checking for signed types... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for signed types" >&5
+$as_echo_n "checking for signed types... " >&6; }
 if test "${pgac_cv_c_signed+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -13981,20 +14669,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   pgac_cv_c_signed=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	pgac_cv_c_signed=no
@@ -14002,19 +14691,19 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $pgac_cv_c_signed" >&5
-echo "${ECHO_T}$pgac_cv_c_signed" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $pgac_cv_c_signed" >&5
+$as_echo "$pgac_cv_c_signed" >&6; }
 if test x"$pgac_cv_c_signed" = xno ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define signed
+#define signed /**/
 _ACEOF
 
 fi
-{ echo "$as_me:$LINENO: checking for working volatile" >&5
-echo $ECHO_N "checking for working volatile... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for working volatile" >&5
+$as_echo_n "checking for working volatile... " >&6; }
 if test "${ac_cv_c_volatile+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -14040,20 +14729,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_volatile=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_volatile=no
@@ -14061,20 +14751,20 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
-echo "${ECHO_T}$ac_cv_c_volatile" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
+$as_echo "$ac_cv_c_volatile" >&6; }
 if test $ac_cv_c_volatile = no; then
 
 cat >>confdefs.h <<\_ACEOF
-#define volatile
+#define volatile /**/
 _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for __func__" >&5
-echo $ECHO_N "checking for __func__... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for __func__" >&5
+$as_echo_n "checking for __func__... " >&6; }
 if test "${pgac_cv_funcname_func_support+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -14097,20 +14787,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   pgac_cv_funcname_func_support=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	pgac_cv_funcname_func_support=no
@@ -14118,8 +14809,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $pgac_cv_funcname_func_support" >&5
-echo "${ECHO_T}$pgac_cv_funcname_func_support" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $pgac_cv_funcname_func_support" >&5
+$as_echo "$pgac_cv_funcname_func_support" >&6; }
 if test x"$pgac_cv_funcname_func_support" = xyes ; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -14127,10 +14818,10 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 else
-{ echo "$as_me:$LINENO: checking for __FUNCTION__" >&5
-echo $ECHO_N "checking for __FUNCTION__... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for __FUNCTION__" >&5
+$as_echo_n "checking for __FUNCTION__... " >&6; }
 if test "${pgac_cv_funcname_function_support+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -14153,20 +14844,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   pgac_cv_funcname_function_support=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	pgac_cv_funcname_function_support=no
@@ -14174,8 +14866,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $pgac_cv_funcname_function_support" >&5
-echo "${ECHO_T}$pgac_cv_funcname_function_support" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $pgac_cv_funcname_function_support" >&5
+$as_echo "$pgac_cv_funcname_function_support" >&6; }
 if test x"$pgac_cv_funcname_function_support" = xyes ; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -14184,10 +14876,10 @@ _ACEOF
 
 fi
 fi
-{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
 if test "${ac_cv_struct_tm+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -14203,7 +14895,7 @@ main ()
 {
 struct tm tm;
 				     int *p = &tm.tm_sec;
- 				     return !p;
+				     return !p;
   ;
   return 0;
 }
@@ -14214,20 +14906,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_struct_tm=time.h
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_struct_tm=sys/time.h
@@ -14235,8 +14928,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
+$as_echo "$ac_cv_struct_tm" >&6; }
 if test $ac_cv_struct_tm = sys/time.h; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -14245,10 +14938,10 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
-echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
+$as_echo_n "checking for struct tm.tm_zone... " >&6; }
 if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -14276,20 +14969,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_tm_tm_zone=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -14318,20 +15012,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_tm_tm_zone=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_tm_tm_zone=no
@@ -14342,9 +15037,9 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
-echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6; }
-if test $ac_cv_member_struct_tm_tm_zone = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
+$as_echo "$ac_cv_member_struct_tm_tm_zone" >&6; }
+if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_TM_TM_ZONE 1
@@ -14360,10 +15055,10 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 fi
-{ echo "$as_me:$LINENO: checking for tzname" >&5
-echo $ECHO_N "checking for tzname... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for tzname" >&5
+$as_echo_n "checking for tzname... " >&6; }
 if test "${ac_cv_var_tzname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -14390,31 +15085,35 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_var_tzname=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_var_tzname=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
-echo "${ECHO_T}$ac_cv_var_tzname" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
+$as_echo "$ac_cv_var_tzname" >&6; }
 if test $ac_cv_var_tzname = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -14423,12 +15122,13 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for union semun" >&5
-echo $ECHO_N "checking for union semun... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for union semun" >&5
+$as_echo_n "checking for union semun... " >&6; }
 if test "${ac_cv_type_union_semun+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_union_semun=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14438,14 +15138,48 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <sys/ipc.h>
 #include <sys/sem.h>
 
-typedef union semun ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (union semun))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>
+
+int
+main ()
+{
+if (sizeof ((union semun)))
+	  return 0;
   ;
   return 0;
 }
@@ -14456,30 +15190,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_union_semun=yes
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_union_semun=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_union_semun=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_union_semun" >&5
-echo "${ECHO_T}$ac_cv_type_union_semun" >&6; }
-if test $ac_cv_type_union_semun = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_union_semun" >&5
+$as_echo "$ac_cv_type_union_semun" >&6; }
+if test "x$ac_cv_type_union_semun" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_UNION_SEMUN 1
@@ -14488,12 +15231,13 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for struct sockaddr_un" >&5
-echo $ECHO_N "checking for struct sockaddr_un... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_un" >&5
+$as_echo_n "checking for struct sockaddr_un... " >&6; }
 if test "${ac_cv_type_struct_sockaddr_un+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_struct_sockaddr_un=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14505,14 +15249,50 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 
 
-typedef struct sockaddr_un ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (struct sockaddr_un))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+
+
+int
+main ()
+{
+if (sizeof ((struct sockaddr_un)))
+	  return 0;
   ;
   return 0;
 }
@@ -14523,30 +15303,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_struct_sockaddr_un=yes
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_struct_sockaddr_un=no
+	ac_cv_type_struct_sockaddr_un=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_un" >&5
-echo "${ECHO_T}$ac_cv_type_struct_sockaddr_un" >&6; }
-if test $ac_cv_type_struct_sockaddr_un = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_un" >&5
+$as_echo "$ac_cv_type_struct_sockaddr_un" >&6; }
+if test "x$ac_cv_type_struct_sockaddr_un" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SOCKADDR_UN 1
@@ -14559,12 +15348,13 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for struct sockaddr_storage" >&5
-echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_storage" >&5
+$as_echo_n "checking for struct sockaddr_storage... " >&6; }
 if test "${ac_cv_type_struct_sockaddr_storage+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_struct_sockaddr_storage=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14576,14 +15366,50 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 
 
-typedef struct sockaddr_storage ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (struct sockaddr_storage))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+
+int
+main ()
+{
+if (sizeof ((struct sockaddr_storage)))
+	  return 0;
   ;
   return 0;
 }
@@ -14594,30 +15420,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_struct_sockaddr_storage=yes
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_struct_sockaddr_storage=no
+	ac_cv_type_struct_sockaddr_storage=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_storage" >&5
-echo "${ECHO_T}$ac_cv_type_struct_sockaddr_storage" >&6; }
-if test $ac_cv_type_struct_sockaddr_storage = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_storage" >&5
+$as_echo "$ac_cv_type_struct_sockaddr_storage" >&6; }
+if test "x$ac_cv_type_struct_sockaddr_storage" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SOCKADDR_STORAGE 1
@@ -14626,10 +15461,10 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for struct sockaddr_storage.ss_family" >&5
-echo $ECHO_N "checking for struct sockaddr_storage.ss_family... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_storage.ss_family" >&5
+$as_echo_n "checking for struct sockaddr_storage.ss_family... " >&6; }
 if test "${ac_cv_member_struct_sockaddr_storage_ss_family+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -14659,20 +15494,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_sockaddr_storage_ss_family=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -14703,20 +15539,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_sockaddr_storage_ss_family=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_sockaddr_storage_ss_family=no
@@ -14727,9 +15564,9 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_storage_ss_family" >&5
-echo "${ECHO_T}$ac_cv_member_struct_sockaddr_storage_ss_family" >&6; }
-if test $ac_cv_member_struct_sockaddr_storage_ss_family = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_storage_ss_family" >&5
+$as_echo "$ac_cv_member_struct_sockaddr_storage_ss_family" >&6; }
+if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1
@@ -14737,10 +15574,10 @@ _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct sockaddr_storage.__ss_family" >&5
-echo $ECHO_N "checking for struct sockaddr_storage.__ss_family... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_storage.__ss_family" >&5
+$as_echo_n "checking for struct sockaddr_storage.__ss_family... " >&6; }
 if test "${ac_cv_member_struct_sockaddr_storage___ss_family+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -14770,20 +15607,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_sockaddr_storage___ss_family=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -14814,20 +15652,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_sockaddr_storage___ss_family=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_sockaddr_storage___ss_family=no
@@ -14838,9 +15677,9 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_storage___ss_family" >&5
-echo "${ECHO_T}$ac_cv_member_struct_sockaddr_storage___ss_family" >&6; }
-if test $ac_cv_member_struct_sockaddr_storage___ss_family = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_storage___ss_family" >&5
+$as_echo "$ac_cv_member_struct_sockaddr_storage___ss_family" >&6; }
+if test "x$ac_cv_member_struct_sockaddr_storage___ss_family" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY 1
@@ -14848,10 +15687,10 @@ _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct sockaddr_storage.ss_len" >&5
-echo $ECHO_N "checking for struct sockaddr_storage.ss_len... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_storage.ss_len" >&5
+$as_echo_n "checking for struct sockaddr_storage.ss_len... " >&6; }
 if test "${ac_cv_member_struct_sockaddr_storage_ss_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -14881,20 +15720,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_sockaddr_storage_ss_len=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -14925,20 +15765,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_sockaddr_storage_ss_len=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_sockaddr_storage_ss_len=no
@@ -14949,9 +15790,9 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_storage_ss_len" >&5
-echo "${ECHO_T}$ac_cv_member_struct_sockaddr_storage_ss_len" >&6; }
-if test $ac_cv_member_struct_sockaddr_storage_ss_len = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_storage_ss_len" >&5
+$as_echo "$ac_cv_member_struct_sockaddr_storage_ss_len" >&6; }
+if test "x$ac_cv_member_struct_sockaddr_storage_ss_len" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN 1
@@ -14959,10 +15800,10 @@ _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct sockaddr_storage.__ss_len" >&5
-echo $ECHO_N "checking for struct sockaddr_storage.__ss_len... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_storage.__ss_len" >&5
+$as_echo_n "checking for struct sockaddr_storage.__ss_len... " >&6; }
 if test "${ac_cv_member_struct_sockaddr_storage___ss_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -14992,20 +15833,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_sockaddr_storage___ss_len=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -15036,20 +15878,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_sockaddr_storage___ss_len=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_sockaddr_storage___ss_len=no
@@ -15060,9 +15903,9 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_storage___ss_len" >&5
-echo "${ECHO_T}$ac_cv_member_struct_sockaddr_storage___ss_len" >&6; }
-if test $ac_cv_member_struct_sockaddr_storage___ss_len = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_storage___ss_len" >&5
+$as_echo "$ac_cv_member_struct_sockaddr_storage___ss_len" >&6; }
+if test "x$ac_cv_member_struct_sockaddr_storage___ss_len" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SOCKADDR_STORAGE___SS_LEN 1
@@ -15070,10 +15913,10 @@ _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5
-echo $ECHO_N "checking for struct sockaddr.sa_len... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5
+$as_echo_n "checking for struct sockaddr.sa_len... " >&6; }
 if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -15103,20 +15946,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_sockaddr_sa_len=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -15147,20 +15991,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_sockaddr_sa_len=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_sockaddr_sa_len=no
@@ -15171,9 +16016,9 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5
-echo "${ECHO_T}$ac_cv_member_struct_sockaddr_sa_len" >&6; }
-if test $ac_cv_member_struct_sockaddr_sa_len = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5
+$as_echo "$ac_cv_member_struct_sockaddr_sa_len" >&6; }
+if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SOCKADDR_SA_LEN 1
@@ -15182,11 +16027,50 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for struct addrinfo" >&5
-echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct addrinfo" >&5
+$as_echo_n "checking for struct addrinfo... " >&6; }
 if test "${ac_cv_type_struct_addrinfo+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  ac_cv_type_struct_addrinfo=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+
+
+int
+main ()
+{
+if (sizeof (struct addrinfo))
+       return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -15198,14 +16082,115 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <netdb.h>
 
 
-typedef struct addrinfo ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
+if (sizeof ((struct addrinfo)))
+	  return 0;
+  ;
   return 0;
-if (sizeof (ac__type_new_))
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_struct_addrinfo=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_addrinfo" >&5
+$as_echo "$ac_cv_type_struct_addrinfo" >&6; }
+if test "x$ac_cv_type_struct_addrinfo" = x""yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_ADDRINFO 1
+_ACEOF
+
+
+fi
+
+
+  { $as_echo "$as_me:$LINENO: checking for intptr_t" >&5
+$as_echo_n "checking for intptr_t... " >&6; }
+if test "${ac_cv_type_intptr_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_intptr_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof (intptr_t))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((intptr_t)))
+	  return 0;
   ;
   return 0;
 }
@@ -15216,43 +16201,323 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_struct_addrinfo=yes
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_struct_addrinfo=no
+	ac_cv_type_intptr_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_addrinfo" >&5
-echo "${ECHO_T}$ac_cv_type_struct_addrinfo" >&6; }
-if test $ac_cv_type_struct_addrinfo = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
+$as_echo "$ac_cv_type_intptr_t" >&6; }
+if test "x$ac_cv_type_intptr_t" = x""yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_INTPTR_T 1
+_ACEOF
+
+else
+  for ac_type in 'int' 'long int' 'long long int'; do
+       cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_ADDRINFO 1
+#define intptr_t $ac_type
 _ACEOF
 
+	  ac_type=
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 
 fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       test -z "$ac_type" && break
+     done
+fi
 
-{ echo "$as_me:$LINENO: checking for struct cmsgcred" >&5
-echo $ECHO_N "checking for struct cmsgcred... $ECHO_C" >&6; }
-if test "${ac_cv_type_struct_cmsgcred+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+  { $as_echo "$as_me:$LINENO: checking for uintptr_t" >&5
+$as_echo_n "checking for uintptr_t... " >&6; }
+if test "${ac_cv_type_uintptr_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_uintptr_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof (uintptr_t))
+       return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((uintptr_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_uintptr_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5
+$as_echo "$ac_cv_type_uintptr_t" >&6; }
+if test "x$ac_cv_type_uintptr_t" = x""yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_UINTPTR_T 1
+_ACEOF
+
+else
+  for ac_type in 'unsigned int' 'unsigned long int' \
+	'unsigned long long int'; do
+       cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+
+cat >>confdefs.h <<_ACEOF
+#define uintptr_t $ac_type
+_ACEOF
+
+	  ac_type=
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       test -z "$ac_type" && break
+     done
+fi
+
+
+
+  { $as_echo "$as_me:$LINENO: checking for long long int" >&5
+$as_echo_n "checking for long long int... " >&6; }
+if test "${ac_cv_type_long_long_int+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+
+  /* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* For now, do not test the preprocessor; as of 2007 there are too many
+	 implementations with broken preprocessors.  Perhaps this can
+	 be revisited in 2012.  In the meantime, code should not expect
+	 #if to work with literals wider than 32 bits.  */
+      /* Test literals.  */
+      long long int ll = 9223372036854775807ll;
+      long long int nll = -9223372036854775807LL;
+      unsigned long long int ull = 18446744073709551615ULL;
+      /* Test constant expressions.   */
+      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
+		     ? 1 : -1)];
+      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
+		     ? 1 : -1)];
+      int i = 63;
+int
+main ()
+{
+/* Test availability of runtime routines for shift and division.  */
+      long long int llmax = 9223372036854775807ll;
+      unsigned long long int ullmax = 18446744073709551615ull;
+      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+	      | (llmax / ll) | (llmax % ll)
+	      | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+	      | (ullmax / ull) | (ullmax % ull));
+  ;
+  return 0;
+}
+
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  			if test "$cross_compiling" = yes; then
+  ac_cv_type_long_long_int=yes
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -15260,19 +16525,148 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#include <limits.h>
+	       #ifndef LLONG_MAX
+	       # define HALF \
+			(1LL << (sizeof (long long int) * CHAR_BIT - 2))
+	       # define LLONG_MAX (HALF - 1 + HALF)
+	       #endif
+int
+main ()
+{
+long long int n = 1;
+	       int i;
+	       for (i = 0; ; i++)
+		 {
+		   long long int m = n << i;
+		   if (m >> i != n)
+		     return 1;
+		   if (LLONG_MAX / 2 < m)
+		     break;
+		 }
+	       return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_long_long_int=yes
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_type_long_long_int=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_long_long_int=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
+$as_echo "$ac_cv_type_long_long_int" >&6; }
+  if test $ac_cv_type_long_long_int = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LONG_LONG_INT 1
+_ACEOF
+
+  fi
+
+
+{ $as_echo "$as_me:$LINENO: checking for struct cmsgcred" >&5
+$as_echo_n "checking for struct cmsgcred... " >&6; }
+if test "${ac_cv_type_struct_cmsgcred+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_struct_cmsgcred=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ucred.h>
 
-typedef struct cmsgcred ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (struct cmsgcred))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/ucred.h>
+
+int
+main ()
+{
+if (sizeof ((struct cmsgcred)))
+	  return 0;
   ;
   return 0;
 }
@@ -15283,30 +16677,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_struct_cmsgcred=yes
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_struct_cmsgcred=no
+	ac_cv_type_struct_cmsgcred=yes
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_cmsgcred" >&5
-echo "${ECHO_T}$ac_cv_type_struct_cmsgcred" >&6; }
-if test $ac_cv_type_struct_cmsgcred = yes; then
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_cmsgcred" >&5
+$as_echo "$ac_cv_type_struct_cmsgcred" >&6; }
+if test "x$ac_cv_type_struct_cmsgcred" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_CMSGCRED 1
@@ -15314,12 +16717,13 @@ _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct fcred" >&5
-echo $ECHO_N "checking for struct fcred... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct fcred" >&5
+$as_echo_n "checking for struct fcred... " >&6; }
 if test "${ac_cv_type_struct_fcred+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_struct_fcred=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15330,14 +16734,49 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <sys/socket.h>
 #include <sys/ucred.h>
 
-typedef struct fcred ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (struct fcred))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/ucred.h>
+
+int
+main ()
+{
+if (sizeof ((struct fcred)))
+	  return 0;
   ;
   return 0;
 }
@@ -15348,30 +16787,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_struct_fcred=yes
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_struct_fcred=no
+	ac_cv_type_struct_fcred=yes
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_fcred" >&5
-echo "${ECHO_T}$ac_cv_type_struct_fcred" >&6; }
-if test $ac_cv_type_struct_fcred = yes; then
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_fcred" >&5
+$as_echo "$ac_cv_type_struct_fcred" >&6; }
+if test "x$ac_cv_type_struct_fcred" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_FCRED 1
@@ -15379,12 +16827,13 @@ _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct sockcred" >&5
-echo $ECHO_N "checking for struct sockcred... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct sockcred" >&5
+$as_echo_n "checking for struct sockcred... " >&6; }
 if test "${ac_cv_type_struct_sockcred+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_struct_sockcred=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15395,14 +16844,49 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <sys/socket.h>
 #include <sys/ucred.h>
 
-typedef struct sockcred ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (struct sockcred))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/ucred.h>
+
+int
+main ()
+{
+if (sizeof ((struct sockcred)))
+	  return 0;
   ;
   return 0;
 }
@@ -15413,30 +16897,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_struct_sockcred=yes
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_struct_sockcred=no
+	ac_cv_type_struct_sockcred=yes
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockcred" >&5
-echo "${ECHO_T}$ac_cv_type_struct_sockcred" >&6; }
-if test $ac_cv_type_struct_sockcred = yes; then
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockcred" >&5
+$as_echo "$ac_cv_type_struct_sockcred" >&6; }
+if test "x$ac_cv_type_struct_sockcred" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SOCKCRED 1
@@ -15446,12 +16939,13 @@ _ACEOF
 fi
 
 
-{ echo "$as_me:$LINENO: checking for struct option" >&5
-echo $ECHO_N "checking for struct option... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct option" >&5
+$as_echo_n "checking for struct option... " >&6; }
 if test "${ac_cv_type_struct_option+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_struct_option=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15461,14 +16955,48 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <getopt.h>
 #endif
 
-typedef struct option ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (struct option))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+
+int
+main ()
+{
+if (sizeof ((struct option)))
+	  return 0;
   ;
   return 0;
 }
@@ -15479,30 +17007,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_struct_option=yes
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_struct_option=no
+	ac_cv_type_struct_option=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_option" >&5
-echo "${ECHO_T}$ac_cv_type_struct_option" >&6; }
-if test $ac_cv_type_struct_option = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_option" >&5
+$as_echo "$ac_cv_type_struct_option" >&6; }
+if test "x$ac_cv_type_struct_option" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_OPTION 1
@@ -15516,12 +17053,13 @@ if test "$with_zlib" = yes; then
   # Check that <zlib.h> defines z_streamp (versions before about 1.0.4
   # did not).  While we could work around the lack of z_streamp, it
   # seems unwise to encourage people to use such old zlib versions...
-  { echo "$as_me:$LINENO: checking for z_streamp" >&5
-echo $ECHO_N "checking for z_streamp... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for z_streamp" >&5
+$as_echo_n "checking for z_streamp... " >&6; }
 if test "${ac_cv_type_z_streamp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_z_streamp=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15529,14 +17067,46 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <zlib.h>
 
-typedef z_streamp ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (z_streamp))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <zlib.h>
+
+int
+main ()
+{
+if (sizeof ((z_streamp)))
+	  return 0;
   ;
   return 0;
 }
@@ -15547,35 +17117,44 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_z_streamp=yes
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_z_streamp=no
+	ac_cv_type_z_streamp=yes
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_z_streamp" >&5
-echo "${ECHO_T}$ac_cv_type_z_streamp" >&6; }
-if test $ac_cv_type_z_streamp = yes; then
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_z_streamp" >&5
+$as_echo "$ac_cv_type_z_streamp" >&6; }
+if test "x$ac_cv_type_z_streamp" = x""yes; then
   :
 else
-  { { echo "$as_me:$LINENO: error: zlib version is too old
+  { { $as_echo "$as_me:$LINENO: error: zlib version is too old
 Use --without-zlib to disable zlib support." >&5
-echo "$as_me: error: zlib version is too old
+$as_echo "$as_me: error: zlib version is too old
 Use --without-zlib to disable zlib support." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -15584,10 +17163,10 @@ fi
 
 if test "$with_krb5" = yes; then
 # Check for differences between MIT and Heimdal (KTH) releases
-  { echo "$as_me:$LINENO: checking for krb5_ticket.enc_part2" >&5
-echo $ECHO_N "checking for krb5_ticket.enc_part2... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for krb5_ticket.enc_part2" >&5
+$as_echo_n "checking for krb5_ticket.enc_part2... " >&6; }
 if test "${ac_cv_member_krb5_ticket_enc_part2+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -15613,20 +17192,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_krb5_ticket_enc_part2=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -15653,20 +17233,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_krb5_ticket_enc_part2=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_krb5_ticket_enc_part2=no
@@ -15677,9 +17258,9 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_krb5_ticket_enc_part2" >&5
-echo "${ECHO_T}$ac_cv_member_krb5_ticket_enc_part2" >&6; }
-if test $ac_cv_member_krb5_ticket_enc_part2 = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_krb5_ticket_enc_part2" >&5
+$as_echo "$ac_cv_member_krb5_ticket_enc_part2" >&6; }
+if test "x$ac_cv_member_krb5_ticket_enc_part2" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_KRB5_TICKET_ENC_PART2 1
@@ -15687,10 +17268,10 @@ _ACEOF
 
 
 else
-  { echo "$as_me:$LINENO: checking for krb5_ticket.client" >&5
-echo $ECHO_N "checking for krb5_ticket.client... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for krb5_ticket.client" >&5
+$as_echo_n "checking for krb5_ticket.client... " >&6; }
 if test "${ac_cv_member_krb5_ticket_client+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -15716,20 +17297,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_krb5_ticket_client=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -15756,20 +17338,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_krb5_ticket_client=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_krb5_ticket_client=no
@@ -15780,9 +17363,9 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_krb5_ticket_client" >&5
-echo "${ECHO_T}$ac_cv_member_krb5_ticket_client" >&6; }
-if test $ac_cv_member_krb5_ticket_client = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_krb5_ticket_client" >&5
+$as_echo "$ac_cv_member_krb5_ticket_client" >&6; }
+if test "x$ac_cv_member_krb5_ticket_client" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_KRB5_TICKET_CLIENT 1
@@ -15790,17 +17373,17 @@ _ACEOF
 
 
 else
-  { { echo "$as_me:$LINENO: error: could not determine how to get client name from Kerberos 5 ticket" >&5
-echo "$as_me: error: could not determine how to get client name from Kerberos 5 ticket" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: could not determine how to get client name from Kerberos 5 ticket" >&5
+$as_echo "$as_me: error: could not determine how to get client name from Kerberos 5 ticket" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
 
-  { echo "$as_me:$LINENO: checking for krb5_error.text.data" >&5
-echo $ECHO_N "checking for krb5_error.text.data... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for krb5_error.text.data" >&5
+$as_echo_n "checking for krb5_error.text.data... " >&6; }
 if test "${ac_cv_member_krb5_error_text_data+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -15826,20 +17409,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_krb5_error_text_data=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -15866,20 +17450,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_krb5_error_text_data=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_krb5_error_text_data=no
@@ -15890,9 +17475,9 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_krb5_error_text_data" >&5
-echo "${ECHO_T}$ac_cv_member_krb5_error_text_data" >&6; }
-if test $ac_cv_member_krb5_error_text_data = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_krb5_error_text_data" >&5
+$as_echo "$ac_cv_member_krb5_error_text_data" >&6; }
+if test "x$ac_cv_member_krb5_error_text_data" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_KRB5_ERROR_TEXT_DATA 1
@@ -15900,10 +17485,10 @@ _ACEOF
 
 
 else
-  { echo "$as_me:$LINENO: checking for krb5_error.e_data" >&5
-echo $ECHO_N "checking for krb5_error.e_data... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for krb5_error.e_data" >&5
+$as_echo_n "checking for krb5_error.e_data... " >&6; }
 if test "${ac_cv_member_krb5_error_e_data+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -15929,20 +17514,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_krb5_error_e_data=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -15969,20 +17555,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_krb5_error_e_data=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_krb5_error_e_data=no
@@ -15993,9 +17580,9 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_krb5_error_e_data" >&5
-echo "${ECHO_T}$ac_cv_member_krb5_error_e_data" >&6; }
-if test $ac_cv_member_krb5_error_e_data = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_krb5_error_e_data" >&5
+$as_echo "$ac_cv_member_krb5_error_e_data" >&6; }
+if test "x$ac_cv_member_krb5_error_e_data" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_KRB5_ERROR_E_DATA 1
@@ -16003,8 +17590,8 @@ _ACEOF
 
 
 else
-  { { echo "$as_me:$LINENO: error: could not determine how to extract Kerberos 5 error messages" >&5
-echo "$as_me: error: could not determine how to extract Kerberos 5 error messages" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: could not determine how to extract Kerberos 5 error messages" >&5
+$as_echo "$as_me: error: could not determine how to extract Kerberos 5 error messages" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -16013,8 +17600,8 @@ fi
 
 # Win32 requires headers to be loaded for __stdcall, so can't use
 # AC_CHECK_FUNCS here.
-  { echo "$as_me:$LINENO: checking for krb5_free_unparsed_name" >&5
-echo $ECHO_N "checking for krb5_free_unparsed_name... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for krb5_free_unparsed_name" >&5
+$as_echo_n "checking for krb5_free_unparsed_name... " >&6; }
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16036,46 +17623,779 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_KRB5_FREE_UNPARSED_NAME 1
 _ACEOF
 
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 
+# Check largefile support.  You might think this is a system service not a
+# compiler characteristic, but you'd be wrong.  We must check this before
+# probing existence of related functions such as fseeko, since the largefile
+# defines can affect what is generated for that.
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then
+  enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+  { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if test "${ac_cv_sys_largefile_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+	 # IRIX 6.2 and later do not support large files by default,
+	 # so use the C compiler's -n32 option if that helps.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+	 rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext
+	 CC="$CC -n32"
+	 rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_sys_largefile_CC=' -n32'; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext
+	 break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_sys_file_offset_bits=no; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_sys_file_offset_bits=64; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  if test $ac_cv_sys_file_offset_bits = unknown; then
+    { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if test "${ac_cv_sys_large_files+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_sys_large_files=no; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_sys_large_files=1; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_large_files=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  fi
+fi
+
+
+# Check for largefile support (must be after AC_SYS_LARGEFILE)
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:$LINENO: checking size of off_t" >&5
+$as_echo_n "checking size of off_t... " >&6; }
+if test "${ac_cv_sizeof_off_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) < 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) >= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=$ac_mid; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_lo= ac_hi=
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_off_t=$ac_lo;;
+'') if test "$ac_cv_type_off_t" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (off_t)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_off_t=0
+   fi ;;
+esac
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+static long int longval () { return (long int) (sizeof (off_t)); }
+static unsigned long int ulongval () { return (long int) (sizeof (off_t)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (((long int) (sizeof (off_t))) < 0)
+    {
+      long int i = longval ();
+      if (i != ((long int) (sizeof (off_t))))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ((long int) (sizeof (off_t))))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sizeof_off_t=`cat conftest.val`
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test "$ac_cv_type_off_t" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (off_t)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_off_t=0
+   fi
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
+$as_echo "$ac_cv_sizeof_off_t" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_OFF_T $ac_cv_sizeof_off_t
+_ACEOF
+
+
+
+# If we don't have largefile support, can't handle segsize >= 2GB.
+if test "$ac_cv_sizeof_off_t" -lt 8 -a "$segsize" != "1"; then
+   { { $as_echo "$as_me:$LINENO: error: Large file support is not enabled. Segment size cannot be larger than 1GB." >&5
+$as_echo "$as_me: error: Large file support is not enabled. Segment size cannot be larger than 1GB." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
 
 ##
 ## Functions, global variables
 ##
 
-{ echo "$as_me:$LINENO: checking for int timezone" >&5
-echo $ECHO_N "checking for int timezone... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for int timezone" >&5
+$as_echo_n "checking for int timezone... " >&6; }
 if test "${pgac_cv_var_int_timezone+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -16103,51 +18423,55 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   pgac_cv_var_int_timezone=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	pgac_cv_var_int_timezone=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $pgac_cv_var_int_timezone" >&5
-echo "${ECHO_T}$pgac_cv_var_int_timezone" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $pgac_cv_var_int_timezone" >&5
+$as_echo "$pgac_cv_var_int_timezone" >&6; }
 if test x"$pgac_cv_var_int_timezone" = xyes ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_INT_TIMEZONE
+#define HAVE_INT_TIMEZONE /**/
 _ACEOF
 
 fi
-{ echo "$as_me:$LINENO: checking types of arguments for accept()" >&5
-echo $ECHO_N "checking types of arguments for accept()... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking types of arguments for accept()" >&5
+$as_echo_n "checking types of arguments for accept()... " >&6; }
  if test "${ac_cv_func_accept_return+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
    if test "${ac_cv_func_accept_arg1+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
     if test "${ac_cv_func_accept_arg2+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
      if test "${ac_cv_func_accept_arg3+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       for ac_cv_func_accept_return in 'int' 'unsigned int PASCAL'; do
       for ac_cv_func_accept_arg1 in 'int' 'unsigned int'; do
@@ -16180,20 +18504,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_not_found=no; break 4
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_not_found=yes
@@ -16205,8 +18530,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
      done
     done
     if test "$ac_not_found" = yes; then
-      { { echo "$as_me:$LINENO: error: could not determine argument types" >&5
-echo "$as_me: error: could not determine argument types" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: could not determine argument types" >&5
+$as_echo "$as_me: error: could not determine argument types" >&2;}
    { (exit 1); exit 1; }; }
     fi
     if test "$ac_cv_func_accept_arg3" = "void"; then
@@ -16220,8 +18545,8 @@ fi
 fi
 
 fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_accept_return, $ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *" >&5
-echo "${ECHO_T}$ac_cv_func_accept_return, $ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_func_accept_return, $ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *" >&5
+$as_echo "$ac_cv_func_accept_return, $ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define ACCEPT_TYPE_RETURN $ac_cv_func_accept_return
@@ -16243,10 +18568,10 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking whether gettimeofday takes only one argument" >&5
-echo $ECHO_N "checking whether gettimeofday takes only one argument... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether gettimeofday takes only one argument" >&5
+$as_echo_n "checking whether gettimeofday takes only one argument... " >&6; }
 if test "${pgac_cv_func_gettimeofday_1arg+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -16271,20 +18596,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   pgac_cv_func_gettimeofday_1arg=no
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	pgac_cv_func_gettimeofday_1arg=yes
@@ -16292,12 +18618,12 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $pgac_cv_func_gettimeofday_1arg" >&5
-echo "${ECHO_T}$pgac_cv_func_gettimeofday_1arg" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $pgac_cv_func_gettimeofday_1arg" >&5
+$as_echo "$pgac_cv_func_gettimeofday_1arg" >&6; }
 if test x"$pgac_cv_func_gettimeofday_1arg" = xyes ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define GETTIMEOFDAY_1ARG
+#define GETTIMEOFDAY_1ARG /**/
 _ACEOF
 
 fi
@@ -16325,13 +18651,117 @@ fi
 
 
 
-for ac_func in cbrt dlopen fcvt fdatasync getpeereid getpeerucred getrlimit memmove poll pstat readlink setproctitle setsid sigprocmask symlink sysconf towlower utime utimes waitpid wcstombs
+
+
+for ac_func in cbrt dlopen fcvt fdatasync getifaddrs getpeereid getpeerucred getrlimit memmove poll pstat readlink scandir setproctitle setsid sigprocmask symlink sysconf towlower utime utimes waitpid wcstombs
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+
+for ac_func in fseeko
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -16384,41 +18814,200 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
+else
+  case " $LIBOBJS " in
+  *" $ac_func.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
+ ;;
+esac
+
 fi
 done
 
 
+case $host_os in
+	# BSD/OS & NetBSD use a custom fseeko/ftello built on fsetpos/fgetpos
+	# Mingw uses macros to access Win32 API calls
+	bsdi*|netbsd*|mingw*)
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FSEEKO 1
+_ACEOF
+
+		ac_cv_func_fseeko=yes;;
+	*)
+		{ $as_echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
+if test "${ac_cv_sys_largefile_source+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
+int
+main ()
+{
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_sys_largefile_source=no; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#define _LARGEFILE_SOURCE 1
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
+int
+main ()
+{
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_sys_largefile_source=1; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+  ac_cv_sys_largefile_source=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
+$as_echo "$ac_cv_sys_largefile_source" >&6; }
+case $ac_cv_sys_largefile_source in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
+_ACEOF
+;;
+esac
+rm -rf conftest*
+
+# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+# in glibc 2.1.3, but that breaks too many other things.
+# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+if test $ac_cv_sys_largefile_source != unknown; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FSEEKO 1
+_ACEOF
+
+fi
+;;
+esac
+
 # posix_fadvise() is a no-op on Solaris, so don't incur function overhead
 # by calling it, 2009-04-02
 # http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libc/port/gen/posix_fadvise.c
@@ -16426,11 +19015,11 @@ if test "$PORTNAME" != "solaris"; then
 
 for ac_func in posix_fadvise
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -16483,44 +19072,51 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
-{ echo "$as_me:$LINENO: checking whether posix_fadvise is declared" >&5
-echo $ECHO_N "checking whether posix_fadvise is declared... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether posix_fadvise is declared" >&5
+$as_echo_n "checking whether posix_fadvise is declared... " >&6; }
 if test "${ac_cv_have_decl_posix_fadvise+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -16547,20 +19143,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_have_decl_posix_fadvise=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_have_decl_posix_fadvise=no
@@ -16568,9 +19165,9 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_posix_fadvise" >&5
-echo "${ECHO_T}$ac_cv_have_decl_posix_fadvise" >&6; }
-if test $ac_cv_have_decl_posix_fadvise = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_posix_fadvise" >&5
+$as_echo "$ac_cv_have_decl_posix_fadvise" >&6; }
+if test "x$ac_cv_have_decl_posix_fadvise" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_POSIX_FADVISE 1
@@ -16588,10 +19185,10 @@ fi
 
 fi
 
-{ echo "$as_me:$LINENO: checking whether fdatasync is declared" >&5
-echo $ECHO_N "checking whether fdatasync is declared... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether fdatasync is declared" >&5
+$as_echo_n "checking whether fdatasync is declared... " >&6; }
 if test "${ac_cv_have_decl_fdatasync+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -16618,20 +19215,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_have_decl_fdatasync=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_have_decl_fdatasync=no
@@ -16639,9 +19237,9 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_fdatasync" >&5
-echo "${ECHO_T}$ac_cv_have_decl_fdatasync" >&6; }
-if test $ac_cv_have_decl_fdatasync = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_fdatasync" >&5
+$as_echo "$ac_cv_have_decl_fdatasync" >&6; }
+if test "x$ac_cv_have_decl_fdatasync" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_FDATASYNC 1
@@ -16657,10 +19255,10 @@ _ACEOF
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether strlcat is declared" >&5
-echo $ECHO_N "checking whether strlcat is declared... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether strlcat is declared" >&5
+$as_echo_n "checking whether strlcat is declared... " >&6; }
 if test "${ac_cv_have_decl_strlcat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -16686,20 +19284,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_have_decl_strlcat=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_have_decl_strlcat=no
@@ -16707,9 +19306,9 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strlcat" >&5
-echo "${ECHO_T}$ac_cv_have_decl_strlcat" >&6; }
-if test $ac_cv_have_decl_strlcat = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_strlcat" >&5
+$as_echo "$ac_cv_have_decl_strlcat" >&6; }
+if test "x$ac_cv_have_decl_strlcat" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_STRLCAT 1
@@ -16723,10 +19322,10 @@ _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking whether strlcpy is declared" >&5
-echo $ECHO_N "checking whether strlcpy is declared... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether strlcpy is declared" >&5
+$as_echo_n "checking whether strlcpy is declared... " >&6; }
 if test "${ac_cv_have_decl_strlcpy+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -16752,20 +19351,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_have_decl_strlcpy=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_have_decl_strlcpy=no
@@ -16773,9 +19373,9 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strlcpy" >&5
-echo "${ECHO_T}$ac_cv_have_decl_strlcpy" >&6; }
-if test $ac_cv_have_decl_strlcpy = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_strlcpy" >&5
+$as_echo "$ac_cv_have_decl_strlcpy" >&6; }
+if test "x$ac_cv_have_decl_strlcpy" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_STRLCPY 1
@@ -16792,10 +19392,10 @@ fi
 
 
 # This is probably only present on Darwin, but may as well check always
-{ echo "$as_me:$LINENO: checking whether F_FULLFSYNC is declared" >&5
-echo $ECHO_N "checking whether F_FULLFSYNC is declared... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether F_FULLFSYNC is declared" >&5
+$as_echo_n "checking whether F_FULLFSYNC is declared... " >&6; }
 if test "${ac_cv_have_decl_F_FULLFSYNC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -16822,20 +19422,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_have_decl_F_FULLFSYNC=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_have_decl_F_FULLFSYNC=no
@@ -16843,9 +19444,9 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_F_FULLFSYNC" >&5
-echo "${ECHO_T}$ac_cv_have_decl_F_FULLFSYNC" >&6; }
-if test $ac_cv_have_decl_F_FULLFSYNC = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_F_FULLFSYNC" >&5
+$as_echo "$ac_cv_have_decl_F_FULLFSYNC" >&6; }
+if test "x$ac_cv_have_decl_F_FULLFSYNC" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_F_FULLFSYNC 1
@@ -16863,12 +19464,13 @@ fi
 
 
 HAVE_IPV6=no
-{ echo "$as_me:$LINENO: checking for struct sockaddr_in6" >&5
-echo $ECHO_N "checking for struct sockaddr_in6... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_in6" >&5
+$as_echo_n "checking for struct sockaddr_in6... " >&6; }
 if test "${ac_cv_type_struct_sockaddr_in6+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_struct_sockaddr_in6=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16877,14 +19479,47 @@ cat >>conftest.$ac_ext <<_ACEOF
 $ac_includes_default
 #include <netinet/in.h>
 
-typedef struct sockaddr_in6 ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (struct sockaddr_in6))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <netinet/in.h>
+
+int
+main ()
+{
+if (sizeof ((struct sockaddr_in6)))
+	  return 0;
   ;
   return 0;
 }
@@ -16895,30 +19530,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_struct_sockaddr_in6=yes
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_struct_sockaddr_in6=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_struct_sockaddr_in6=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_in6" >&5
-echo "${ECHO_T}$ac_cv_type_struct_sockaddr_in6" >&6; }
-if test $ac_cv_type_struct_sockaddr_in6 = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_in6" >&5
+$as_echo "$ac_cv_type_struct_sockaddr_in6" >&6; }
+if test "x$ac_cv_type_struct_sockaddr_in6" = x""yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_IPV6 1
@@ -16929,10 +19573,10 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for PS_STRINGS" >&5
-echo $ECHO_N "checking for PS_STRINGS... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for PS_STRINGS" >&5
+$as_echo_n "checking for PS_STRINGS... " >&6; }
 if test "${pgac_cv_var_PS_STRINGS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -16958,35 +19602,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   pgac_cv_var_PS_STRINGS=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	pgac_cv_var_PS_STRINGS=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $pgac_cv_var_PS_STRINGS" >&5
-echo "${ECHO_T}$pgac_cv_var_PS_STRINGS" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $pgac_cv_var_PS_STRINGS" >&5
+$as_echo "$pgac_cv_var_PS_STRINGS" >&6; }
 if test "$pgac_cv_var_PS_STRINGS" = yes ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_PS_STRINGS
+#define HAVE_PS_STRINGS /**/
 _ACEOF
 
 fi
@@ -17029,11 +19677,11 @@ else
 
 for ac_func in snprintf
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -17086,35 +19734,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 else
@@ -17125,11 +19780,11 @@ done
 
 for ac_func in vsnprintf
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -17182,35 +19837,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 else
@@ -17226,10 +19888,10 @@ fi
 # from whether the functions exist in the C library --- there are
 # systems that have the functions but don't bother to declare them :-(
 
-{ echo "$as_me:$LINENO: checking whether snprintf is declared" >&5
-echo $ECHO_N "checking whether snprintf is declared... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether snprintf is declared" >&5
+$as_echo_n "checking whether snprintf is declared... " >&6; }
 if test "${ac_cv_have_decl_snprintf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -17255,20 +19917,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_have_decl_snprintf=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_have_decl_snprintf=no
@@ -17276,9 +19939,9 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_snprintf" >&5
-echo "${ECHO_T}$ac_cv_have_decl_snprintf" >&6; }
-if test $ac_cv_have_decl_snprintf = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_snprintf" >&5
+$as_echo "$ac_cv_have_decl_snprintf" >&6; }
+if test "x$ac_cv_have_decl_snprintf" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_SNPRINTF 1
@@ -17292,10 +19955,10 @@ _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking whether vsnprintf is declared" >&5
-echo $ECHO_N "checking whether vsnprintf is declared... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether vsnprintf is declared" >&5
+$as_echo_n "checking whether vsnprintf is declared... " >&6; }
 if test "${ac_cv_have_decl_vsnprintf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -17321,20 +19984,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_have_decl_vsnprintf=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_have_decl_vsnprintf=no
@@ -17342,9 +20006,9 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_vsnprintf" >&5
-echo "${ECHO_T}$ac_cv_have_decl_vsnprintf" >&6; }
-if test $ac_cv_have_decl_vsnprintf = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_vsnprintf" >&5
+$as_echo "$ac_cv_have_decl_vsnprintf" >&6; }
+if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_VSNPRINTF 1
@@ -17362,10 +20026,10 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for isinf" >&5
-echo $ECHO_N "checking for isinf... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for isinf" >&5
+$as_echo_n "checking for isinf... " >&6; }
 if test "${ac_cv_func_isinf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -17391,31 +20055,35 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_isinf=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_isinf=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_isinf" >&5
-echo "${ECHO_T}$ac_cv_func_isinf" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_isinf" >&5
+$as_echo "$ac_cv_func_isinf" >&6; }
 
 if test $ac_cv_func_isinf = yes ; then
 
@@ -17437,11 +20105,11 @@ esac
 
 for ac_func in fpclass fp_class fp_class_d class
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -17494,35 +20162,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
  break
 fi
@@ -17548,13 +20223,14 @@ LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
 
 
 
-for ac_func in crypt getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul
+
+for ac_func in crypt erand48 getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -17607,35 +20283,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 else
@@ -17664,11 +20347,11 @@ _ACEOF
 
 for ac_func in unsetenv
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -17721,35 +20404,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 else
@@ -17778,11 +20468,11 @@ if test x"$ac_cv_type_struct_addrinfo" = xyes ; then
 
 for ac_func in getaddrinfo
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -17835,35 +20525,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 else
@@ -17891,11 +20588,11 @@ if test x"$ac_cv_type_struct_option" = xyes ; then
 
 for ac_func in getopt_long
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -17948,35 +20645,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 else
@@ -18010,16 +20714,27 @@ esac
 
 fi
 
+# Cygwin's erand48() is broken (always returns zero) in some releases,
+# so force use of ours.
+if test "$PORTNAME" = "cygwin"; then
+  case " $LIBOBJS " in
+  *" erand48.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS erand48.$ac_objext"
+ ;;
+esac
+
+fi
+
 # Win32 support
 if test "$PORTNAME" = "win32"; then
 
 for ac_func in gettimeofday
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -18072,35 +20787,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 else
@@ -18127,12 +20849,6 @@ case " $LIBOBJS " in
 esac
 
 case " $LIBOBJS " in
-  *" rand.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS rand.$ac_objext"
- ;;
-esac
-
-case " $LIBOBJS " in
   *" win32env.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS win32env.$ac_objext"
  ;;
@@ -18152,8 +20868,8 @@ _ACEOF
 fi
 
 if test "$with_readline" = yes; then
-  { echo "$as_me:$LINENO: checking for rl_completion_append_character" >&5
-echo $ECHO_N "checking for rl_completion_append_character... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for rl_completion_append_character" >&5
+$as_echo_n "checking for rl_completion_append_character... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -18181,44 +20897,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_RL_COMPLETION_APPEND_CHARACTER 1
 _ACEOF
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
 
 for ac_func in rl_completion_matches rl_filename_completion_function
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -18271,48 +20991,56 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
-for ac_func in replace_history_entry
+
+for ac_func in append_history history_truncate_file
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -18365,35 +21093,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -18402,8 +21137,8 @@ done
 fi
 
 
-{ echo "$as_me:$LINENO: checking for sigsetjmp" >&5
-echo $ECHO_N "checking for sigsetjmp... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for sigsetjmp" >&5
+$as_echo_n "checking for sigsetjmp... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -18425,40 +21160,44 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_SIGSETJMP 1
 _ACEOF
 
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
-{ echo "$as_me:$LINENO: checking whether sys_siglist is declared" >&5
-echo $ECHO_N "checking whether sys_siglist is declared... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether sys_siglist is declared" >&5
+$as_echo_n "checking whether sys_siglist is declared... " >&6; }
 if test "${ac_cv_have_decl_sys_siglist+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -18490,20 +21229,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_have_decl_sys_siglist=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_have_decl_sys_siglist=no
@@ -18511,9 +21251,9 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5
-echo "${ECHO_T}$ac_cv_have_decl_sys_siglist" >&6; }
-if test $ac_cv_have_decl_sys_siglist = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5
+$as_echo "$ac_cv_have_decl_sys_siglist" >&6; }
+if test "x$ac_cv_have_decl_sys_siglist" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_SYS_SIGLIST 1
@@ -18531,10 +21271,10 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for syslog" >&5
-echo $ECHO_N "checking for syslog... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for syslog" >&5
+$as_echo_n "checking for syslog... " >&6; }
 if test "${ac_cv_func_syslog+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -18587,44 +21327,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_syslog=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_syslog=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_syslog" >&5
-echo "${ECHO_T}$ac_cv_func_syslog" >&6; }
-if test $ac_cv_func_syslog = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_syslog" >&5
+$as_echo "$ac_cv_func_syslog" >&6; }
+if test "x$ac_cv_func_syslog" = x""yes; then
   if test "${ac_cv_header_syslog_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for syslog.h" >&5
-echo $ECHO_N "checking for syslog.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for syslog.h" >&5
+$as_echo_n "checking for syslog.h... " >&6; }
 if test "${ac_cv_header_syslog_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_syslog_h" >&5
-echo "${ECHO_T}$ac_cv_header_syslog_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_syslog_h" >&5
+$as_echo "$ac_cv_header_syslog_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking syslog.h usability" >&5
-echo $ECHO_N "checking syslog.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking syslog.h usability" >&5
+$as_echo_n "checking syslog.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -18640,32 +21384,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking syslog.h presence" >&5
-echo $ECHO_N "checking syslog.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking syslog.h presence" >&5
+$as_echo_n "checking syslog.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -18679,51 +21424,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: syslog.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: syslog.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: syslog.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: syslog.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: syslog.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: syslog.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: syslog.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: syslog.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: syslog.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: syslog.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: syslog.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: syslog.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: syslog.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: syslog.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: syslog.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: syslog.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: syslog.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: syslog.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: syslog.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: syslog.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: syslog.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: syslog.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: syslog.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: syslog.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: syslog.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: syslog.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: syslog.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: syslog.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: syslog.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: syslog.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: syslog.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: syslog.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -18732,18 +21478,18 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for syslog.h" >&5
-echo $ECHO_N "checking for syslog.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for syslog.h" >&5
+$as_echo_n "checking for syslog.h... " >&6; }
 if test "${ac_cv_header_syslog_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_syslog_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_syslog_h" >&5
-echo "${ECHO_T}$ac_cv_header_syslog_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_syslog_h" >&5
+$as_echo "$ac_cv_header_syslog_h" >&6; }
 
 fi
-if test $ac_cv_header_syslog_h = yes; then
+if test "x$ac_cv_header_syslog_h" = x""yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_SYSLOG 1
@@ -18755,10 +21501,10 @@ fi
 fi
 
 
-{ echo "$as_me:$LINENO: checking for opterr" >&5
-echo $ECHO_N "checking for opterr... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for opterr" >&5
+$as_echo_n "checking for opterr... " >&6; }
 if test "${pgac_cv_var_int_opterr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -18781,31 +21527,35 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   pgac_cv_var_int_opterr=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	pgac_cv_var_int_opterr=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $pgac_cv_var_int_opterr" >&5
-echo "${ECHO_T}$pgac_cv_var_int_opterr" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $pgac_cv_var_int_opterr" >&5
+$as_echo "$pgac_cv_var_int_opterr" >&6; }
 if test x"$pgac_cv_var_int_opterr" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -18814,10 +21564,10 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for optreset" >&5
-echo $ECHO_N "checking for optreset... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for optreset" >&5
+$as_echo_n "checking for optreset... " >&6; }
 if test "${pgac_cv_var_int_optreset+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -18840,31 +21590,35 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   pgac_cv_var_int_optreset=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	pgac_cv_var_int_optreset=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $pgac_cv_var_int_optreset" >&5
-echo "${ECHO_T}$pgac_cv_var_int_optreset" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $pgac_cv_var_int_optreset" >&5
+$as_echo "$pgac_cv_var_int_optreset" >&6; }
 if test x"$pgac_cv_var_int_optreset" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -18877,11 +21631,11 @@ fi
 
 for ac_func in strtoll strtoq
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -18934,35 +21688,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
  break
 fi
@@ -18972,11 +21733,11 @@ done
 
 for ac_func in strtoull strtouq
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -19029,35 +21790,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
  break
 fi
@@ -19068,11 +21836,11 @@ done
 
 for ac_func in atexit
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -19125,46 +21893,53 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 else
 
 for ac_func in on_exit
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -19217,40 +21992,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  { { echo "$as_me:$LINENO: error: neither atexit() nor on_exit() found" >&5
-echo "$as_me: error: neither atexit() nor on_exit() found" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: neither atexit() nor on_exit() found" >&5
+$as_echo "$as_me: error: neither atexit() nor on_exit() found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 done
@@ -19260,245 +22042,6 @@ done
 
 
 
-for ac_func in fseeko
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  case " $LIBOBJS " in
-  *" $ac_func.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
- ;;
-esac
-
-fi
-done
-
-
-case $host_os in
-	# BSD/OS & NetBSD use a custom fseeko/ftello built on fsetpos/fgetpos
-	# Mingw uses macros to access Win32 API calls
-	bsdi*|netbsd*|mingw*)
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FSEEKO 1
-_ACEOF
-
-		ac_cv_func_fseeko=yes;;
-	*)
-		{ echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; }
-if test "${ac_cv_sys_largefile_source+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  while :; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h> /* for off_t */
-     #include <stdio.h>
-int
-main ()
-{
-int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_sys_largefile_source=no; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#define _LARGEFILE_SOURCE 1
-#include <sys/types.h> /* for off_t */
-     #include <stdio.h>
-int
-main ()
-{
-int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_sys_largefile_source=1; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-  ac_cv_sys_largefile_source=unknown
-  break
-done
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
-echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6; }
-case $ac_cv_sys_largefile_source in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
-_ACEOF
-;;
-esac
-rm -f conftest*
-
-# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
-# in glibc 2.1.3, but that breaks too many other things.
-# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-if test $ac_cv_sys_largefile_source != unknown; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FSEEKO 1
-_ACEOF
-
-fi
-;;
-esac
-
-
 #
 # Pthreads
 #
@@ -19530,8 +22073,8 @@ if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
         save_LIBS="$LIBS"
         LIBS="$PTHREAD_LIBS $LIBS"
-        { echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
-echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
+$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; }
         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -19560,30 +22103,34 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   acx_pthread_ok=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-        { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
-echo "${ECHO_T}$acx_pthread_ok" >&6; }
+        { $as_echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
+$as_echo "$acx_pthread_ok" >&6; }
         if test x"$acx_pthread_ok" = xno; then
                 PTHREAD_LIBS=""
                 PTHREAD_CFLAGS=""
@@ -19645,13 +22192,13 @@ for flag in $acx_pthread_flags; do
         tryPTHREAD_LIBS=""
         case $flag in
                 none)
-                { echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5
-echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6; }
+                { $as_echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5
+$as_echo_n "checking whether pthreads work without any flags... " >&6; }
                 ;;
 
                 -*)
-                { echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
-echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6; }
+                { $as_echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
+$as_echo_n "checking whether pthreads work with $flag... " >&6; }
                 tryPTHREAD_CFLAGS="$flag"
                 ;;
 
@@ -19660,10 +22207,10 @@ echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6; }
                 if test x"$PTHREAD_CFLAGS" != x -o x"$PTHREAD_LIBS" != x; then continue; fi
                 # Extract the first word of "pthread-config", so it can be a program name with args.
 set dummy pthread-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_acx_pthread_config+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$acx_pthread_config"; then
   ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test.
@@ -19676,7 +22223,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_acx_pthread_config="yes"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -19688,11 +22235,11 @@ fi
 fi
 acx_pthread_config=$ac_cv_prog_acx_pthread_config
 if test -n "$acx_pthread_config"; then
-  { echo "$as_me:$LINENO: result: $acx_pthread_config" >&5
-echo "${ECHO_T}$acx_pthread_config" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $acx_pthread_config" >&5
+$as_echo "$acx_pthread_config" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -19702,8 +22249,8 @@ fi
                 ;;
 
                 *)
-                { echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5
-echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6; }
+                { $as_echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5
+$as_echo_n "checking for the pthreads library -l$flag... " >&6; }
                 tryPTHREAD_LIBS="-l$flag"
                 ;;
         esac
@@ -19745,26 +22292,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   acx_pthread_ok=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	acx_pthread_ok=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
@@ -19794,8 +22345,8 @@ _ACEOF
         LIBS="$save_LIBS"
         CFLAGS="$save_CFLAGS"
 
-        { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
-echo "${ECHO_T}$acx_pthread_ok" >&6; }
+        { $as_echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
+$as_echo "$acx_pthread_ok" >&6; }
 done
 fi
 
@@ -19808,8 +22359,8 @@ if test "x$acx_pthread_ok" = xyes; then
 
         # Detect AIX lossage: threads are created detached by default
         # and the JOINABLE attribute has a nonstandard name (UNDETACHED).
-        { echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5
-echo $ECHO_N "checking for joinable pthread attribute... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5
+$as_echo_n "checking for joinable pthread attribute... " >&6; }
         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -19831,26 +22382,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ok=PTHREAD_CREATE_JOINABLE
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ok=unknown
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
         if test x"$ok" = xunknown; then
@@ -19875,26 +22430,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ok=PTHREAD_CREATE_UNDETACHED
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ok=unknown
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
         fi
@@ -19905,23 +22464,23 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
         fi
-        { echo "$as_me:$LINENO: result: ${ok}" >&5
-echo "${ECHO_T}${ok}" >&6; }
+        { $as_echo "$as_me:$LINENO: result: ${ok}" >&5
+$as_echo "${ok}" >&6; }
         if test x"$ok" = xunknown; then
-                { echo "$as_me:$LINENO: WARNING: we do not know how to create joinable pthreads" >&5
-echo "$as_me: WARNING: we do not know how to create joinable pthreads" >&2;}
+                { $as_echo "$as_me:$LINENO: WARNING: we do not know how to create joinable pthreads" >&5
+$as_echo "$as_me: WARNING: we do not know how to create joinable pthreads" >&2;}
         fi
 
-        { echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
-echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
+$as_echo_n "checking if more special flags are required for pthreads... " >&6; }
         flag=no
 # We always add these in PostgreSQL
 #       case "${host_cpu}-${host_os}" in
 #               *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
 #               *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
 #       esac
-        { echo "$as_me:$LINENO: result: ${flag}" >&5
-echo "${ECHO_T}${flag}" >&6; }
+        { $as_echo "$as_me:$LINENO: result: ${flag}" >&5
+$as_echo "${flag}" >&6; }
         if test "x$flag" != xno; then
                 PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
         fi
@@ -19935,10 +22494,10 @@ echo "${ECHO_T}${flag}" >&6; }
         # More AIX lossage: must compile with cc_r
         # Extract the first word of "cc_r", so it can be a program name with args.
 set dummy cc_r; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$PTHREAD_CC"; then
   ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.
@@ -19951,7 +22510,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_PTHREAD_CC="cc_r"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -19963,11 +22522,11 @@ fi
 fi
 PTHREAD_CC=$ac_cv_prog_PTHREAD_CC
 if test -n "$PTHREAD_CC"; then
-  { echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5
-echo "${ECHO_T}$PTHREAD_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5
+$as_echo "$PTHREAD_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -20008,22 +22567,12 @@ PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_REENTRANT -D_THREAD_SAFE -D_POSIX_PTHREAD_SEM
 # At this point, we don't want to muck with the compiler name for threading.
 # Let's see who fails, perhaps AIX.  2004-04-23
 if test "$PTHREAD_CC" != "$CC"; then
-{ { echo "$as_me:$LINENO: error:
+{ { $as_echo "$as_me:$LINENO: error:
 PostgreSQL does not support platforms that require a special compiler
-for thread safety." >&5
-echo "$as_me: error:
+for thread safety;  use --disable-thread-safety to disable thread safety." >&5
+$as_echo "$as_me: error:
 PostgreSQL does not support platforms that require a special compiler
-for thread safety." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-if test "$THREAD_SUPPORT" = no; then
-{ { echo "$as_me:$LINENO: error: cannot enable threads on this platform
-This platform is known to not support thread-safe programs.  For details,
-compile and run src/bin/pg_thread_test." >&5
-echo "$as_me: error: cannot enable threads on this platform
-This platform is known to not support thread-safe programs.  For details,
-compile and run src/bin/pg_thread_test." >&2;}
+for thread safety;  use --disable-thread-safety to disable thread safety." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -20035,17 +22584,17 @@ LIBS="$LIBS $PTHREAD_LIBS"
 
 if test "$PORTNAME" != "win32"; then
 if test "${ac_cv_header_pthread_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for pthread.h" >&5
-echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for pthread.h" >&5
+$as_echo_n "checking for pthread.h... " >&6; }
 if test "${ac_cv_header_pthread_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
-echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
+$as_echo "$ac_cv_header_pthread_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking pthread.h usability" >&5
-echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking pthread.h usability" >&5
+$as_echo_n "checking pthread.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -20061,32 +22610,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking pthread.h presence" >&5
-echo $ECHO_N "checking pthread.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking pthread.h presence" >&5
+$as_echo_n "checking pthread.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -20100,51 +22650,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: pthread.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: pthread.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: pthread.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: pthread.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: pthread.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: pthread.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -20153,22 +22704,24 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for pthread.h" >&5
-echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for pthread.h" >&5
+$as_echo_n "checking for pthread.h... " >&6; }
 if test "${ac_cv_header_pthread_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_pthread_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
-echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
+$as_echo "$ac_cv_header_pthread_h" >&6; }
 
 fi
-if test $ac_cv_header_pthread_h = yes; then
+if test "x$ac_cv_header_pthread_h" = x""yes; then
   :
 else
-  { { echo "$as_me:$LINENO: error: pthread.h not found, required for --enable-thread-safety" >&5
-echo "$as_me: error: pthread.h not found, required for --enable-thread-safety" >&2;}
+  { { $as_echo "$as_me:$LINENO: error:
+pthread.h not found;  use --disable-thread-safety to disable thread safety" >&5
+$as_echo "$as_me: error:
+pthread.h not found;  use --disable-thread-safety to disable thread safety" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -20180,11 +22733,11 @@ fi
 
 for ac_func in strerror_r getpwuid_r gethostbyname_r
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -20237,35 +22790,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -20273,10 +22833,10 @@ done
 
 
 # Do test here with the proper thread flags
-{ echo "$as_me:$LINENO: checking whether getpwuid_r takes a fifth argument" >&5
-echo $ECHO_N "checking whether getpwuid_r takes a fifth argument... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether getpwuid_r takes a fifth argument" >&5
+$as_echo_n "checking whether getpwuid_r takes a fifth argument... " >&6; }
 if test "${pgac_cv_func_getpwuid_r_5arg+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -20305,20 +22865,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   pgac_cv_func_getpwuid_r_5arg=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	pgac_cv_func_getpwuid_r_5arg=no
@@ -20326,20 +22887,20 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $pgac_cv_func_getpwuid_r_5arg" >&5
-echo "${ECHO_T}$pgac_cv_func_getpwuid_r_5arg" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $pgac_cv_func_getpwuid_r_5arg" >&5
+$as_echo "$pgac_cv_func_getpwuid_r_5arg" >&6; }
 if test x"$pgac_cv_func_getpwuid_r_5arg" = xyes ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define GETPWUID_R_5ARG
+#define GETPWUID_R_5ARG /**/
 _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking whether strerror_r returns int" >&5
-echo $ECHO_N "checking whether strerror_r returns int... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether strerror_r returns int" >&5
+$as_echo_n "checking whether strerror_r returns int... " >&6; }
 if test "${pgac_cv_func_strerror_r_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -20367,20 +22928,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   pgac_cv_func_strerror_r_int=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	pgac_cv_func_strerror_r_int=no
@@ -20388,12 +22950,12 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $pgac_cv_func_strerror_r_int" >&5
-echo "${ECHO_T}$pgac_cv_func_strerror_r_int" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $pgac_cv_func_strerror_r_int" >&5
+$as_echo "$pgac_cv_func_strerror_r_int" >&6; }
 if test x"$pgac_cv_func_strerror_r_int" = xyes ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define STRERROR_R_INT
+#define STRERROR_R_INT /**/
 _ACEOF
 
 fi
@@ -20417,10 +22979,10 @@ if test "$with_ldap" = yes ; then
   _LIBS="$LIBS"
   if test "$PORTNAME" != "win32"; then
 
-{ echo "$as_me:$LINENO: checking for ldap_bind in -lldap" >&5
-echo $ECHO_N "checking for ldap_bind in -lldap... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ldap_bind in -lldap" >&5
+$as_echo_n "checking for ldap_bind in -lldap... " >&6; }
 if test "${ac_cv_lib_ldap_ldap_bind+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lldap $EXTRA_LDAP_LIBS $LIBS"
@@ -20452,33 +23014,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ldap_ldap_bind=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ldap_ldap_bind=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_bind" >&5
-echo "${ECHO_T}$ac_cv_lib_ldap_ldap_bind" >&6; }
-if test $ac_cv_lib_ldap_ldap_bind = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_bind" >&5
+$as_echo "$ac_cv_lib_ldap_ldap_bind" >&6; }
+if test "x$ac_cv_lib_ldap_ldap_bind" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBLDAP 1
 _ACEOF
@@ -20486,8 +23052,8 @@ _ACEOF
   LIBS="-lldap $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: library 'ldap' is required for LDAP" >&5
-echo "$as_me: error: library 'ldap' is required for LDAP" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: library 'ldap' is required for LDAP" >&5
+$as_echo "$as_me: error: library 'ldap' is required for LDAP" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -20495,10 +23061,10 @@ fi
     if test "$enable_thread_safety" = yes; then
       # on some platforms ldap_r fails to link without PTHREAD_LIBS
 
-{ echo "$as_me:$LINENO: checking for ldap_simple_bind in -lldap_r" >&5
-echo $ECHO_N "checking for ldap_simple_bind in -lldap_r... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ldap_simple_bind in -lldap_r" >&5
+$as_echo_n "checking for ldap_simple_bind in -lldap_r... " >&6; }
 if test "${ac_cv_lib_ldap_r_ldap_simple_bind+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lldap_r $PTHREAD_CFLAGS $PTHREAD_LIBS $EXTRA_LDAP_LIBS $LIBS"
@@ -20530,33 +23096,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ldap_r_ldap_simple_bind=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ldap_r_ldap_simple_bind=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_r_ldap_simple_bind" >&5
-echo "${ECHO_T}$ac_cv_lib_ldap_r_ldap_simple_bind" >&6; }
-if test $ac_cv_lib_ldap_r_ldap_simple_bind = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_r_ldap_simple_bind" >&5
+$as_echo "$ac_cv_lib_ldap_r_ldap_simple_bind" >&6; }
+if test "x$ac_cv_lib_ldap_r_ldap_simple_bind" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBLDAP_R 1
 _ACEOF
@@ -20564,8 +23134,8 @@ _ACEOF
   LIBS="-lldap_r $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: library 'ldap_r' is required for LDAP" >&5
-echo "$as_me: error: library 'ldap_r' is required for LDAP" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: library 'ldap_r' is required for LDAP" >&5
+$as_echo "$as_me: error: library 'ldap_r' is required for LDAP" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -20575,10 +23145,10 @@ fi
     fi
   else
 
-{ echo "$as_me:$LINENO: checking for ldap_bind in -lwldap32" >&5
-echo $ECHO_N "checking for ldap_bind in -lwldap32... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ldap_bind in -lwldap32" >&5
+$as_echo_n "checking for ldap_bind in -lwldap32... " >&6; }
 if test "${ac_cv_lib_wldap32_ldap_bind+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwldap32  $LIBS"
@@ -20610,33 +23180,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_wldap32_ldap_bind=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_wldap32_ldap_bind=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_wldap32_ldap_bind" >&5
-echo "${ECHO_T}$ac_cv_lib_wldap32_ldap_bind" >&6; }
-if test $ac_cv_lib_wldap32_ldap_bind = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_wldap32_ldap_bind" >&5
+$as_echo "$ac_cv_lib_wldap32_ldap_bind" >&6; }
+if test "x$ac_cv_lib_wldap32_ldap_bind" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBWLDAP32 1
 _ACEOF
@@ -20644,8 +23218,8 @@ _ACEOF
   LIBS="-lwldap32 $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: library 'wldap32' is required for LDAP" >&5
-echo "$as_me: error: library 'wldap32' is required for LDAP" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: library 'wldap32' is required for LDAP" >&5
+$as_echo "$as_me: error: library 'wldap32' is required for LDAP" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -20662,11 +23236,11 @@ fi
 # library is found by the linker, but the runtime linker can't find it.
 # This check should come after all modifications of compiler or linker
 # variables, and before any other run tests.
-{ echo "$as_me:$LINENO: checking test program" >&5
-echo $ECHO_N "checking test program... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking test program" >&5
+$as_echo_n "checking test program... " >&6; }
 if test "$cross_compiling" = yes; then
-  { echo "$as_me:$LINENO: result: cross-compiling" >&5
-echo "${ECHO_T}cross-compiling" >&6; }
+  { $as_echo "$as_me:$LINENO: result: cross-compiling" >&5
+$as_echo "cross-compiling" >&6; }
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -20682,40 +23256,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+  { $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6; }
-{ { echo "$as_me:$LINENO: error:
+{ $as_echo "$as_me:$LINENO: result: failed" >&5
+$as_echo "failed" >&6; }
+{ { $as_echo "$as_me:$LINENO: error:
 Could not execute a simple test program.  This may be a problem
 related to locating shared libraries.  Check the file 'config.log'
 for the exact reason." >&5
-echo "$as_me: error:
+$as_echo "$as_me: error:
 Could not execute a simple test program.  This may be a problem
 related to locating shared libraries.  Check the file 'config.log'
 for the exact reason." >&2;}
    { (exit 1); exit 1; }; }
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -20728,10 +23305,10 @@ fi
 # Force use of our snprintf if system's doesn't do arg control
 # See comment above at snprintf test for details.
 if test "$enable_nls" = yes -a "$pgac_need_repl_snprintf" = no; then
-  { echo "$as_me:$LINENO: checking whether printf supports argument control" >&5
-echo $ECHO_N "checking whether printf supports argument control... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether printf supports argument control" >&5
+$as_echo_n "checking whether printf supports argument control... " >&6; }
 if test "${pgac_cv_printf_arg_control+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   pgac_cv_printf_arg_control=cross
@@ -20762,37 +23339,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   pgac_cv_printf_arg_control=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 pgac_cv_printf_arg_control=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 
 fi
-{ echo "$as_me:$LINENO: result: $pgac_cv_printf_arg_control" >&5
-echo "${ECHO_T}$pgac_cv_printf_arg_control" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $pgac_cv_printf_arg_control" >&5
+$as_echo "$pgac_cv_printf_arg_control" >&6; }
 
   if test $pgac_cv_printf_arg_control != yes ; then
     pgac_need_repl_snprintf=yes
@@ -20801,10 +23381,11 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking whether long int is 64 bits" >&5
-echo $ECHO_N "checking whether long int is 64 bits... $ECHO_C" >&6; }
+
+{ $as_echo "$as_me:$LINENO: checking whether long int is 64 bits" >&5
+$as_echo_n "checking whether long int is 64 bits... " >&6; }
 if test "${pgac_cv_type_long_int_64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # If cross-compiling, check the size reported by the compiler and
@@ -20832,20 +23413,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   pgac_cv_type_long_int_64=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	pgac_cv_type_long_int_64=no
@@ -20892,36 +23474,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   pgac_cv_type_long_int_64=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 pgac_cv_type_long_int_64=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $pgac_cv_type_long_int_64" >&5
-echo "${ECHO_T}$pgac_cv_type_long_int_64" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $pgac_cv_type_long_int_64" >&5
+$as_echo "$pgac_cv_type_long_int_64" >&6; }
 
 HAVE_LONG_INT_64=$pgac_cv_type_long_int_64
 if test x"$pgac_cv_type_long_int_64" = xyes ; then
@@ -20934,10 +23519,10 @@ fi
 
 
 if test x"$HAVE_LONG_INT_64" = x"no" ; then
-  { echo "$as_me:$LINENO: checking whether long long int is 64 bits" >&5
-echo $ECHO_N "checking whether long long int is 64 bits... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether long long int is 64 bits" >&5
+$as_echo_n "checking whether long long int is 64 bits... " >&6; }
 if test "${pgac_cv_type_long_long_int_64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # If cross-compiling, check the size reported by the compiler and
@@ -20965,20 +23550,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   pgac_cv_type_long_long_int_64=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	pgac_cv_type_long_long_int_64=no
@@ -21025,36 +23611,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   pgac_cv_type_long_long_int_64=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 pgac_cv_type_long_long_int_64=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $pgac_cv_type_long_long_int_64" >&5
-echo "${ECHO_T}$pgac_cv_type_long_long_int_64" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $pgac_cv_type_long_long_int_64" >&5
+$as_echo "$pgac_cv_type_long_long_int_64" >&6; }
 
 HAVE_LONG_LONG_INT_64=$pgac_cv_type_long_long_int_64
 if test x"$pgac_cv_type_long_long_int_64" = xyes ; then
@@ -21065,6 +23654,11 @@ _ACEOF
 
 fi
 
+  if test x"$HAVE_LONG_LONG_INT_64" = x"no" ; then
+    { { $as_echo "$as_me:$LINENO: error: Cannot find a working 64-bit integer type." >&5
+$as_echo "$as_me: error: Cannot find a working 64-bit integer type." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
 fi
 
 
@@ -21094,13 +23688,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -21111,7 +23706,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -21128,10 +23723,10 @@ fi
 
 if test "$HAVE_LONG_LONG_INT_64" = yes ; then
   if test $pgac_need_repl_snprintf = no; then
-    { echo "$as_me:$LINENO: checking snprintf format for long long int" >&5
-echo $ECHO_N "checking snprintf format for long long int... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking snprintf format for long long int" >&5
+$as_echo_n "checking snprintf format for long long int... " >&6; }
 if test "${pgac_cv_snprintf_long_long_int_format+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   for pgac_format in '%lld' '%qd' '%I64d'; do
 if test "$cross_compiling" = yes; then
@@ -21174,27 +23769,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   pgac_cv_snprintf_long_long_int_format=$pgac_format; break
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -21205,13 +23803,13 @@ fi
 LONG_LONG_INT_FORMAT=''
 
 case $pgac_cv_snprintf_long_long_int_format in
-  cross) { echo "$as_me:$LINENO: result: cannot test (not on host machine)" >&5
-echo "${ECHO_T}cannot test (not on host machine)" >&6; };;
-  ?*)    { echo "$as_me:$LINENO: result: $pgac_cv_snprintf_long_long_int_format" >&5
-echo "${ECHO_T}$pgac_cv_snprintf_long_long_int_format" >&6; }
+  cross) { $as_echo "$as_me:$LINENO: result: cannot test (not on host machine)" >&5
+$as_echo "cannot test (not on host machine)" >&6; };;
+  ?*)    { $as_echo "$as_me:$LINENO: result: $pgac_cv_snprintf_long_long_int_format" >&5
+$as_echo "$pgac_cv_snprintf_long_long_int_format" >&6; }
          LONG_LONG_INT_FORMAT=$pgac_cv_snprintf_long_long_int_format;;
-  *)     { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; };;
+  *)     { $as_echo "$as_me:$LINENO: result: none" >&5
+$as_echo "none" >&6; };;
 esac
     if test "$LONG_LONG_INT_FORMAT" = ""; then
       # Force usage of our own snprintf, since system snprintf is broken
@@ -21258,69 +23856,15 @@ esac
 
 fi
 
-# Need a #define for the size of Datum (unsigned long)
-{ echo "$as_me:$LINENO: checking for unsigned long" >&5
-echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; }
-if test "${ac_cv_type_unsigned_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef unsigned long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_unsigned_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_unsigned_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
-
+# Check size of void *, size_t (enables tweaks for > 32bit address space)
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of unsigned long" >&5
-echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking size of void *" >&5
+$as_echo_n "checking size of void *... " >&6; }
+if test "${ac_cv_sizeof_void_p+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -21331,11 +23875,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -21348,13 +23891,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -21368,11 +23912,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -21385,20 +23928,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -21412,7 +23956,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -21422,11 +23966,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (void *))) < 0)];
 test_array [0] = 0
 
   ;
@@ -21439,13 +23982,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -21459,11 +24003,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -21476,20 +24019,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -21503,7 +24047,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -21523,11 +24067,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -21540,20 +24083,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -21562,15 +24106,17 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
-?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
-'') if test "$ac_cv_type_unsigned_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+?*) ac_cv_sizeof_void_p=$ac_lo;;
+'') if test "$ac_cv_type_void_p" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned long)
+$as_echo "$as_me: error: cannot compute sizeof (void *)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
-     ac_cv_sizeof_unsigned_long=0
+     ac_cv_sizeof_void_p=0
    fi ;;
 esac
 else
@@ -21581,9 +24127,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef unsigned long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static long int longval () { return (long int) (sizeof (void *)); }
+static unsigned long int ulongval () { return (long int) (sizeof (void *)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -21593,20 +24138,22 @@ main ()
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (void *))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (void *))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (void *))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -21619,115 +24166,64 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_sizeof_unsigned_long=`cat conftest.val`
+  ac_cv_sizeof_void_p=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-if test "$ac_cv_type_unsigned_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+if test "$ac_cv_type_void_p" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned long)
+$as_echo "$as_me: error: cannot compute sizeof (void *)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
-     ac_cv_sizeof_unsigned_long=0
+     ac_cv_sizeof_void_p=0
    fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
+$as_echo "$ac_cv_sizeof_void_p" >&6; }
 
 
 
 cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
-_ACEOF
-
-
-
-# And check size of void *, size_t (enables tweaks for > 32bit address space)
-{ echo "$as_me:$LINENO: checking for void *" >&5
-echo $ECHO_N "checking for void *... $ECHO_C" >&6; }
-if test "${ac_cv_type_void_p+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef void * ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
+#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_void_p=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_void_p=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
-echo "${ECHO_T}$ac_cv_type_void_p" >&6; }
 
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of void *" >&5
-echo $ECHO_N "checking size of void *... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_void_p+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking size of size_t" >&5
+$as_echo_n "checking size of size_t... " >&6; }
+if test "${ac_cv_sizeof_size_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -21738,11 +24234,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef void * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -21755,13 +24250,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -21775,11 +24271,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef void * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -21792,20 +24287,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -21819,7 +24315,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -21829,11 +24325,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef void * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) < 0)];
 test_array [0] = 0
 
   ;
@@ -21846,13 +24341,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -21866,11 +24362,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef void * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -21883,20 +24378,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -21910,7 +24406,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -21930,11 +24426,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef void * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -21947,20 +24442,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -21969,15 +24465,17 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
-?*) ac_cv_sizeof_void_p=$ac_lo;;
-'') if test "$ac_cv_type_void_p" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
+?*) ac_cv_sizeof_size_t=$ac_lo;;
+'') if test "$ac_cv_type_size_t" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (void *)
+$as_echo "$as_me: error: cannot compute sizeof (size_t)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
-     ac_cv_sizeof_void_p=0
+     ac_cv_sizeof_size_t=0
    fi ;;
 esac
 else
@@ -21988,9 +24486,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef void * ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static long int longval () { return (long int) (sizeof (size_t)); }
+static unsigned long int ulongval () { return (long int) (sizeof (size_t)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -22000,20 +24497,22 @@ main ()
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (size_t))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (size_t))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (size_t))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -22026,113 +24525,64 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_sizeof_void_p=`cat conftest.val`
+  ac_cv_sizeof_size_t=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-if test "$ac_cv_type_void_p" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
+if test "$ac_cv_type_size_t" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (void *)
+$as_echo "$as_me: error: cannot compute sizeof (size_t)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
-     ac_cv_sizeof_void_p=0
+     ac_cv_sizeof_size_t=0
    fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
-echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+$as_echo "$ac_cv_sizeof_size_t" >&6; }
 
 
 
 cat >>confdefs.h <<_ACEOF
-#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
-_ACEOF
-
-
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef size_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_size_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_size_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
 
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of size_t" >&5
-echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if test "${ac_cv_sizeof_long+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -22143,11 +24593,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -22160,13 +24609,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -22180,11 +24630,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -22197,20 +24646,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -22224,7 +24674,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -22234,11 +24684,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
 test_array [0] = 0
 
   ;
@@ -22251,13 +24700,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -22271,11 +24721,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -22288,20 +24737,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -22315,7 +24765,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -22335,11 +24785,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -22352,20 +24801,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -22374,15 +24824,17 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
-?*) ac_cv_sizeof_size_t=$ac_lo;;
-'') if test "$ac_cv_type_size_t" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+?*) ac_cv_sizeof_long=$ac_lo;;
+'') if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t)
+$as_echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
-     ac_cv_sizeof_size_t=0
+     ac_cv_sizeof_long=0
    fi ;;
 esac
 else
@@ -22393,9 +24845,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef size_t ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static long int longval () { return (long int) (sizeof (long)); }
+static unsigned long int ulongval () { return (long int) (sizeof (long)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -22405,20 +24856,22 @@ main ()
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (long))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (long))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (long))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -22431,57 +24884,61 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_sizeof_size_t=`cat conftest.val`
+  ac_cv_sizeof_long=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-if test "$ac_cv_type_size_t" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t)
+$as_echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
-     ac_cv_sizeof_size_t=0
+     ac_cv_sizeof_long=0
    fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
 cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+#define SIZEOF_LONG $ac_cv_sizeof_long
 _ACEOF
 
 
 
 # Decide whether float4 is passed by value: user-selectable, enabled by default
-{ echo "$as_me:$LINENO: checking whether to build with float4 passed by value" >&5
-echo $ECHO_N "checking whether to build with float4 passed by value... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build with float4 passed by value" >&5
+$as_echo_n "checking whether to build with float4 passed by value... " >&6; }
 
-pgac_args="$pgac_args enable_float4_byval"
 
 # Check whether --enable-float4-byval was given.
 if test "${enable_float4_byval+set}" = set; then
@@ -22499,8 +24956,8 @@ _ACEOF
       float4passbyval=false
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-float4-byval option" >&5
-echo "$as_me: error: no argument expected for --enable-float4-byval option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --enable-float4-byval option" >&5
+$as_echo "$as_me: error: no argument expected for --enable-float4-byval option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -22516,8 +24973,8 @@ _ACEOF
 fi
 
 
-{ echo "$as_me:$LINENO: result: $enable_float4_byval" >&5
-echo "${ECHO_T}$enable_float4_byval" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_float4_byval" >&5
+$as_echo "$enable_float4_byval" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define FLOAT4PASSBYVAL $float4passbyval
@@ -22528,11 +24985,10 @@ _ACEOF
 # Note: this setting also controls int8 and related types such as timestamp.
 # If sizeof(Datum) >= 8, this is user-selectable, enabled by default.
 # If not, trying to select it is an error.
-{ echo "$as_me:$LINENO: checking whether to build with float8 passed by value" >&5
-echo $ECHO_N "checking whether to build with float8 passed by value... $ECHO_C" >&6; }
-if test $ac_cv_sizeof_unsigned_long -ge 8 ; then
+{ $as_echo "$as_me:$LINENO: checking whether to build with float8 passed by value" >&5
+$as_echo_n "checking whether to build with float8 passed by value... " >&6; }
+if test $ac_cv_sizeof_void_p -ge 8 ; then
 
-pgac_args="$pgac_args enable_float8_byval"
 
 # Check whether --enable-float8-byval was given.
 if test "${enable_float8_byval+set}" = set; then
@@ -22545,8 +25001,8 @@ if test "${enable_float8_byval+set}" = set; then
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-float8-byval option" >&5
-echo "$as_me: error: no argument expected for --enable-float8-byval option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --enable-float8-byval option" >&5
+$as_echo "$as_me: error: no argument expected for --enable-float8-byval option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -22559,7 +25015,6 @@ fi
 
 else
 
-pgac_args="$pgac_args enable_float8_byval"
 
 # Check whether --enable-float8-byval was given.
 if test "${enable_float8_byval+set}" = set; then
@@ -22572,8 +25027,8 @@ if test "${enable_float8_byval+set}" = set; then
       :
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-float8-byval option" >&5
-echo "$as_me: error: no argument expected for --enable-float8-byval option" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: no argument expected for --enable-float8-byval option" >&5
+$as_echo "$as_me: error: no argument expected for --enable-float8-byval option" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
@@ -22585,8 +25040,8 @@ fi
 
 
   if test "$enable_float8_byval" = yes ; then
-    { { echo "$as_me:$LINENO: error: --enable-float8-byval is not supported on 32-bit platforms." >&5
-echo "$as_me: error: --enable-float8-byval is not supported on 32-bit platforms." >&2;}
+    { { $as_echo "$as_me:$LINENO: error: --enable-float8-byval is not supported on 32-bit platforms." >&5
+$as_echo "$as_me: error: --enable-float8-byval is not supported on 32-bit platforms." >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -22600,8 +25055,8 @@ _ACEOF
 else
   float8passbyval=false
 fi
-{ echo "$as_me:$LINENO: result: $enable_float8_byval" >&5
-echo "${ECHO_T}$enable_float8_byval" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_float8_byval" >&5
+$as_echo "$enable_float8_byval" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define FLOAT8PASSBYVAL $float8passbyval
@@ -22610,66 +25065,12 @@ _ACEOF
 
 # Determine memory alignment requirements for the basic C data types.
 
-{ echo "$as_me:$LINENO: checking for short" >&5
-echo $ECHO_N "checking for short... $ECHO_C" >&6; }
-if test "${ac_cv_type_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef short ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_short=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_short=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6; }
-
 # The cast to long int works around a bug in the HP C Compiler,
 # see AC_CHECK_SIZEOF for more information.
-{ echo "$as_me:$LINENO: checking alignment of short" >&5
-echo $ECHO_N "checking alignment of short... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking alignment of short" >&5
+$as_echo_n "checking alignment of short... " >&6; }
 if test "${ac_cv_alignof_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -22700,13 +25101,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -22740,20 +25142,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -22767,7 +25170,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -22797,13 +25200,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -22837,20 +25241,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -22864,7 +25269,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -22904,20 +25309,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -22928,11 +25334,13 @@ done
 case $ac_lo in
 ?*) ac_cv_alignof_short=$ac_lo;;
 '') if test "$ac_cv_type_short" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute alignment of short
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute alignment of short
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute alignment of short
+$as_echo "$as_me: error: cannot compute alignment of short
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_alignof_short=0
    fi ;;
@@ -22965,15 +25373,17 @@ main ()
       long int i = longval ();
       if (i != ((long int) offsetof (ac__type_alignof_, y)))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
       if (i != ((long int) offsetof (ac__type_alignof_, y)))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -22986,43 +25396,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_alignof_short=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_short" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute alignment of short
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute alignment of short
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute alignment of short
+$as_echo "$as_me: error: cannot compute alignment of short
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_alignof_short=0
    fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_alignof_short" >&5
-echo "${ECHO_T}$ac_cv_alignof_short" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_alignof_short" >&5
+$as_echo "$ac_cv_alignof_short" >&6; }
 
 
 
@@ -23031,66 +25446,12 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6; }
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef int ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6; }
-
 # The cast to long int works around a bug in the HP C Compiler,
 # see AC_CHECK_SIZEOF for more information.
-{ echo "$as_me:$LINENO: checking alignment of int" >&5
-echo $ECHO_N "checking alignment of int... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking alignment of int" >&5
+$as_echo_n "checking alignment of int... " >&6; }
 if test "${ac_cv_alignof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -23121,13 +25482,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -23161,20 +25523,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -23188,7 +25551,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -23218,13 +25581,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -23258,20 +25622,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -23285,7 +25650,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -23325,20 +25690,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -23349,11 +25715,13 @@ done
 case $ac_lo in
 ?*) ac_cv_alignof_int=$ac_lo;;
 '') if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute alignment of int
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute alignment of int
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute alignment of int
+$as_echo "$as_me: error: cannot compute alignment of int
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_alignof_int=0
    fi ;;
@@ -23386,15 +25754,17 @@ main ()
       long int i = longval ();
       if (i != ((long int) offsetof (ac__type_alignof_, y)))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
       if (i != ((long int) offsetof (ac__type_alignof_, y)))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -23407,43 +25777,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_alignof_int=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute alignment of int
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute alignment of int
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute alignment of int
+$as_echo "$as_me: error: cannot compute alignment of int
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_alignof_int=0
    fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_alignof_int" >&5
-echo "${ECHO_T}$ac_cv_alignof_int" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_alignof_int" >&5
+$as_echo "$ac_cv_alignof_int" >&6; }
 
 
 
@@ -23452,66 +25827,12 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6; }
-
 # The cast to long int works around a bug in the HP C Compiler,
 # see AC_CHECK_SIZEOF for more information.
-{ echo "$as_me:$LINENO: checking alignment of long" >&5
-echo $ECHO_N "checking alignment of long... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking alignment of long" >&5
+$as_echo_n "checking alignment of long... " >&6; }
 if test "${ac_cv_alignof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -23542,13 +25863,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -23582,20 +25904,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -23609,7 +25932,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -23639,13 +25962,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -23679,20 +26003,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -23706,7 +26031,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -23746,20 +26071,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -23770,11 +26096,13 @@ done
 case $ac_lo in
 ?*) ac_cv_alignof_long=$ac_lo;;
 '') if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute alignment of long
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute alignment of long
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute alignment of long
+$as_echo "$as_me: error: cannot compute alignment of long
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_alignof_long=0
    fi ;;
@@ -23807,15 +26135,17 @@ main ()
       long int i = longval ();
       if (i != ((long int) offsetof (ac__type_alignof_, y)))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
       if (i != ((long int) offsetof (ac__type_alignof_, y)))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -23828,43 +26158,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_alignof_long=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute alignment of long
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute alignment of long
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute alignment of long
+$as_echo "$as_me: error: cannot compute alignment of long
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_alignof_long=0
    fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_alignof_long" >&5
-echo "${ECHO_T}$ac_cv_alignof_long" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_alignof_long" >&5
+$as_echo "$ac_cv_alignof_long" >&6; }
 
 
 
@@ -23874,66 +26209,12 @@ _ACEOF
 
 
 if test x"$HAVE_LONG_LONG_INT_64" = x"yes" ; then
-  { echo "$as_me:$LINENO: checking for long long int" >&5
-echo $ECHO_N "checking for long long int... $ECHO_C" >&6; }
-if test "${ac_cv_type_long_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long long int ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long_long_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long_long_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
-echo "${ECHO_T}$ac_cv_type_long_long_int" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler,
+  # The cast to long int works around a bug in the HP C Compiler,
 # see AC_CHECK_SIZEOF for more information.
-{ echo "$as_me:$LINENO: checking alignment of long long int" >&5
-echo $ECHO_N "checking alignment of long long int... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking alignment of long long int" >&5
+$as_echo_n "checking alignment of long long int... " >&6; }
 if test "${ac_cv_alignof_long_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -23964,13 +26245,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -24004,20 +26286,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -24031,7 +26314,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -24061,13 +26344,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -24101,20 +26385,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -24128,7 +26413,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -24168,20 +26453,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -24192,11 +26478,13 @@ done
 case $ac_lo in
 ?*) ac_cv_alignof_long_long_int=$ac_lo;;
 '') if test "$ac_cv_type_long_long_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute alignment of long long int
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute alignment of long long int
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute alignment of long long int
+$as_echo "$as_me: error: cannot compute alignment of long long int
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_alignof_long_long_int=0
    fi ;;
@@ -24229,15 +26517,17 @@ main ()
       long int i = longval ();
       if (i != ((long int) offsetof (ac__type_alignof_, y)))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
       if (i != ((long int) offsetof (ac__type_alignof_, y)))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -24250,43 +26540,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_alignof_long_long_int=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_long_long_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute alignment of long long int
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute alignment of long long int
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute alignment of long long int
+$as_echo "$as_me: error: cannot compute alignment of long long int
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_alignof_long_long_int=0
    fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_alignof_long_long_int" >&5
-echo "${ECHO_T}$ac_cv_alignof_long_long_int" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_alignof_long_long_int" >&5
+$as_echo "$ac_cv_alignof_long_long_int" >&6; }
 
 
 
@@ -24296,66 +26591,12 @@ _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for double" >&5
-echo $ECHO_N "checking for double... $ECHO_C" >&6; }
-if test "${ac_cv_type_double+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef double ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_double=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_double=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_double" >&5
-echo "${ECHO_T}$ac_cv_type_double" >&6; }
-
 # The cast to long int works around a bug in the HP C Compiler,
 # see AC_CHECK_SIZEOF for more information.
-{ echo "$as_me:$LINENO: checking alignment of double" >&5
-echo $ECHO_N "checking alignment of double... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking alignment of double" >&5
+$as_echo_n "checking alignment of double... " >&6; }
 if test "${ac_cv_alignof_double+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -24386,13 +26627,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -24426,20 +26668,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -24453,7 +26696,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -24483,13 +26726,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -24523,20 +26767,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -24550,7 +26795,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -24590,20 +26835,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -24614,11 +26860,13 @@ done
 case $ac_lo in
 ?*) ac_cv_alignof_double=$ac_lo;;
 '') if test "$ac_cv_type_double" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute alignment of double
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute alignment of double
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute alignment of double
+$as_echo "$as_me: error: cannot compute alignment of double
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_alignof_double=0
    fi ;;
@@ -24651,15 +26899,17 @@ main ()
       long int i = longval ();
       if (i != ((long int) offsetof (ac__type_alignof_, y)))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
       if (i != ((long int) offsetof (ac__type_alignof_, y)))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -24672,43 +26922,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_alignof_double=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_double" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute alignment of double
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute alignment of double
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute alignment of double
+$as_echo "$as_me: error: cannot compute alignment of double
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_alignof_double=0
    fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_alignof_double" >&5
-echo "${ECHO_T}$ac_cv_alignof_double" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_alignof_double" >&5
+$as_echo "$ac_cv_alignof_double" >&6; }
 
 
 
@@ -24738,12 +26993,13 @@ _ACEOF
 
 # Some platforms predefine the types int8, int16, etc.  Only check
 # a (hopefully) representative subset.
-{ echo "$as_me:$LINENO: checking for int8" >&5
-echo $ECHO_N "checking for int8... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for int8" >&5
+$as_echo_n "checking for int8... " >&6; }
 if test "${ac_cv_type_int8+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_int8=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -24754,14 +27010,11 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <SupportDefs.h>
 #endif
 
-typedef int8 ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+if (sizeof (int8))
+       return 0;
   ;
   return 0;
 }
@@ -24772,42 +27025,18 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_int8=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_int8=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_int8" >&5
-echo "${ECHO_T}$ac_cv_type_int8" >&6; }
-if test $ac_cv_type_int8 = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INT8 1
-_ACEOF
-
-
-fi
-{ echo "$as_me:$LINENO: checking for uint8" >&5
-echo $ECHO_N "checking for uint8... $ECHO_C" >&6; }
-if test "${ac_cv_type_uint8+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -24819,14 +27048,11 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <SupportDefs.h>
 #endif
 
-typedef uint8 ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+if (sizeof ((int8)))
+	  return 0;
   ;
   return 0;
 }
@@ -24837,43 +27063,53 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_uint8=yes
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_uint8=no
+	ac_cv_type_int8=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_uint8" >&5
-echo "${ECHO_T}$ac_cv_type_uint8" >&6; }
-if test $ac_cv_type_uint8 = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int8" >&5
+$as_echo "$ac_cv_type_int8" >&6; }
+if test "x$ac_cv_type_int8" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_UINT8 1
+#define HAVE_INT8 1
 _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for int64" >&5
-echo $ECHO_N "checking for int64... $ECHO_C" >&6; }
-if test "${ac_cv_type_int64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking for uint8" >&5
+$as_echo_n "checking for uint8... " >&6; }
+if test "${ac_cv_type_uint8+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_uint8=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -24884,14 +27120,11 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <SupportDefs.h>
 #endif
 
-typedef int64 ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+if (sizeof (uint8))
+       return 0;
   ;
   return 0;
 }
@@ -24902,42 +27135,18 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_int64=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_int64=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_int64" >&5
-echo "${ECHO_T}$ac_cv_type_int64" >&6; }
-if test $ac_cv_type_int64 = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INT64 1
-_ACEOF
-
-
-fi
-{ echo "$as_me:$LINENO: checking for uint64" >&5
-echo $ECHO_N "checking for uint64... $ECHO_C" >&6; }
-if test "${ac_cv_type_uint64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -24949,14 +27158,11 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <SupportDefs.h>
 #endif
 
-typedef uint64 ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+if (sizeof ((uint8)))
+	  return 0;
   ;
   return 0;
 }
@@ -24967,385 +27173,178 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_uint64=yes
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_uint64=no
+	ac_cv_type_uint8=yes
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_uint64" >&5
-echo "${ECHO_T}$ac_cv_type_uint64" >&6; }
-if test $ac_cv_type_uint64 = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_UINT64 1
-_ACEOF
-
-
-fi
-
-
-# We also check for sig_atomic_t, which *should* be defined per ANSI
-# C, but is missing on some old platforms.
-{ echo "$as_me:$LINENO: checking for sig_atomic_t" >&5
-echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_sig_atomic_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <signal.h>
-
-typedef sig_atomic_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_sig_atomic_t=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_sig_atomic_t=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_sig_atomic_t" >&5
-echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6; }
-if test $ac_cv_type_sig_atomic_t = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint8" >&5
+$as_echo "$ac_cv_type_uint8" >&6; }
+if test "x$ac_cv_type_uint8" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_SIG_ATOMIC_T 1
+#define HAVE_UINT8 1
 _ACEOF
 
 
 fi
-
-
-
-# If the user did not disable integer datetimes, check that
-# there is a working 64-bit integral type to use.
-if test x"$USE_INTEGER_DATETIMES" = x"yes" &&
-   test x"$HAVE_LONG_INT_64" = x"no" &&
-   test x"$HAVE_LONG_LONG_INT_64" = x"no" &&
-   test x"$HAVE_INT64" = x"no" ; then
-  { { echo "$as_me:$LINENO: error:
-Integer-based datetime support requires a 64-bit integer type,
-but no such type could be found. The --disable-integer-datetimes
-configure option can be used to disable integer-based storage
-of datetime values." >&5
-echo "$as_me: error:
-Integer-based datetime support requires a 64-bit integer type,
-but no such type could be found. The --disable-integer-datetimes
-configure option can be used to disable integer-based storage
-of datetime values." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-if test "$PORTNAME" != "win32"
-then
-{ echo "$as_me:$LINENO: checking for POSIX signal interface" >&5
-echo $ECHO_N "checking for POSIX signal interface... $ECHO_C" >&6; }
-if test "${pgac_cv_func_posix_signals+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking for int64" >&5
+$as_echo_n "checking for int64... " >&6; }
+if test "${ac_cv_type_int64+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_int64=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <signal.h>
+#include <stdio.h>
+#ifdef HAVE_SUPPORTDEFS_H
+#include <SupportDefs.h>
+#endif
 
 int
 main ()
 {
-struct sigaction act, oact;
-sigemptyset(&act.sa_mask);
-act.sa_flags = SA_RESTART;
-sigaction(0, &act, &oact);
+if (sizeof (int64))
+       return 0;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  pgac_cv_func_posix_signals=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	pgac_cv_func_posix_signals=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $pgac_cv_func_posix_signals" >&5
-echo "${ECHO_T}$pgac_cv_func_posix_signals" >&6; }
-if test x"$pgac_cv_func_posix_signals" = xyes ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_POSIX_SIGNALS
-_ACEOF
-
-fi
-HAVE_POSIX_SIGNALS=$pgac_cv_func_posix_signals
-
-if test "$pgac_cv_func_posix_signals" != yes -a "$enable_thread_safety" = yes; then
-  { { echo "$as_me:$LINENO: error:
-Thread-safety requires POSIX signals, which are not supported by this
-operating system." >&5
-echo "$as_me: error:
-Thread-safety requires POSIX signals, which are not supported by this
-operating system." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-fi
-
-if test $ac_cv_func_fseeko = yes; then
-# Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then
-  enableval=$enable_largefile;
-fi
-
-if test "$enable_largefile" != no; then
-
-  { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
-echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; }
-if test "${ac_cv_sys_largefile_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_sys_largefile_CC=no
-     if test "$GCC" != yes; then
-       ac_save_CC=$CC
-       while :; do
-	 # IRIX 6.2 and later do not support large files by default,
-	 # so use the C compiler's -n32 option if that helps.
-	 cat >conftest.$ac_ext <<_ACEOF
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
+#include <stdio.h>
+#ifdef HAVE_SUPPORTDEFS_H
+#include <SupportDefs.h>
+#endif
+
 int
 main ()
 {
-
+if (sizeof ((int64)))
+	  return 0;
   ;
   return 0;
 }
 _ACEOF
-	 rm -f conftest.$ac_objext
+rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  break
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
+	ac_cv_type_int64=yes
 fi
 
-rm -f core conftest.err conftest.$ac_objext
-	 CC="$CC -n32"
-	 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_sys_largefile_CC=' -n32'; break
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext
-	 break
-       done
-       CC=$ac_save_CC
-       rm -f conftest.$ac_ext
-    fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
-echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; }
-  if test "$ac_cv_sys_largefile_CC" != no; then
-    CC=$CC$ac_cv_sys_largefile_CC
-  fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int64" >&5
+$as_echo "$ac_cv_type_int64" >&6; }
+if test "x$ac_cv_type_int64" = x""yes; then
 
-  { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
-if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  while :; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INT64 1
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_sys_file_offset_bits=no; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:$LINENO: checking for uint64" >&5
+$as_echo_n "checking for uint64... " >&6; }
+if test "${ac_cv_type_uint64+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_uint64=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#define _FILE_OFFSET_BITS 64
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
+#include <stdio.h>
+#ifdef HAVE_SUPPORTDEFS_H
+#include <SupportDefs.h>
+#endif
+
 int
 main ()
 {
-
+if (sizeof (uint64))
+       return 0;
   ;
   return 0;
 }
@@ -25356,67 +27355,34 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_sys_file_offset_bits=64; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_file_offset_bits=unknown
-  break
-done
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
-echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
-case $ac_cv_sys_file_offset_bits in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-_ACEOF
-;;
-esac
-rm -f conftest*
-  if test $ac_cv_sys_file_offset_bits = unknown; then
-    { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
-echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
-if test "${ac_cv_sys_large_files+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  while :; do
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
+#include <stdio.h>
+#ifdef HAVE_SUPPORTDEFS_H
+#include <SupportDefs.h>
+#endif
+
 int
 main ()
 {
-
+if (sizeof ((uint64)))
+	  return 0;
   ;
   return 0;
 }
@@ -25427,176 +27393,69 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_sys_large_files=no; break
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
+	ac_cv_type_uint64=yes
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#define _LARGE_FILES 1
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_sys_large_files=1; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_large_files=unknown
-  break
-done
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
-echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
-case $ac_cv_sys_large_files in #(
-  no | unknown) ;;
-  *)
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint64" >&5
+$as_echo "$ac_cv_type_uint64" >&6; }
+if test "x$ac_cv_type_uint64" = x""yes; then
+
 cat >>confdefs.h <<_ACEOF
-#define _LARGE_FILES $ac_cv_sys_large_files
+#define HAVE_UINT64 1
 _ACEOF
-;;
-esac
-rm -f conftest*
-  fi
-fi
-
-fi
 
-# Check for largefile support (must be after AC_SYS_LARGEFILE)
-{ echo "$as_me:$LINENO: checking for off_t" >&5
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_off_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef off_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_off_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_off_t=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
 
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of off_t" >&5
-echo $ECHO_N "checking size of off_t... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_off_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+# We also check for sig_atomic_t, which *should* be defined per ANSI
+# C, but is missing on some old platforms.
+{ $as_echo "$as_me:$LINENO: checking for sig_atomic_t" >&5
+$as_echo_n "checking for sig_atomic_t... " >&6; }
+if test "${ac_cv_type_sig_atomic_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
+  ac_cv_type_sig_atomic_t=no
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
-   typedef off_t ac__type_sizeof_;
+#include <signal.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
+if (sizeof (sig_atomic_t))
+       return 0;
   ;
   return 0;
 }
@@ -25607,33 +27466,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
-   typedef off_t ac__type_sizeof_;
+#include <signal.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
+if (sizeof ((sig_atomic_t)))
+	  return 0;
   ;
   return 0;
 }
@@ -25644,298 +27501,135 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
+	ac_cv_type_sig_atomic_t=yes
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef off_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef off_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_sig_atomic_t" >&5
+$as_echo "$ac_cv_type_sig_atomic_t" >&6; }
+if test "x$ac_cv_type_sig_atomic_t" = x""yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SIG_ATOMIC_T 1
+_ACEOF
+
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+
+
+if test "$PORTNAME" != "win32"
+then
+{ $as_echo "$as_me:$LINENO: checking for POSIX signal interface" >&5
+$as_echo_n "checking for POSIX signal interface... " >&6; }
+if test "${pgac_cv_func_posix_signals+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
-   typedef off_t ac__type_sizeof_;
+#include <signal.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
+struct sigaction act, oact;
+sigemptyset(&act.sa_mask);
+act.sa_flags = SA_RESTART;
+sigaction(0, &act, &oact);
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  pgac_cv_func_posix_signals=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_lo=`expr '(' $ac_mid ')' + 1`
+	pgac_cv_func_posix_signals=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_off_t=$ac_lo;;
-'') if test "$ac_cv_type_off_t" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (off_t)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_off_t=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef off_t ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_off_t=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_off_t" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (off_t)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_off_t=0
-   fi
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6; }
-
-
+{ $as_echo "$as_me:$LINENO: result: $pgac_cv_func_posix_signals" >&5
+$as_echo "$pgac_cv_func_posix_signals" >&6; }
+if test x"$pgac_cv_func_posix_signals" = xyes ; then
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_OFF_T $ac_cv_sizeof_off_t
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_POSIX_SIGNALS /**/
 _ACEOF
 
+fi
+HAVE_POSIX_SIGNALS=$pgac_cv_func_posix_signals
 
-
-# If we don't have largefile support, can't handle segsize >= 2GB.
-if test "$ac_cv_sizeof_off_t" -lt 8 -a "$segsize" != "1"; then
-   { { echo "$as_me:$LINENO: error: Large file support is not enabled. Segment size cannot be larger than 1GB." >&5
-echo "$as_me: error: Large file support is not enabled. Segment size cannot be larger than 1GB." >&2;}
+if test "$pgac_cv_func_posix_signals" != yes -a "$enable_thread_safety" = yes; then
+  { { $as_echo "$as_me:$LINENO: error:
+Thread-safety requires POSIX signals, which are not supported by this
+operating system;  use --disable-thread-safety to disable thread safety." >&5
+$as_echo "$as_me: error:
+Thread-safety requires POSIX signals, which are not supported by this
+operating system;  use --disable-thread-safety to disable thread safety." >&2;}
    { (exit 1); exit 1; }; }
 fi
+fi
 
 # SunOS doesn't handle negative byte comparisons properly with +/- return
-{ echo "$as_me:$LINENO: checking for working memcmp" >&5
-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for working memcmp" >&5
+$as_echo_n "checking for working memcmp... " >&6; }
 if test "${ac_cv_func_memcmp_working+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_func_memcmp_working=no
@@ -25985,36 +27679,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_memcmp_working=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_func_memcmp_working=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
+$as_echo "$ac_cv_func_memcmp_working" >&6; }
 test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
   *" memcmp.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
@@ -26090,10 +27787,10 @@ _ACEOF
 
 if test "$enable_nls" = yes ; then
 
-  { echo "$as_me:$LINENO: checking for library containing bind_textdomain_codeset" >&5
-echo $ECHO_N "checking for library containing bind_textdomain_codeset... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for library containing bind_textdomain_codeset" >&5
+$as_echo_n "checking for library containing bind_textdomain_codeset... " >&6; }
 if test "${ac_cv_search_bind_textdomain_codeset+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -26131,26 +27828,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_bind_textdomain_codeset=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_bind_textdomain_codeset+set}" = set; then
@@ -26165,30 +27866,30 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_bind_textdomain_codeset" >&5
-echo "${ECHO_T}$ac_cv_search_bind_textdomain_codeset" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_bind_textdomain_codeset" >&5
+$as_echo "$ac_cv_search_bind_textdomain_codeset" >&6; }
 ac_res=$ac_cv_search_bind_textdomain_codeset
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: a gettext implementation is required for NLS" >&5
-echo "$as_me: error: a gettext implementation is required for NLS" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: a gettext implementation is required for NLS" >&5
+$as_echo "$as_me: error: a gettext implementation is required for NLS" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
   if test "${ac_cv_header_libintl_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
+$as_echo_n "checking for libintl.h... " >&6; }
 if test "${ac_cv_header_libintl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+$as_echo "$ac_cv_header_libintl_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
-echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
+$as_echo_n "checking libintl.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26204,32 +27905,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking libintl.h presence" >&5
-echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
+$as_echo_n "checking libintl.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26243,51 +27945,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: libintl.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libintl.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: libintl.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -26296,22 +27999,22 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
+$as_echo_n "checking for libintl.h... " >&6; }
 if test "${ac_cv_header_libintl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_libintl_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+$as_echo "$ac_cv_header_libintl_h" >&6; }
 
 fi
-if test $ac_cv_header_libintl_h = yes; then
+if test "x$ac_cv_header_libintl_h" = x""yes; then
   :
 else
-  { { echo "$as_me:$LINENO: error: header file <libintl.h> is required for NLS" >&5
-echo "$as_me: error: header file <libintl.h> is required for NLS" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: header file <libintl.h> is required for NLS" >&5
+$as_echo "$as_me: error: header file <libintl.h> is required for NLS" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -26320,10 +28023,10 @@ fi
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_MSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$MSGFMT"; then
   ac_cv_prog_MSGFMT="$MSGFMT" # Let the user override the test.
@@ -26336,7 +28039,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_MSGFMT="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -26347,11 +28050,11 @@ fi
 fi
 MSGFMT=$ac_cv_prog_MSGFMT
 if test -n "$MSGFMT"; then
-  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -26359,18 +28062,18 @@ fi
 done
 
   if test -z "$MSGFMT"; then
-    { { echo "$as_me:$LINENO: error: msgfmt is required for NLS" >&5
-echo "$as_me: error: msgfmt is required for NLS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: msgfmt is required for NLS" >&5
+$as_echo "$as_me: error: msgfmt is required for NLS" >&2;}
    { (exit 1); exit 1; }; }
   fi
   for ac_prog in msgmerge
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_MSGMERGE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$MSGMERGE"; then
   ac_cv_prog_MSGMERGE="$MSGMERGE" # Let the user override the test.
@@ -26383,7 +28086,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_MSGMERGE="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -26394,11 +28097,11 @@ fi
 fi
 MSGMERGE=$ac_cv_prog_MSGMERGE
 if test -n "$MSGMERGE"; then
-  { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-echo "${ECHO_T}$MSGMERGE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+$as_echo "$MSGMERGE" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -26409,10 +28112,10 @@ done
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_XGETTEXT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$XGETTEXT"; then
   ac_cv_prog_XGETTEXT="$XGETTEXT" # Let the user override the test.
@@ -26425,7 +28128,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_XGETTEXT="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -26436,11 +28139,11 @@ fi
 fi
 XGETTEXT=$ac_cv_prog_XGETTEXT
 if test -n "$XGETTEXT"; then
-  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -26456,10 +28159,10 @@ if test "$with_tcl" = yes; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_TCLSH+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $TCLSH in
   [\\/]* | ?:[\\/]*)
@@ -26474,7 +28177,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -26486,11 +28189,11 @@ esac
 fi
 TCLSH=$ac_cv_path_TCLSH
 if test -n "$TCLSH"; then
-  { echo "$as_me:$LINENO: result: $TCLSH" >&5
-echo "${ECHO_T}$TCLSH" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $TCLSH" >&5
+$as_echo "$TCLSH" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -26498,21 +28201,21 @@ fi
 done
 
 if test x"$TCLSH" = x""; then
-  { { echo "$as_me:$LINENO: error: Tcl shell not found" >&5
-echo "$as_me: error: Tcl shell not found" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: Tcl shell not found" >&5
+$as_echo "$as_me: error: Tcl shell not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-{ echo "$as_me:$LINENO: checking for tclConfig.sh" >&5
-echo $ECHO_N "checking for tclConfig.sh... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for tclConfig.sh" >&5
+$as_echo_n "checking for tclConfig.sh... " >&6; }
 # Let user override test
 if test -z "$TCL_CONFIG_SH"; then
     pgac_test_dirs="$with_tclconfig"
 
     set X $pgac_test_dirs; shift
     if test $# -eq 0; then
-        test -z "$TCLSH" && { { echo "$as_me:$LINENO: error: unable to locate tclConfig.sh because no Tcl shell was found" >&5
-echo "$as_me: error: unable to locate tclConfig.sh because no Tcl shell was found" >&2;}
+        test -z "$TCLSH" && { { $as_echo "$as_me:$LINENO: error: unable to locate tclConfig.sh because no Tcl shell was found" >&5
+$as_echo "$as_me: error: unable to locate tclConfig.sh because no Tcl shell was found" >&2;}
    { (exit 1); exit 1; }; }
         set X `echo 'puts $auto_path' | $TCLSH`; shift
     fi
@@ -26526,14 +28229,14 @@ echo "$as_me: error: unable to locate tclConfig.sh because no Tcl shell was foun
 fi
 
 if test -z "$TCL_CONFIG_SH"; then
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-    { { echo "$as_me:$LINENO: error: file 'tclConfig.sh' is required for Tcl" >&5
-echo "$as_me: error: file 'tclConfig.sh' is required for Tcl" >&2;}
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+    { { $as_echo "$as_me:$LINENO: error: file 'tclConfig.sh' is required for Tcl" >&5
+$as_echo "$as_me: error: file 'tclConfig.sh' is required for Tcl" >&2;}
    { (exit 1); exit 1; }; }
 else
-    { echo "$as_me:$LINENO: result: $TCL_CONFIG_SH" >&5
-echo "${ECHO_T}$TCL_CONFIG_SH" >&6; }
+    { $as_echo "$as_me:$LINENO: result: $TCL_CONFIG_SH" >&5
+$as_echo "$TCL_CONFIG_SH" >&6; }
 fi
 
 
@@ -26549,17 +28252,17 @@ eval TCL_SHARED_BUILD=\"$TCL_SHARED_BUILD\"
     ac_save_CPPFLAGS=$CPPFLAGS
     CPPFLAGS="$TCL_INCLUDE_SPEC $CPPFLAGS"
     if test "${ac_cv_header_tcl_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for tcl.h" >&5
-echo $ECHO_N "checking for tcl.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for tcl.h" >&5
+$as_echo_n "checking for tcl.h... " >&6; }
 if test "${ac_cv_header_tcl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_tcl_h" >&5
-echo "${ECHO_T}$ac_cv_header_tcl_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tcl_h" >&5
+$as_echo "$ac_cv_header_tcl_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking tcl.h usability" >&5
-echo $ECHO_N "checking tcl.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking tcl.h usability" >&5
+$as_echo_n "checking tcl.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26575,32 +28278,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking tcl.h presence" >&5
-echo $ECHO_N "checking tcl.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking tcl.h presence" >&5
+$as_echo_n "checking tcl.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26614,51 +28318,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: tcl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: tcl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: tcl.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: tcl.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: tcl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: tcl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: tcl.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: tcl.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: tcl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: tcl.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: tcl.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: tcl.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: tcl.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: tcl.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: tcl.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: tcl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: tcl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: tcl.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: tcl.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: tcl.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: tcl.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: tcl.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: tcl.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: tcl.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: tcl.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: tcl.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: tcl.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: tcl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: tcl.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: tcl.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: tcl.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: tcl.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ---------------------------------------- ##
 ## Report this to [email protected] ##
@@ -26667,22 +28372,22 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for tcl.h" >&5
-echo $ECHO_N "checking for tcl.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for tcl.h" >&5
+$as_echo_n "checking for tcl.h... " >&6; }
 if test "${ac_cv_header_tcl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_tcl_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_tcl_h" >&5
-echo "${ECHO_T}$ac_cv_header_tcl_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tcl_h" >&5
+$as_echo "$ac_cv_header_tcl_h" >&6; }
 
 fi
-if test $ac_cv_header_tcl_h = yes; then
+if test "x$ac_cv_header_tcl_h" = x""yes; then
   :
 else
-  { { echo "$as_me:$LINENO: error: header file <tcl.h> is required for Tcl" >&5
-echo "$as_me: error: header file <tcl.h> is required for Tcl" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: header file <tcl.h> is required for Tcl" >&5
+$as_echo "$as_me: error: header file <tcl.h> is required for Tcl" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -26697,10 +28402,10 @@ for ac_prog in onsgmls nsgmls
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_NSGMLS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$NSGMLS"; then
   ac_cv_prog_NSGMLS="$NSGMLS" # Let the user override the test.
@@ -26713,7 +28418,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_NSGMLS="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -26724,11 +28429,11 @@ fi
 fi
 NSGMLS=$ac_cv_prog_NSGMLS
 if test -n "$NSGMLS"; then
-  { echo "$as_me:$LINENO: result: $NSGMLS" >&5
-echo "${ECHO_T}$NSGMLS" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $NSGMLS" >&5
+$as_echo "$NSGMLS" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -26739,10 +28444,10 @@ for ac_prog in openjade jade
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_JADE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$JADE"; then
   ac_cv_prog_JADE="$JADE" # Let the user override the test.
@@ -26755,7 +28460,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_JADE="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -26766,11 +28471,11 @@ fi
 fi
 JADE=$ac_cv_prog_JADE
 if test -n "$JADE"; then
-  { echo "$as_me:$LINENO: result: $JADE" >&5
-echo "${ECHO_T}$JADE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $JADE" >&5
+$as_echo "$JADE" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -26778,10 +28483,10 @@ fi
 done
 
 
-{ echo "$as_me:$LINENO: checking for DocBook V4.2" >&5
-echo $ECHO_N "checking for DocBook V4.2... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for DocBook V4.2" >&5
+$as_echo_n "checking for DocBook V4.2... " >&6; }
 if test "${pgac_cv_check_docbook+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.sgml <<EOF
 <!doctype book PUBLIC "-//OASIS//DTD DocBook V4.2//EN">
@@ -26807,16 +28512,16 @@ if test -n "$NSGMLS"; then
 fi
 rm -f conftest.sgml
 fi
-{ echo "$as_me:$LINENO: result: $pgac_cv_check_docbook" >&5
-echo "${ECHO_T}$pgac_cv_check_docbook" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $pgac_cv_check_docbook" >&5
+$as_echo "$pgac_cv_check_docbook" >&6; }
 
 have_docbook=$pgac_cv_check_docbook
 
 
-{ echo "$as_me:$LINENO: checking for DocBook stylesheets" >&5
-echo $ECHO_N "checking for DocBook stylesheets... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for DocBook stylesheets" >&5
+$as_echo_n "checking for DocBook stylesheets... " >&6; }
 if test "${pgac_cv_path_stylesheets+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$DOCBOOKSTYLE"; then
   pgac_cv_path_stylesheets=$DOCBOOKSTYLE
@@ -26849,21 +28554,21 @@ fi
 DOCBOOKSTYLE=$pgac_cv_path_stylesheets
 
 if test -n "$DOCBOOKSTYLE"; then
-  { echo "$as_me:$LINENO: result: $DOCBOOKSTYLE" >&5
-echo "${ECHO_T}$DOCBOOKSTYLE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $DOCBOOKSTYLE" >&5
+$as_echo "$DOCBOOKSTYLE" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 if test -n "$DOCBOOKSTYLE"; then
   for ac_prog in collateindex.pl
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_COLLATEINDEX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $COLLATEINDEX in
   [\\/]* | ?:[\\/]*)
@@ -26878,7 +28583,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_COLLATEINDEX="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -26890,11 +28595,11 @@ esac
 fi
 COLLATEINDEX=$ac_cv_path_COLLATEINDEX
 if test -n "$COLLATEINDEX"; then
-  { echo "$as_me:$LINENO: result: $COLLATEINDEX" >&5
-echo "${ECHO_T}$COLLATEINDEX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $COLLATEINDEX" >&5
+$as_echo "$COLLATEINDEX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -26906,10 +28611,10 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_COLLATEINDEX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $COLLATEINDEX in
   [\\/]* | ?:[\\/]*)
@@ -26924,7 +28629,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_COLLATEINDEX="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -26936,11 +28641,11 @@ esac
 fi
 COLLATEINDEX=$ac_cv_path_COLLATEINDEX
 if test -n "$COLLATEINDEX"; then
-  { echo "$as_me:$LINENO: result: $COLLATEINDEX" >&5
-echo "${ECHO_T}$COLLATEINDEX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $COLLATEINDEX" >&5
+$as_echo "$COLLATEINDEX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -26948,17 +28653,17 @@ fi
 done
 
 fi
-for ac_prog in sgmlspl
+for ac_prog in xsltproc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_SGMLSPL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_XSLTPROC+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  if test -n "$SGMLSPL"; then
-  ac_cv_prog_SGMLSPL="$SGMLSPL" # Let the user override the test.
+  if test -n "$XSLTPROC"; then
+  ac_cv_prog_XSLTPROC="$XSLTPROC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -26967,8 +28672,8 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_SGMLSPL="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    ac_cv_prog_XSLTPROC="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -26977,49 +28682,60 @@ IFS=$as_save_IFS
 
 fi
 fi
-SGMLSPL=$ac_cv_prog_SGMLSPL
-if test -n "$SGMLSPL"; then
-  { echo "$as_me:$LINENO: result: $SGMLSPL" >&5
-echo "${ECHO_T}$SGMLSPL" >&6; }
+XSLTPROC=$ac_cv_prog_XSLTPROC
+if test -n "$XSLTPROC"; then
+  { $as_echo "$as_me:$LINENO: result: $XSLTPROC" >&5
+$as_echo "$XSLTPROC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-  test -n "$SGMLSPL" && break
+  test -n "$XSLTPROC" && break
 done
 
-{ echo "$as_me:$LINENO: checking for docbook2man" >&5
-echo $ECHO_N "checking for docbook2man... $ECHO_C" >&6; }
-if test "${ac_cv_path_DOCBOOK2MAN+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+for ac_prog in osx sgml2xml sx
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OSX+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  if test -z "$DOCBOOK2MAN"; then
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  if test -n "$OSX"; then
+  ac_cv_prog_OSX="$OSX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in docbook2x-man db2x_docbook2man docbook2man; do
-    ac_path="$as_dir/$ac_prog"
-    { test -f "$ac_path" && $as_test_x "$ac_path"; } || continue
-    if "$ac_path" --version 2>/dev/null | $GREP docbook2x >/dev/null 2>&1; then
-      ac_cv_path_DOCBOOK2MAN=$ac_path
-      break
-    fi
-  done
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OSX="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
 done
 IFS=$as_save_IFS
 
-else
-  ac_cv_path_DOCBOOK2MAN=$DOCBOOK2MAN
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_DOCBOOK2MAN" >&5
-echo "${ECHO_T}$ac_cv_path_DOCBOOK2MAN" >&6; }
-DOCBOOK2MAN=$ac_cv_path_DOCBOOK2MAN
+OSX=$ac_cv_prog_OSX
+if test -n "$OSX"; then
+  { $as_echo "$as_me:$LINENO: result: $OSX" >&5
+$as_echo "$OSX" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
 
+  test -n "$OSX" && break
+done
 
 
 # Thread testing
@@ -27027,41 +28743,24 @@ DOCBOOK2MAN=$ac_cv_path_DOCBOOK2MAN
 # We have to run the thread test near the end so we have all our symbols
 # defined.  Cross compiling throws a warning.
 #
-if test "$enable_thread_safety_force" = yes; then
-if test "$PORTNAME" != "win32"
-then
-  { echo "$as_me:$LINENO: WARNING:
-*** Skipping thread test program.  --enable-thread-safety-force was used.
-*** Run the program in src/test/thread on the your machine and add proper
-*** locking function calls to your applications to guarantee thread safety.
-" >&5
-echo "$as_me: WARNING:
-*** Skipping thread test program.  --enable-thread-safety-force was used.
-*** Run the program in src/test/thread on the your machine and add proper
-*** locking function calls to your applications to guarantee thread safety.
-" >&2;}
-else
-{ echo "$as_me:$LINENO: WARNING: *** skipping thread test on Win32" >&5
-echo "$as_me: WARNING: *** skipping thread test on Win32" >&2;}
-fi
-elif test "$enable_thread_safety" = yes; then
+if test "$enable_thread_safety" = yes; then
 if test "$PORTNAME" != "win32"
 then
-{ echo "$as_me:$LINENO: checking thread safety of required library functions" >&5
-echo $ECHO_N "checking thread safety of required library functions... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking thread safety of required library functions" >&5
+$as_echo_n "checking thread safety of required library functions... " >&6; }
 
 _CFLAGS="$CFLAGS"
 _LIBS="$LIBS"
 CFLAGS="$CFLAGS $PTHREAD_CFLAGS -DIN_CONFIGURE"
 LIBS="$LIBS $PTHREAD_LIBS"
 if test "$cross_compiling" = yes; then
-  { echo "$as_me:$LINENO: result: maybe" >&5
-echo "${ECHO_T}maybe" >&6; }
-  { echo "$as_me:$LINENO: WARNING:
+  { $as_echo "$as_me:$LINENO: result: maybe" >&5
+$as_echo "maybe" >&6; }
+  { $as_echo "$as_me:$LINENO: WARNING:
 *** Skipping thread test program because of cross-compile build.
 *** Run the program in src/test/thread on the target machine.
 " >&5
-echo "$as_me: WARNING:
+$as_echo "$as_me: WARNING:
 *** Skipping thread test program because of cross-compile build.
 *** Run the program in src/test/thread on the target machine.
 " >&2;}
@@ -27080,48 +28779,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  { { echo "$as_me:$LINENO: error: thread test program failed
-This platform is not thread-safe.  Check the file 'config.log' for the
-exact reason.
-
-You can use the configure option --enable-thread-safety-force to force
-threads to be enabled.  But you must then run the program in
-src/test/thread and add locking function calls to your applications to
-guarantee thread safety." >&5
-echo "$as_me: error: thread test program failed
-This platform is not thread-safe.  Check the file 'config.log' for the
-exact reason.
-
-You can use the configure option --enable-thread-safety-force to force
-threads to be enabled.  But you must then run the program in
-src/test/thread and add locking function calls to your applications to
-guarantee thread safety." >&2;}
+{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+  { { $as_echo "$as_me:$LINENO: error: thread test program failed
+This platform is not thread-safe.  Check the file 'config.log' or compile
+and run src/test/thread/thread_test for the exact reason.
+Use --disable-thread-safety to disable thread safety." >&5
+$as_echo "$as_me: error: thread test program failed
+This platform is not thread-safe.  Check the file 'config.log' or compile
+and run src/test/thread/thread_test for the exact reason.
+Use --disable-thread-safety to disable thread safety." >&2;}
    { (exit 1); exit 1; }; }
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -27129,15 +28823,14 @@ fi
 CFLAGS="$_CFLAGS"
 LIBS="$_LIBS"
 else
-{ echo "$as_me:$LINENO: WARNING: *** skipping thread test on Win32" >&5
-echo "$as_me: WARNING: *** skipping thread test on Win32" >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: *** skipping thread test on Win32" >&5
+$as_echo "$as_me: WARNING: *** skipping thread test on Win32" >&2;}
 fi
 fi
 
 # If compiler will take -Wl,--as-needed (or various platform-specific
 # spellings thereof) then add that to LDFLAGS.  This is much easier than
 # trying to filter LIBS to the minimum for each executable.
-# (Note that shared library links won't use this switch, though.)
 # On (at least) some Red-Hat-derived systems, this switch breaks linking to
 # libreadline; therefore we postpone testing it until we know what library
 # dependencies readline has.  The test code will try to link with $LIBS.
@@ -27148,14 +28841,14 @@ else
 fi
 
 if test "$PORTNAME" = "darwin"; then
-  { echo "$as_me:$LINENO: checking if $CC supports -Wl,-dead_strip_dylibs" >&5
-echo $ECHO_N "checking if $CC supports -Wl,-dead_strip_dylibs... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if $CC supports -Wl,-dead_strip_dylibs" >&5
+$as_echo_n "checking if $CC supports -Wl,-dead_strip_dylibs... " >&6; }
 pgac_save_LDFLAGS=$LDFLAGS
 LDFLAGS="$pgac_save_LDFLAGS -Wl,-dead_strip_dylibs"
 if test "$cross_compiling" = yes; then
   LDFLAGS="$pgac_save_LDFLAGS"
-               { echo "$as_me:$LINENO: result: assuming no" >&5
-echo "${ECHO_T}assuming no" >&6; }
+               { $as_echo "$as_me:$LINENO: result: assuming no" >&5
+$as_echo "assuming no" >&6; }
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -27178,46 +28871,49 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 LDFLAGS="$pgac_save_LDFLAGS"
-               { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+               { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 
 elif test "$PORTNAME" = "openbsd"; then
-  { echo "$as_me:$LINENO: checking if $CC supports -Wl,-Bdynamic" >&5
-echo $ECHO_N "checking if $CC supports -Wl,-Bdynamic... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if $CC supports -Wl,-Bdynamic" >&5
+$as_echo_n "checking if $CC supports -Wl,-Bdynamic... " >&6; }
 pgac_save_LDFLAGS=$LDFLAGS
 LDFLAGS="$pgac_save_LDFLAGS -Wl,-Bdynamic"
 if test "$cross_compiling" = yes; then
   LDFLAGS="$pgac_save_LDFLAGS"
-               { echo "$as_me:$LINENO: result: assuming no" >&5
-echo "${ECHO_T}assuming no" >&6; }
+               { $as_echo "$as_me:$LINENO: result: assuming no" >&5
+$as_echo "assuming no" >&6; }
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -27240,46 +28936,49 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 LDFLAGS="$pgac_save_LDFLAGS"
-               { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+               { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 
 else
-  { echo "$as_me:$LINENO: checking if $CC supports -Wl,--as-needed" >&5
-echo $ECHO_N "checking if $CC supports -Wl,--as-needed... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if $CC supports -Wl,--as-needed" >&5
+$as_echo_n "checking if $CC supports -Wl,--as-needed... " >&6; }
 pgac_save_LDFLAGS=$LDFLAGS
 LDFLAGS="$pgac_save_LDFLAGS -Wl,--as-needed"
 if test "$cross_compiling" = yes; then
   LDFLAGS="$pgac_save_LDFLAGS"
-               { echo "$as_me:$LINENO: result: assuming no" >&5
-echo "${ECHO_T}assuming no" >&6; }
+               { $as_echo "$as_me:$LINENO: result: assuming no" >&5
+$as_echo "assuming no" >&6; }
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -27302,32 +29001,35 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 LDFLAGS="$pgac_save_LDFLAGS"
-               { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+               { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -27338,12 +29040,12 @@ fi
 
 # Begin output steps
 
-{ echo "$as_me:$LINENO: using CFLAGS=$CFLAGS" >&5
-echo "$as_me: using CFLAGS=$CFLAGS" >&6;}
-{ echo "$as_me:$LINENO: using CPPFLAGS=$CPPFLAGS" >&5
-echo "$as_me: using CPPFLAGS=$CPPFLAGS" >&6;}
-{ echo "$as_me:$LINENO: using LDFLAGS=$LDFLAGS" >&5
-echo "$as_me: using LDFLAGS=$LDFLAGS" >&6;}
+{ $as_echo "$as_me:$LINENO: using CFLAGS=$CFLAGS" >&5
+$as_echo "$as_me: using CFLAGS=$CFLAGS" >&6;}
+{ $as_echo "$as_me:$LINENO: using CPPFLAGS=$CPPFLAGS" >&5
+$as_echo "$as_me: using CPPFLAGS=$CPPFLAGS" >&6;}
+{ $as_echo "$as_me:$LINENO: using LDFLAGS=$LDFLAGS" >&5
+$as_echo "$as_me: using LDFLAGS=$LDFLAGS" >&6;}
 
 # Create compiler version string
 if test x"$GCC" = x"yes" ; then
@@ -27381,14 +29083,14 @@ if ( test "$srcdir" -ef . ) >/dev/null 2>&1 || test "`cd $srcdir && /bin/pwd`" =
 else
   vpath_build=yes
   if test "$no_create" != yes; then
-    echo $ECHO_N "preparing build tree... $ECHO_C" >&6
+    $as_echo_n "preparing build tree... " >&6
     pgac_abs_top_srcdir=`cd "$srcdir" && pwd`
     $SHELL "$ac_aux_dir/prep_buildtree" "$pgac_abs_top_srcdir" "." \
-      || { { echo "$as_me:$LINENO: error: failed" >&5
-echo "$as_me: error: failed" >&2;}
+      || { { $as_echo "$as_me:$LINENO: error: failed" >&5
+$as_echo "$as_me: error: failed" >&2;}
    { (exit 1); exit 1; }; }
-    { echo "$as_me:$LINENO: result: done" >&5
-echo "${ECHO_T}done" >&6; }
+    { $as_echo "$as_me:$LINENO: result: done" >&5
+$as_echo "done" >&6; }
   fi
 fi
 
@@ -27438,11 +29140,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -27475,12 +29178,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -27496,7 +29199,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -27508,12 +29211,14 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 
+
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -27526,7 +29231,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -27536,7 +29241,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -27558,17 +29263,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -27584,8 +29317,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -27608,7 +29339,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -27621,17 +29352,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -27653,7 +29377,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -27704,7 +29428,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -27732,7 +29456,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -27745,19 +29468,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -27782,10 +29508,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -27807,8 +29533,8 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by PostgreSQL $as_me 8.4.0, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+This file was extended by PostgreSQL $as_me 9.0beta3, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -27821,7 +29547,16 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -27830,22 +29565,23 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -27862,23 +29598,25 @@ $config_commands
 Report bugs to <[email protected]>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-PostgreSQL config.status 8.4.0
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+PostgreSQL config.status 9.0beta3
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -27900,30 +29638,36 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
+    { $as_echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -27942,30 +29686,32 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -27984,8 +29730,8 @@ do
     "src/include/pg_config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/include/pg_config.h" ;;
     "src/interfaces/ecpg/include/ecpg_config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/interfaces/ecpg/include/ecpg_config.h" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -28027,263 +29773,144 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
-
 
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-configure_args!$configure_args$ac_delim
-PG_MAJORVERSION!$PG_MAJORVERSION$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-PORTNAME!$PORTNAME$ac_delim
-enable_nls!$enable_nls$ac_delim
-WANTED_LANGUAGES!$WANTED_LANGUAGES$ac_delim
-default_port!$default_port$ac_delim
-enable_shared!$enable_shared$ac_delim
-enable_rpath!$enable_rpath$ac_delim
-enable_debug!$enable_debug$ac_delim
-enable_profiling!$enable_profiling$ac_delim
-GCOV!$GCOV$ac_delim
-LCOV!$LCOV$ac_delim
-GENHTML!$GENHTML$ac_delim
-enable_coverage!$enable_coverage$ac_delim
-DTRACE!$DTRACE$ac_delim
-DTRACEFLAGS!$DTRACEFLAGS$ac_delim
-enable_dtrace!$enable_dtrace$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-SUN_STUDIO_CC!$SUN_STUDIO_CC$ac_delim
-CPP!$CPP$ac_delim
-GCC!$GCC$ac_delim
-TAS!$TAS$ac_delim
-autodepend!$autodepend$ac_delim
-INCLUDES!$INCLUDES$ac_delim
-enable_thread_safety!$enable_thread_safety$ac_delim
-with_tcl!$with_tcl$ac_delim
-with_perl!$with_perl$ac_delim
-with_python!$with_python$ac_delim
-with_gssapi!$with_gssapi$ac_delim
-with_krb5!$with_krb5$ac_delim
-krb_srvtab!$krb_srvtab$ac_delim
-with_pam!$with_pam$ac_delim
-with_ldap!$with_ldap$ac_delim
-with_bonjour!$with_bonjour$ac_delim
-with_openssl!$with_openssl$ac_delim
-with_ossp_uuid!$with_ossp_uuid$ac_delim
-XML2_CONFIG!$XML2_CONFIG$ac_delim
-with_libxml!$with_libxml$ac_delim
-with_libxslt!$with_libxslt$ac_delim
-with_system_tzdata!$with_system_tzdata$ac_delim
-with_zlib!$with_zlib$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-ELF_SYS!$ELF_SYS$ac_delim
-LDFLAGS_SL!$LDFLAGS_SL$ac_delim
-LD!$LD$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
 fi
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-with_gnu_ld!$with_gnu_ld$ac_delim
-ld_R_works!$ld_R_works$ac_delim
-RANLIB!$RANLIB$ac_delim
-STRIP!$STRIP$ac_delim
-STRIP_STATIC_LIB!$STRIP_STATIC_LIB$ac_delim
-STRIP_SHARED_LIB!$STRIP_SHARED_LIB$ac_delim
-AR!$AR$ac_delim
-DLLTOOL!$DLLTOOL$ac_delim
-DLLWRAP!$DLLWRAP$ac_delim
-WINDRES!$WINDRES$ac_delim
-TAR!$TAR$ac_delim
-LN_S!$LN_S$ac_delim
-AWK!$AWK$ac_delim
-BISON!$BISON$ac_delim
-BISONFLAGS!$BISONFLAGS$ac_delim
-FLEX!$FLEX$ac_delim
-FLEXFLAGS!$FLEXFLAGS$ac_delim
-PERL!$PERL$ac_delim
-perl_archlibexp!$perl_archlibexp$ac_delim
-perl_privlibexp!$perl_privlibexp$ac_delim
-perl_useshrplib!$perl_useshrplib$ac_delim
-perl_embed_ldflags!$perl_embed_ldflags$ac_delim
-PYTHON!$PYTHON$ac_delim
-python_version!$python_version$ac_delim
-python_configdir!$python_configdir$ac_delim
-python_includespec!$python_includespec$ac_delim
-python_libdir!$python_libdir$ac_delim
-python_libspec!$python_libspec$ac_delim
-python_additional_libs!$python_additional_libs$ac_delim
-ZIC!$ZIC$ac_delim
-OSSP_UUID_LIBS!$OSSP_UUID_LIBS$ac_delim
-HAVE_IPV6!$HAVE_IPV6$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-acx_pthread_config!$acx_pthread_config$ac_delim
-PTHREAD_CC!$PTHREAD_CC$ac_delim
-PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim
-PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim
-LDAP_LIBS_FE!$LDAP_LIBS_FE$ac_delim
-LDAP_LIBS_BE!$LDAP_LIBS_BE$ac_delim
-HAVE_POSIX_SIGNALS!$HAVE_POSIX_SIGNALS$ac_delim
-MSGFMT!$MSGFMT$ac_delim
-MSGMERGE!$MSGMERGE$ac_delim
-XGETTEXT!$XGETTEXT$ac_delim
-TCLSH!$TCLSH$ac_delim
-TCL_CONFIG_SH!$TCL_CONFIG_SH$ac_delim
-TCL_INCLUDE_SPEC!$TCL_INCLUDE_SPEC$ac_delim
-TCL_LIB_FILE!$TCL_LIB_FILE$ac_delim
-TCL_LIBS!$TCL_LIBS$ac_delim
-TCL_LIB_SPEC!$TCL_LIB_SPEC$ac_delim
-TCL_SHARED_BUILD!$TCL_SHARED_BUILD$ac_delim
-TCL_SHLIB_LD_LIBS!$TCL_SHLIB_LD_LIBS$ac_delim
-NSGMLS!$NSGMLS$ac_delim
-JADE!$JADE$ac_delim
-have_docbook!$have_docbook$ac_delim
-DOCBOOKSTYLE!$DOCBOOKSTYLE$ac_delim
-COLLATEINDEX!$COLLATEINDEX$ac_delim
-SGMLSPL!$SGMLSPL$ac_delim
-DOCBOOK2MAN!$DOCBOOK2MAN$ac_delim
-vpath_build!$vpath_build$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -28299,19 +29926,133 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
 
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS  :L $CONFIG_LINKS  :C $CONFIG_COMMANDS
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS  :L $CONFIG_LINKS  :C $CONFIG_COMMANDS"
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -28340,26 +30081,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -28369,7 +30122,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -28395,7 +30148,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -28404,7 +30157,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -28425,17 +30178,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -28469,14 +30222,20 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   # CONFIG_FILE
   #
 
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -28485,13 +30244,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -28505,15 +30265,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -28521,150 +30282,99 @@ s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
 s&@builddir@&$ac_builddir&;t t
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  rm -f "$tmp/out12"
  ;;
   :L)
   #
   # CONFIG_LINK
   #
 
-  { echo "$as_me:$LINENO: linking $srcdir/$ac_source to $ac_file" >&5
-echo "$as_me: linking $srcdir/$ac_source to $ac_file" >&6;}
+  if test "$ac_source" = "$ac_file" && test "$srcdir" = '.'; then
+    :
+  else
+    # Prefer the file from the source tree if names are identical.
+    if test "$ac_source" = "$ac_file" || test ! -r "$ac_source"; then
+      ac_source=$srcdir/$ac_source
+    fi
+
+    { $as_echo "$as_me:$LINENO: linking $ac_source to $ac_file" >&5
+$as_echo "$as_me: linking $ac_source to $ac_file" >&6;}
 
-  if test ! -r "$srcdir/$ac_source"; then
-    { { echo "$as_me:$LINENO: error: $srcdir/$ac_source: file not found" >&5
-echo "$as_me: error: $srcdir/$ac_source: file not found" >&2;}
+    if test ! -r "$ac_source"; then
+      { { $as_echo "$as_me:$LINENO: error: $ac_source: file not found" >&5
+$as_echo "$as_me: error: $ac_source: file not found" >&2;}
    { (exit 1); exit 1; }; }
-  fi
-  rm -f "$ac_file"
+    fi
+    rm -f "$ac_file"
 
-  # Try a relative symlink, then a hard link, then a copy.
-  case $srcdir in
-  [\\/$]* | ?:[\\/]* ) ac_rel_source=$srcdir/$ac_source ;;
-      *) ac_rel_source=$ac_top_build_prefix$srcdir/$ac_source ;;
-  esac
-  ln -s "$ac_rel_source" "$ac_file" 2>/dev/null ||
-    ln "$srcdir/$ac_source" "$ac_file" 2>/dev/null ||
-    cp -p "$srcdir/$ac_source" "$ac_file" ||
-    { { echo "$as_me:$LINENO: error: cannot link or copy $srcdir/$ac_source to $ac_file" >&5
-echo "$as_me: error: cannot link or copy $srcdir/$ac_source to $ac_file" >&2;}
+    # Try a relative symlink, then a hard link, then a copy.
+    case $srcdir in
+    [\\/$]* | ?:[\\/]* ) ac_rel_source=$ac_source ;;
+	*) ac_rel_source=$ac_top_build_prefix$ac_source ;;
+    esac
+    ln -s "$ac_rel_source" "$ac_file" 2>/dev/null ||
+      ln "$ac_source" "$ac_file" 2>/dev/null ||
+      cp -p "$ac_source" "$ac_file" ||
+      { { $as_echo "$as_me:$LINENO: error: cannot link or copy $ac_source to $ac_file" >&5
+$as_echo "$as_me: error: cannot link or copy $ac_source to $ac_file" >&2;}
    { (exit 1); exit 1; }; }
+  fi
  ;;
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -28676,8 +30386,8 @@ echo "$as_me: executing $ac_file commands" >&6;}
 for FILE in $CONFIG_LINKS
  do
 	# test -e works for symlinks in the MinGW console
-	test -e `expr "$FILE" : '\([^:]*\)'` || { echo "$as_me:$LINENO: WARNING: *** link for $FILE -- please fix by hand" >&5
-echo "$as_me: WARNING: *** link for $FILE -- please fix by hand" >&2;}
+	test -e `expr "$FILE" : '\([^:]*\)'` || { $as_echo "$as_me:$LINENO: WARNING: *** link for $FILE -- please fix by hand" >&5
+$as_echo "$as_me: WARNING: *** link for $FILE -- please fix by hand" >&2;}
  done
  ;;
     "src/include/pg_config.h":H)
@@ -28695,6 +30405,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -28716,16 +30431,8 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
-
-# Warn about unknown options
-for pgac_var in `set | sed 's/=.*//' | $EGREP 'with_|enable_'`; do
-  for pgac_arg in $pgac_args with_gnu_ld; do
-    if test "$pgac_var" = "$pgac_arg"; then
-      continue 2
-    fi
-  done
-  pgac_txt=`echo $pgac_var | sed 's/_/-/g'`
-  { echo "$as_me:$LINENO: WARNING: option ignored: --$pgac_txt" >&5
-echo "$as_me: WARNING: option ignored: --$pgac_txt" >&2;}
-done
diff --git a/configure.in b/configure.in
index 259181eb11..f5270c26b1 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.602 2009/06/27 00:14:47 scrappy Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.632 2010/07/09 02:43:12 scrappy Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -17,13 +17,13 @@ dnl Read the Autoconf manual for details.
 dnl
 m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 
-AC_INIT([PostgreSQL], [8.4.0], [[email protected]])
+AC_INIT([PostgreSQL], [9.0beta3], [[email protected]])
 
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
+m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
 Untested combinations of 'autoconf' and PostgreSQL versions are not
 recommended.  You can remove the check from 'configure.in' but it is then
 your responsibility whether the result works or not.])])
-AC_COPYRIGHT([Copyright (c) 1996-2009, PostgreSQL Global Development Group])
+AC_COPYRIGHT([Copyright (c) 1996-2010, PostgreSQL Global Development Group])
 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
 AC_CONFIG_AUX_DIR(config)
 AC_PREFIX_DEFAULT(/usr/local/pgsql)
@@ -558,17 +558,8 @@ IFS=$ac_save_IFS
 # Enable thread-safe client libraries
 #
 AC_MSG_CHECKING([allow thread-safe client libraries])
-if test "$PORTNAME" != "win32"; then
-PGAC_ARG_BOOL(enable, thread-safety, no, [make client libraries thread-safe])
-else
-# Win32 should always use threads
-PGAC_ARG_BOOL(enable, thread-safety, yes, [make client libraries thread-safe])
-fi
-
-PGAC_ARG_BOOL(enable, thread-safety-force, no, [force thread-safety despite thread test failure])
-if test "$enable_thread_safety" = yes -o \
-        "$enable_thread_safety_force" = yes; then
-  enable_thread_safety="yes"	# for 'force'
+PGAC_ARG_BOOL(enable, thread-safety, yes, [disable thread-safety in client libraries])
+if test "$enable_thread_safety" = yes; then
   AC_DEFINE([ENABLE_THREAD_SAFETY], 1,
           [Define to 1 to build client libraries as thread-safe code. (--enable-thread-safety)])
 fi
@@ -794,7 +785,8 @@ AC_SUBST(ELF_SYS)
 CPPFLAGS="$CPPFLAGS $INCLUDES"
 LDFLAGS="$LDFLAGS $LIBDIRS"
 
-AC_ARG_VAR(LDFLAGS_SL, [linker flags for shared library linking])
+AC_ARG_VAR(LDFLAGS_EX, [extra linker flags for linking executables only])
+AC_ARG_VAR(LDFLAGS_SL, [extra linker flags for linking shared libraries only])
 
 PGAC_PROG_LD
 AC_SUBST(LD)
@@ -821,12 +813,22 @@ fi
 AC_PATH_PROG(TAR, tar)
 AC_PROG_LN_S
 AC_PROG_AWK
+AC_PROG_MKDIR_P
+# When Autoconf chooses install-sh as mkdir -p program it tries to generate
+# a relative path to it in each makefile where it subsitutes it. This clashes
+# with our Makefile.global concept. This workaround helps.
+case $MKDIR_P in
+  *install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;
+esac
 
 PGAC_PATH_BISON
 PGAC_PATH_FLEX
 
 PGAC_PATH_PERL
 if test "$with_perl" = yes; then
+  if test -z "$PERL"; then
+    AC_MSG_ERROR([Perl not found])
+  fi
   PGAC_CHECK_PERL_CONFIGS([archlibexp,privlibexp,useshrplib])
   PGAC_CHECK_PERL_EMBED_LDFLAGS
 fi
@@ -962,7 +964,16 @@ AC_SUBST(OSSP_UUID_LIBS)
 ##
 
 dnl sys/socket.h is required by AC_FUNC_ACCEPT_ARGTYPES
-AC_CHECK_HEADERS([crypt.h dld.h fp_class.h getopt.h ieeefp.h langinfo.h poll.h pwd.h sys/ipc.h sys/poll.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/tas.h sys/time.h sys/un.h termios.h ucred.h utime.h wchar.h wctype.h kernel/OS.h kernel/image.h SupportDefs.h])
+AC_CHECK_HEADERS([crypt.h dld.h fp_class.h getopt.h ieeefp.h ifaddrs.h langinfo.h poll.h pwd.h sys/ioctl.h sys/ipc.h sys/poll.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/socket.h sys/sockio.h sys/tas.h sys/time.h sys/un.h termios.h ucred.h utime.h wchar.h wctype.h kernel/OS.h kernel/image.h SupportDefs.h])
+
+# On BSD, cpp test for net/if.h will fail unless sys/socket.h
+# is included first.
+AC_CHECK_HEADERS(net/if.h, [], [],
+[AC_INCLUDES_DEFAULT
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+])
 
 # At least on IRIX, cpp test for netinet/tcp.h will fail unless
 # netinet/in.h is included first.
@@ -1059,7 +1070,7 @@ if test "$with_ldap" = yes ; then
 fi
 
 if test "$with_bonjour" = yes ; then
-  AC_CHECK_HEADER(DNSServiceDiscovery/DNSServiceDiscovery.h, [], [AC_MSG_ERROR([header file <DNSServiceDiscovery/DNSServiceDiscovery.h> is required for Bonjour])])
+  AC_CHECK_HEADER(dns_sd.h, [], [AC_MSG_ERROR([header file <dns_sd.h> is required for Bonjour])])
 fi
 
 # for contrib/uuid-ossp
@@ -1077,7 +1088,7 @@ fi
 m4_defun([AC_PROG_CC_STDC], []) dnl We don't want that.
 AC_C_BIGENDIAN
 AC_C_CONST
-AC_C_INLINE
+PGAC_C_INLINE
 AC_C_STRINGIZE
 PGAC_C_SIGNED
 AC_C_VOLATILE
@@ -1088,6 +1099,9 @@ PGAC_STRUCT_SOCKADDR_UN
 PGAC_STRUCT_SOCKADDR_STORAGE
 PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS
 PGAC_STRUCT_ADDRINFO
+AC_TYPE_INTPTR_T
+AC_TYPE_UINTPTR_T
+AC_TYPE_LONG_LONG_INT
 
 AC_CHECK_TYPES([struct cmsgcred, struct fcred, struct sockcred], [], [],
 [#include <sys/param.h>
@@ -1132,6 +1146,20 @@ AC_MSG_RESULT(yes)],
               [AC_MSG_RESULT(no)])
 fi
 
+# Check largefile support.  You might think this is a system service not a
+# compiler characteristic, but you'd be wrong.  We must check this before
+# probing existence of related functions such as fseeko, since the largefile
+# defines can affect what is generated for that.
+AC_SYS_LARGEFILE
+
+# Check for largefile support (must be after AC_SYS_LARGEFILE)
+AC_CHECK_SIZEOF([off_t])
+
+# If we don't have largefile support, can't handle segsize >= 2GB.
+if test "$ac_cv_sizeof_off_t" -lt 8 -a "$segsize" != "1"; then 
+   AC_MSG_ERROR([Large file support is not enabled. Segment size cannot be larger than 1GB.]) 
+fi
+
 
 ##
 ## Functions, global variables
@@ -1141,7 +1169,18 @@ PGAC_VAR_INT_TIMEZONE
 AC_FUNC_ACCEPT_ARGTYPES
 PGAC_FUNC_GETTIMEOFDAY_1ARG
 
-AC_CHECK_FUNCS([cbrt dlopen fcvt fdatasync getpeereid getpeerucred getrlimit memmove poll pstat readlink setproctitle setsid sigprocmask symlink sysconf towlower utime utimes waitpid wcstombs])
+AC_CHECK_FUNCS([cbrt dlopen fcvt fdatasync getifaddrs getpeereid getpeerucred getrlimit memmove poll pstat readlink scandir setproctitle setsid sigprocmask symlink sysconf towlower utime utimes waitpid wcstombs])
+
+AC_REPLACE_FUNCS(fseeko)
+case $host_os in
+	# BSD/OS & NetBSD use a custom fseeko/ftello built on fsetpos/fgetpos
+	# Mingw uses macros to access Win32 API calls
+	bsdi*|netbsd*|mingw*)
+		AC_DEFINE(HAVE_FSEEKO, 1, [Define to 1 because replacement version used.])
+		ac_cv_func_fseeko=yes;;
+	*)
+		AC_FUNC_FSEEKO;;
+esac
 
 # posix_fadvise() is a no-op on Solaris, so don't incur function overhead
 # by calling it, 2009-04-02
@@ -1249,7 +1288,7 @@ fi
 pgac_save_LIBS="$LIBS"
 LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
 
-AC_REPLACE_FUNCS([crypt getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul])
+AC_REPLACE_FUNCS([crypt erand48 getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul])
 
 case $host_os in
 
@@ -1289,12 +1328,17 @@ if test "$PORTNAME" = "solaris"; then
   AC_LIBOBJ(getopt)
 fi
 
+# Cygwin's erand48() is broken (always returns zero) in some releases,
+# so force use of ours.
+if test "$PORTNAME" = "cygwin"; then
+  AC_LIBOBJ(erand48)
+fi
+
 # Win32 support
 if test "$PORTNAME" = "win32"; then
 AC_REPLACE_FUNCS(gettimeofday)
 AC_LIBOBJ(kill)
 AC_LIBOBJ(open)
-AC_LIBOBJ(rand)
 AC_LIBOBJ(win32env)
 AC_LIBOBJ(win32error)
 AC_DEFINE([HAVE_SYMLINK], 1,
@@ -1304,7 +1348,7 @@ fi
 if test "$with_readline" = yes; then
   PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER
   AC_CHECK_FUNCS([rl_completion_matches rl_filename_completion_function])
-  AC_CHECK_FUNCS([replace_history_entry])
+  AC_CHECK_FUNCS([append_history history_truncate_file])
 fi
 
 
@@ -1350,17 +1394,6 @@ AC_CHECK_FUNCS(atexit, [],
                [AC_CHECK_FUNCS(on_exit, [],
                [AC_MSG_ERROR([neither atexit() nor on_exit() found])])])
 
-AC_REPLACE_FUNCS(fseeko)
-case $host_os in
-	# BSD/OS & NetBSD use a custom fseeko/ftello built on fsetpos/fgetpos
-	# Mingw uses macros to access Win32 API calls
-	bsdi*|netbsd*|mingw*)
-		AC_DEFINE(HAVE_FSEEKO, 1, [Define to 1 because replacement version used.])
-		ac_cv_func_fseeko=yes;;
-	*)
-		AC_FUNC_FSEEKO;;
-esac
-
 
 #
 # Pthreads
@@ -1383,13 +1416,7 @@ PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_REENTRANT -D_THREAD_SAFE -D_POSIX_PTHREAD_SEM
 if test "$PTHREAD_CC" != "$CC"; then
 AC_MSG_ERROR([
 PostgreSQL does not support platforms that require a special compiler
-for thread safety.])
-fi
-
-if test "$THREAD_SUPPORT" = no; then
-AC_MSG_ERROR([cannot enable threads on this platform
-This platform is known to not support thread-safe programs.  For details,
-compile and run src/bin/pg_thread_test.])
+for thread safety;  use --disable-thread-safety to disable thread safety.])
 fi
 
 # Check for *_r functions
@@ -1399,7 +1426,8 @@ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 LIBS="$LIBS $PTHREAD_LIBS"
 
 if test "$PORTNAME" != "win32"; then
-AC_CHECK_HEADER(pthread.h, [], [AC_MSG_ERROR([pthread.h not found, required for --enable-thread-safety])])
+AC_CHECK_HEADER(pthread.h, [], [AC_MSG_ERROR([
+pthread.h not found;  use --disable-thread-safety to disable thread safety])])
 fi
 
 AC_CHECK_FUNCS([strerror_r getpwuid_r gethostbyname_r])
@@ -1490,10 +1518,16 @@ dnl If there is no native snprintf() or it does not handle the 64-bit type,
 dnl we force our own version of snprintf() to be used instead.
 dnl Note this test must be run after our initial check for snprintf/vsnprintf.
 
+dnl As of Postgres 8.4, we no longer support compilers without a working
+dnl 64-bit type.  But we still handle the case of snprintf being broken.
+
 PGAC_TYPE_64BIT_INT([long int])
 
 if test x"$HAVE_LONG_INT_64" = x"no" ; then
   PGAC_TYPE_64BIT_INT([long long int])
+  if test x"$HAVE_LONG_LONG_INT_64" = x"no" ; then
+    AC_MSG_ERROR([Cannot find a working 64-bit integer type.])
+  fi
 fi
 
 
@@ -1537,10 +1571,10 @@ else
 fi
 
 AC_DEFINE_UNQUOTED(INT64_FORMAT, $INT64_FORMAT,
-                   [Define to the appropriate snprintf format for 64-bit ints, if any.])
+                   [Define to the appropriate snprintf format for 64-bit ints.])
 
 AC_DEFINE_UNQUOTED(UINT64_FORMAT, $UINT64_FORMAT,
-                   [Define to the appropriate snprintf format for unsigned 64-bit ints, if any.])
+                   [Define to the appropriate snprintf format for unsigned 64-bit ints.])
 
 # Now we have checked all the reasons to replace snprintf
 if test $pgac_need_repl_snprintf = yes; then
@@ -1548,12 +1582,10 @@ if test $pgac_need_repl_snprintf = yes; then
   AC_LIBOBJ(snprintf)
 fi
 
-# Need a #define for the size of Datum (unsigned long)
-AC_CHECK_SIZEOF([unsigned long])
-
-# And check size of void *, size_t (enables tweaks for > 32bit address space)
+# Check size of void *, size_t (enables tweaks for > 32bit address space)
 AC_CHECK_SIZEOF([void *])
 AC_CHECK_SIZEOF([size_t])
+AC_CHECK_SIZEOF([long])
 
 # Decide whether float4 is passed by value: user-selectable, enabled by default
 AC_MSG_CHECKING([whether to build with float4 passed by value])   
@@ -1570,7 +1602,7 @@ AC_DEFINE_UNQUOTED([FLOAT4PASSBYVAL], [$float4passbyval], [float4 values are pas
 # If sizeof(Datum) >= 8, this is user-selectable, enabled by default.
 # If not, trying to select it is an error.
 AC_MSG_CHECKING([whether to build with float8 passed by value])
-if test $ac_cv_sizeof_unsigned_long -ge 8 ; then
+if test $ac_cv_sizeof_void_p -ge 8 ; then
   PGAC_ARG_BOOL(enable, float8-byval, yes, [disable float8 passed by value])
 else
   PGAC_ARG_BOOL(enable, float8-byval, no, [disable float8 passed by value])
@@ -1625,42 +1657,16 @@ AC_CHECK_TYPES([int8, uint8, int64, uint64], [], [],
 AC_CHECK_TYPES(sig_atomic_t, [], [], [#include <signal.h>])
 
 
-# If the user did not disable integer datetimes, check that
-# there is a working 64-bit integral type to use.
-if test x"$USE_INTEGER_DATETIMES" = x"yes" &&
-   test x"$HAVE_LONG_INT_64" = x"no" &&
-   test x"$HAVE_LONG_LONG_INT_64" = x"no" &&
-   test x"$HAVE_INT64" = x"no" ; then
-  AC_MSG_ERROR([
-Integer-based datetime support requires a 64-bit integer type,
-but no such type could be found. The --disable-integer-datetimes
-configure option can be used to disable integer-based storage
-of datetime values.])
-fi
-
-
 if test "$PORTNAME" != "win32"
 then
 PGAC_FUNC_POSIX_SIGNALS
 if test "$pgac_cv_func_posix_signals" != yes -a "$enable_thread_safety" = yes; then
   AC_MSG_ERROR([
 Thread-safety requires POSIX signals, which are not supported by this
-operating system.])
+operating system;  use --disable-thread-safety to disable thread safety.])
 fi
 fi
 
-if test $ac_cv_func_fseeko = yes; then
-AC_SYS_LARGEFILE
-fi
-
-# Check for largefile support (must be after AC_SYS_LARGEFILE)
-AC_CHECK_SIZEOF([off_t])
-
-# If we don't have largefile support, can't handle segsize >= 2GB.
-if test "$ac_cv_sizeof_off_t" -lt 8 -a "$segsize" != "1"; then 
-   AC_MSG_ERROR([Large file support is not enabled. Segment size cannot be larger than 1GB.]) 
-fi
-
 # SunOS doesn't handle negative byte comparisons properly with +/- return
 AC_FUNC_MEMCMP
 
@@ -1726,26 +1732,15 @@ PGAC_PROG_JADE
 PGAC_CHECK_DOCBOOK(4.2)
 PGAC_PATH_DOCBOOK_STYLESHEETS
 PGAC_PATH_COLLATEINDEX
-AC_CHECK_PROGS(SGMLSPL, sgmlspl)
-PGAC_PATH_DOCBOOK2MAN
+AC_CHECK_PROGS(XSLTPROC, xsltproc)
+AC_CHECK_PROGS(OSX, [osx sgml2xml sx])
 
 # Thread testing
 
 # We have to run the thread test near the end so we have all our symbols
 # defined.  Cross compiling throws a warning.
 #
-if test "$enable_thread_safety_force" = yes; then
-if test "$PORTNAME" != "win32"
-then
-  AC_MSG_WARN([
-*** Skipping thread test program.  --enable-thread-safety-force was used.
-*** Run the program in src/test/thread on the your machine and add proper
-*** locking function calls to your applications to guarantee thread safety.
-])
-else
-AC_MSG_WARN([*** skipping thread test on Win32])
-fi
-elif test "$enable_thread_safety" = yes; then
+if test "$enable_thread_safety" = yes; then
 if test "$PORTNAME" != "win32"
 then
 AC_MSG_CHECKING([thread safety of required library functions])
@@ -1758,13 +1753,9 @@ AC_TRY_RUN([#include "$srcdir/src/test/thread/thread_test.c"],
   [AC_MSG_RESULT(yes)],
   [AC_MSG_RESULT(no)
   AC_MSG_ERROR([thread test program failed
-This platform is not thread-safe.  Check the file 'config.log' for the
-exact reason.
-
-You can use the configure option --enable-thread-safety-force to force
-threads to be enabled.  But you must then run the program in
-src/test/thread and add locking function calls to your applications to
-guarantee thread safety.])],
+This platform is not thread-safe.  Check the file 'config.log' or compile
+and run src/test/thread/thread_test for the exact reason.
+Use --disable-thread-safety to disable thread safety.])],
   [AC_MSG_RESULT(maybe)
   AC_MSG_WARN([
 *** Skipping thread test program because of cross-compile build.
@@ -1780,7 +1771,6 @@ fi
 # If compiler will take -Wl,--as-needed (or various platform-specific
 # spellings thereof) then add that to LDFLAGS.  This is much easier than
 # trying to filter LIBS to the minimum for each executable.
-# (Note that shared library links won't use this switch, though.)
 # On (at least) some Red-Hat-derived systems, this switch breaks linking to
 # libreadline; therefore we postpone testing it until we know what library
 # dependencies readline has.  The test code will try to link with $LIBS.
@@ -1878,6 +1868,3 @@ AC_CONFIG_HEADERS([src/interfaces/ecpg/include/ecpg_config.h],
                   [echo >src/interfaces/ecpg/include/stamp-h])
 
 AC_OUTPUT
-
-# Warn about unknown options
-PGAC_ARG_CHECK
diff --git a/contrib/Makefile b/contrib/Makefile
index f3777962c5..a1b7d913f5 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -1,10 +1,10 @@
-# $PostgreSQL: pgsql/contrib/Makefile,v 1.87 2009/03/25 23:20:01 tgl Exp $
+# $PostgreSQL: pgsql/contrib/Makefile,v 1.93 2010/06/14 16:17:56 sriggs Exp $
 
 subdir = contrib
 top_builddir = ..
 include $(top_builddir)/src/Makefile.global
 
-WANTED_DIRS = \
+SUBDIRS = \
 		adminpack	\
 		auto_explain	\
 		btree_gin	\
@@ -25,11 +25,15 @@ WANTED_DIRS = \
 		ltree		\
 		oid2name	\
 		pageinspect	\
+		passwordcheck	\
+		pg_archivecleanup \
 		pg_buffercache	\
 		pg_freespacemap \
 		pg_standby	\
 		pg_stat_statements \
 		pg_trgm		\
+		pg_upgrade	\
+		pg_upgrade_support \
 		pgbench		\
 		pgcrypto	\
 		pgrowlocks	\
@@ -39,18 +43,19 @@ WANTED_DIRS = \
 		tablefunc	\
 		test_parser	\
 		tsearch2	\
-		vacuumlo	
+		unaccent	\
+		vacuumlo
 
 ifeq ($(with_openssl),yes)
-WANTED_DIRS += sslinfo
+SUBDIRS += sslinfo
 endif
 
 ifeq ($(with_ossp_uuid),yes)
-WANTED_DIRS += uuid-ossp
+SUBDIRS += uuid-ossp
 endif
 
 ifeq ($(with_libxml),yes)
-WANTED_DIRS += xml2
+SUBDIRS += xml2
 endif
 
 # Missing:
@@ -58,13 +63,13 @@ endif
 
 
 all install installdirs uninstall distprep clean distclean maintainer-clean:
-	@for dir in $(WANTED_DIRS); do \
+	@for dir in $(SUBDIRS); do \
 		$(MAKE) -C $$dir $@ || exit; \
 	done
 
 # We'd like check operations to run all the subtests before failing.
 check installcheck:
-	@CHECKERR=0; for dir in $(WANTED_DIRS); do \
+	@CHECKERR=0; for dir in $(SUBDIRS); do \
 		$(MAKE) -C $$dir $@ || CHECKERR=$$?; \
 	done; \
 	exit $$CHECKERR
diff --git a/contrib/README b/contrib/README
index 1ae49adc70..a04c04346e 100644
--- a/contrib/README
+++ b/contrib/README
@@ -104,6 +104,10 @@ pageinspect -
 	Allows inspection of database pages
 	Heikki Linnakangas <[email protected]>
 
+passwordcheck -
+	Simple password strength checker
+	Laurenz Albe <[email protected]>
+
 pg_buffercache -
 	Real time queries on the shared buffer cache
 	by Mark Kirkwood <[email protected]>
@@ -125,6 +129,10 @@ pg_trgm -
 	matching.
 	by Oleg Bartunov <[email protected]> and Teodor Sigaev <[email protected]>
 
+pg_upgrade -
+	Support for in-place upgrade between major releases of PostgreSQL
+	Bruce Momjian <[email protected]> and others
+
 pgbench -
 	TPC-B like benchmarking tool
 	by Tatsuo Ishii <[email protected]>
@@ -169,6 +177,10 @@ tsearch2 -
 	Pavel Stehule <[email protected]>, based on code originally by
 	Teodor Sigaev <[email protected]> and Oleg Bartunov <[email protected]>.
 
+unaccent -
+	Unaccent dictionary for text search
+	Teodor Sigaev <[email protected]> and Oleg Bartunov <[email protected]>.
+
 uuid-ossp -
 	UUID generation functions
 	by Peter Eisentraut <[email protected]>
diff --git a/contrib/adminpack/adminpack.c b/contrib/adminpack/adminpack.c
index eb78573a18..5271ef6ea2 100644
--- a/contrib/adminpack/adminpack.c
+++ b/contrib/adminpack/adminpack.c
@@ -3,12 +3,12 @@
  * adminpack.c
  *
  *
- * Copyright (c) 2002-2009, PostgreSQL Global Development Group
+ * Copyright (c) 2002-2010, PostgreSQL Global Development Group
  *
  * Author: Andreas Pflug <[email protected]>
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/contrib/adminpack/adminpack.c,v 1.12 2009/01/01 17:23:31 momjian Exp $
+ *	  $PostgreSQL: pgsql/contrib/adminpack/adminpack.c,v 1.13 2010/01/02 16:57:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/contrib/auto_explain/auto_explain.c b/contrib/auto_explain/auto_explain.c
index 9108a77ba1..ffc1a4a106 100644
--- a/contrib/auto_explain/auto_explain.c
+++ b/contrib/auto_explain/auto_explain.c
@@ -3,10 +3,10 @@
  * auto_explain.c
  *
  *
- * Copyright (c) 2008-2009, PostgreSQL Global Development Group
+ * Copyright (c) 2008-2010, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/contrib/auto_explain/auto_explain.c,v 1.5 2009/06/11 14:48:50 momjian Exp $
+ *	  $PostgreSQL: pgsql/contrib/auto_explain/auto_explain.c,v 1.14 2010/02/26 02:00:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,8 +22,18 @@ PG_MODULE_MAGIC;
 static int	auto_explain_log_min_duration = -1; /* msec or -1 */
 static bool auto_explain_log_analyze = false;
 static bool auto_explain_log_verbose = false;
+static bool auto_explain_log_buffers = false;
+static int	auto_explain_log_format = EXPLAIN_FORMAT_TEXT;
 static bool auto_explain_log_nested_statements = false;
 
+static const struct config_enum_entry format_options[] = {
+	{"text", EXPLAIN_FORMAT_TEXT, false},
+	{"xml", EXPLAIN_FORMAT_XML, false},
+	{"json", EXPLAIN_FORMAT_JSON, false},
+	{"yaml", EXPLAIN_FORMAT_YAML, false},
+	{NULL, 0, false}
+};
+
 /* Current nesting depth of ExecutorRun calls */
 static int	nesting_level = 0;
 
@@ -84,6 +94,27 @@ _PG_init(void)
 							 NULL,
 							 NULL);
 
+	DefineCustomBoolVariable("auto_explain.log_buffers",
+							 "Log buffers usage.",
+							 NULL,
+							 &auto_explain_log_buffers,
+							 false,
+							 PGC_SUSET,
+							 0,
+							 NULL,
+							 NULL);
+
+	DefineCustomEnumVariable("auto_explain.log_format",
+							 "EXPLAIN format to be used for plan logging.",
+							 NULL,
+							 &auto_explain_log_format,
+							 EXPLAIN_FORMAT_TEXT,
+							 format_options,
+							 PGC_SUSET,
+							 0,
+							 NULL,
+							 NULL);
+
 	DefineCustomBoolVariable("auto_explain.log_nested_statements",
 							 "Log nested statements.",
 							 NULL,
@@ -120,14 +151,18 @@ _PG_fini(void)
 /*
  * ExecutorStart hook: start up logging if needed
  */
-void
+static void
 explain_ExecutorStart(QueryDesc *queryDesc, int eflags)
 {
 	if (auto_explain_enabled())
 	{
 		/* Enable per-node instrumentation iff log_analyze is required. */
 		if (auto_explain_log_analyze && (eflags & EXEC_FLAG_EXPLAIN_ONLY) == 0)
-			queryDesc->doInstrument = true;
+		{
+			queryDesc->instrument_options |= INSTRUMENT_TIMER;
+			if (auto_explain_log_buffers)
+				queryDesc->instrument_options |= INSTRUMENT_BUFFERS;
+		}
 	}
 
 	if (prev_ExecutorStart)
@@ -147,7 +182,7 @@ explain_ExecutorStart(QueryDesc *queryDesc, int eflags)
 			MemoryContext oldcxt;
 
 			oldcxt = MemoryContextSwitchTo(queryDesc->estate->es_query_cxt);
-			queryDesc->totaltime = InstrAlloc(1);
+			queryDesc->totaltime = InstrAlloc(1, INSTRUMENT_ALL);
 			MemoryContextSwitchTo(oldcxt);
 		}
 	}
@@ -156,7 +191,7 @@ explain_ExecutorStart(QueryDesc *queryDesc, int eflags)
 /*
  * ExecutorRun hook: all we need do is track nesting depth
  */
-void
+static void
 explain_ExecutorRun(QueryDesc *queryDesc, ScanDirection direction, long count)
 {
 	nesting_level++;
@@ -179,7 +214,7 @@ explain_ExecutorRun(QueryDesc *queryDesc, ScanDirection direction, long count)
 /*
  * ExecutorEnd hook: log results if needed
  */
-void
+static void
 explain_ExecutorEnd(QueryDesc *queryDesc)
 {
 	if (queryDesc->totaltime && auto_explain_enabled())
@@ -196,16 +231,22 @@ explain_ExecutorEnd(QueryDesc *queryDesc)
 		msec = queryDesc->totaltime->total * 1000.0;
 		if (msec >= auto_explain_log_min_duration)
 		{
-			StringInfoData buf;
+			ExplainState es;
+
+			ExplainInitState(&es);
+			es.analyze = (queryDesc->instrument_options && auto_explain_log_analyze);
+			es.verbose = auto_explain_log_verbose;
+			es.buffers = (es.analyze && auto_explain_log_buffers);
+			es.format = auto_explain_log_format;
 
-			initStringInfo(&buf);
-			ExplainPrintPlan(&buf, queryDesc,
-						 queryDesc->doInstrument && auto_explain_log_analyze,
-							 auto_explain_log_verbose);
+			ExplainBeginOutput(&es);
+			ExplainQueryText(&es, queryDesc);
+			ExplainPrintPlan(&es, queryDesc);
+			ExplainEndOutput(&es);
 
 			/* Remove last line break */
-			if (buf.len > 0 && buf.data[buf.len - 1] == '\n')
-				buf.data[--buf.len] = '\0';
+			if (es.str->len > 0 && es.str->data[es.str->len - 1] == '\n')
+				es.str->data[--es.str->len] = '\0';
 
 			/*
 			 * Note: we rely on the existing logging of context or
@@ -215,9 +256,10 @@ explain_ExecutorEnd(QueryDesc *queryDesc)
 			 */
 			ereport(LOG,
 					(errmsg("duration: %.3f ms  plan:\n%s",
-							msec, buf.data)));
+							msec, es.str->data),
+					 errhidestmt(true)));
 
-			pfree(buf.data);
+			pfree(es.str->data);
 		}
 	}
 
diff --git a/contrib/btree_gin/btree_gin.c b/contrib/btree_gin/btree_gin.c
index 6fae89cad5..c05f8ebbfc 100644
--- a/contrib/btree_gin/btree_gin.c
+++ b/contrib/btree_gin/btree_gin.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gin/btree_gin.c,v 1.2 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gin/btree_gin.c,v 1.4 2010/01/07 04:53:34 tgl Exp $
  */
 #include "postgres.h"
 
@@ -8,6 +8,7 @@
 #include "fmgr.h"
 #include "access/skey.h"
 #include "utils/builtins.h"
+#include "utils/bytea.h"
 #include "utils/cash.h"
 #include "utils/date.h"
 #include "utils/inet.h"
@@ -213,8 +214,7 @@ static Datum
 leftmostvalue_int8(void)
 {
 	/*
-	 * Use sequence's definition to keep compatibility. Another way may make a
-	 * problem with INT64_IS_BUSTED
+	 * Use sequence's definition to keep compatibility.
 	 */
 	return Int64GetDatum(SEQ_MINVALUE);
 }
@@ -244,8 +244,7 @@ static Datum
 leftmostvalue_money(void)
 {
 	/*
-	 * Use sequence's definition to keep compatibility. Another way may make a
-	 * problem with INT64_IS_BUSTED
+	 * Use sequence's definition to keep compatibility.
 	 */
 	return Int64GetDatum(SEQ_MINVALUE);
 }
diff --git a/contrib/btree_gin/expected/bytea.out b/contrib/btree_gin/expected/bytea.out
index 7b19149205..8b5a0c615d 100644
--- a/contrib/btree_gin/expected/bytea.out
+++ b/contrib/btree_gin/expected/bytea.out
@@ -1,4 +1,6 @@
 set enable_seqscan=off;
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 CREATE TABLE test_bytea (
 	i bytea
 );
diff --git a/contrib/btree_gin/sql/bytea.sql b/contrib/btree_gin/sql/bytea.sql
index 96be56bf65..0ef6247e10 100644
--- a/contrib/btree_gin/sql/bytea.sql
+++ b/contrib/btree_gin/sql/bytea.sql
@@ -1,4 +1,6 @@
 set enable_seqscan=off;
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 
 CREATE TABLE test_bytea (
 	i bytea
diff --git a/contrib/btree_gist/btree_bit.c b/contrib/btree_gist/btree_bit.c
index 3c5a2e0ce5..f78134f443 100644
--- a/contrib/btree_gist/btree_bit.c
+++ b/contrib/btree_gist/btree_bit.c
@@ -1,9 +1,9 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gist/btree_bit.c,v 1.10 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gist/btree_bit.c,v 1.11 2009/08/04 18:49:50 tgl Exp $
  */
 #include "btree_gist.h"
 #include "btree_utils_var.h"
-#include "utils/builtins.h"
+#include "utils/bytea.h"
 #include "utils/varbit.h"
 
 
diff --git a/contrib/btree_gist/btree_bytea.c b/contrib/btree_gist/btree_bytea.c
index 9977b201c6..88b4a380e8 100644
--- a/contrib/btree_gist/btree_bytea.c
+++ b/contrib/btree_gist/btree_bytea.c
@@ -1,9 +1,9 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gist/btree_bytea.c,v 1.9 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gist/btree_bytea.c,v 1.10 2009/08/04 18:49:50 tgl Exp $
  */
 #include "btree_gist.h"
 #include "btree_utils_var.h"
-#include "utils/builtins.h"
+#include "utils/bytea.h"
 
 
 /*
diff --git a/contrib/btree_gist/btree_cash.c b/contrib/btree_gist/btree_cash.c
index fbc79c1330..a1efde6146 100644
--- a/contrib/btree_gist/btree_cash.c
+++ b/contrib/btree_gist/btree_cash.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gist/btree_cash.c,v 1.9 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gist/btree_cash.c,v 1.11 2010/02/26 02:00:31 momjian Exp $
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
@@ -57,13 +57,18 @@ gbt_cashlt(const void *a, const void *b)
 static int
 gbt_cashkey_cmp(const void *a, const void *b)
 {
+	cashKEY    *ia = (cashKEY *) (((Nsrt *) a)->t);
+	cashKEY    *ib = (cashKEY *) (((Nsrt *) b)->t);
 
-	if (*(Cash *) &(((Nsrt *) a)->t[0]) > *(Cash *) &(((Nsrt *) b)->t[0]))
-		return 1;
-	else if (*(Cash *) &(((Nsrt *) a)->t[0]) < *(Cash *) &(((Nsrt *) b)->t[0]))
-		return -1;
-	return 0;
+	if (ia->lower == ib->lower)
+	{
+		if (ia->upper == ib->upper)
+			return 0;
 
+		return (ia->upper > ib->upper) ? 1 : -1;
+	}
+
+	return (ia->lower > ib->lower) ? 1 : -1;
 }
 
 
diff --git a/contrib/btree_gist/btree_date.c b/contrib/btree_gist/btree_date.c
index b9929922fe..d8dce91535 100644
--- a/contrib/btree_gist/btree_date.c
+++ b/contrib/btree_gist/btree_date.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gist/btree_date.c,v 1.7 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gist/btree_date.c,v 1.9 2010/02/26 02:00:31 momjian Exp $
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
@@ -73,11 +73,15 @@ gbt_datelt(const void *a, const void *b)
 static int
 gbt_datekey_cmp(const void *a, const void *b)
 {
-	if (gbt_dategt((void *) &(((Nsrt *) a)->t[0]), (void *) &(((Nsrt *) b)->t[0])))
-		return 1;
-	else if (gbt_datelt((void *) &(((Nsrt *) a)->t[0]), (void *) &(((Nsrt *) b)->t[0])))
-		return -1;
-	return 0;
+	dateKEY    *ia = (dateKEY *) (((Nsrt *) a)->t);
+	dateKEY    *ib = (dateKEY *) (((Nsrt *) b)->t);
+	int			res;
+
+	res = DatumGetInt32(DirectFunctionCall2(date_cmp, DateADTGetDatum(ia->lower), DateADTGetDatum(ib->lower)));
+	if (res == 0)
+		return DatumGetInt32(DirectFunctionCall2(date_cmp, DateADTGetDatum(ia->upper), DateADTGetDatum(ib->upper)));
+
+	return res;
 }
 
 
diff --git a/contrib/btree_gist/btree_float4.c b/contrib/btree_gist/btree_float4.c
index 3a508ec0a6..7ece9ea220 100644
--- a/contrib/btree_gist/btree_float4.c
+++ b/contrib/btree_gist/btree_float4.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gist/btree_float4.c,v 1.8 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gist/btree_float4.c,v 1.10 2010/02/26 02:00:31 momjian Exp $
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
@@ -56,13 +56,18 @@ gbt_float4lt(const void *a, const void *b)
 static int
 gbt_float4key_cmp(const void *a, const void *b)
 {
+	float4KEY  *ia = (float4KEY *) (((Nsrt *) a)->t);
+	float4KEY  *ib = (float4KEY *) (((Nsrt *) b)->t);
 
-	if (*(float4 *) &(((Nsrt *) a)->t[0]) > *(float4 *) &(((Nsrt *) b)->t[0]))
-		return 1;
-	else if (*(float4 *) &(((Nsrt *) a)->t[0]) < *(float4 *) &(((Nsrt *) b)->t[0]))
-		return -1;
-	return 0;
+	if (ia->lower == ib->lower)
+	{
+		if (ia->upper == ib->upper)
+			return 0;
 
+		return (ia->upper > ib->upper) ? 1 : -1;
+	}
+
+	return (ia->lower > ib->lower) ? 1 : -1;
 }
 
 
diff --git a/contrib/btree_gist/btree_float8.c b/contrib/btree_gist/btree_float8.c
index 66e63f31f8..ab4912883d 100644
--- a/contrib/btree_gist/btree_float8.c
+++ b/contrib/btree_gist/btree_float8.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gist/btree_float8.c,v 1.8 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gist/btree_float8.c,v 1.10 2010/02/26 02:00:31 momjian Exp $
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
@@ -57,13 +57,18 @@ gbt_float8lt(const void *a, const void *b)
 static int
 gbt_float8key_cmp(const void *a, const void *b)
 {
+	float8KEY  *ia = (float8KEY *) (((Nsrt *) a)->t);
+	float8KEY  *ib = (float8KEY *) (((Nsrt *) b)->t);
 
-	if (*(float8 *) &(((Nsrt *) a)->t[0]) > *(float8 *) &(((Nsrt *) b)->t[0]))
-		return 1;
-	else if (*(float8 *) &(((Nsrt *) a)->t[0]) < *(float8 *) &(((Nsrt *) b)->t[0]))
-		return -1;
-	return 0;
+	if (ia->lower == ib->lower)
+	{
+		if (ia->upper == ib->upper)
+			return 0;
 
+		return (ia->upper > ib->upper) ? 1 : -1;
+	}
+
+	return (ia->lower > ib->lower) ? 1 : -1;
 }
 
 
diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c
index 32f9d11102..a8d18c578b 100644
--- a/contrib/btree_gist/btree_inet.c
+++ b/contrib/btree_gist/btree_inet.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gist/btree_inet.c,v 1.10 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gist/btree_inet.c,v 1.12 2010/02/26 02:00:31 momjian Exp $
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
@@ -60,13 +60,18 @@ gbt_inetlt(const void *a, const void *b)
 static int
 gbt_inetkey_cmp(const void *a, const void *b)
 {
+	inetKEY    *ia = (inetKEY *) (((Nsrt *) a)->t);
+	inetKEY    *ib = (inetKEY *) (((Nsrt *) b)->t);
 
-	if (*(double *) (&((Nsrt *) a)->t[0]) > *(double *) (&((Nsrt *) b)->t[0]))
-		return 1;
-	else if (*(double *) (&((Nsrt *) a)->t[0]) < *(double *) (&((Nsrt *) b)->t[0]))
-		return -1;
-	return 0;
+	if (ia->lower == ib->lower)
+	{
+		if (ia->upper == ib->upper)
+			return 0;
+
+		return (ia->upper > ib->upper) ? 1 : -1;
+	}
 
+	return (ia->lower > ib->lower) ? 1 : -1;
 }
 
 
diff --git a/contrib/btree_gist/btree_int2.c b/contrib/btree_gist/btree_int2.c
index 4a1b1c4a39..2be4c40aa8 100644
--- a/contrib/btree_gist/btree_int2.c
+++ b/contrib/btree_gist/btree_int2.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gist/btree_int2.c,v 1.8 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gist/btree_int2.c,v 1.10 2010/02/26 02:00:31 momjian Exp $
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
@@ -56,13 +56,18 @@ gbt_int2lt(const void *a, const void *b)
 static int
 gbt_int2key_cmp(const void *a, const void *b)
 {
+	int16KEY   *ia = (int16KEY *) (((Nsrt *) a)->t);
+	int16KEY   *ib = (int16KEY *) (((Nsrt *) b)->t);
 
-	if (*(int16 *) (&((Nsrt *) a)->t[0]) > *(int16 *) &(((Nsrt *) b)->t[0]))
-		return 1;
-	else if (*(int16 *) &(((Nsrt *) a)->t[0]) < *(int16 *) &(((Nsrt *) b)->t[0]))
-		return -1;
-	return 0;
+	if (ia->lower == ib->lower)
+	{
+		if (ia->upper == ib->upper)
+			return 0;
 
+		return (ia->upper > ib->upper) ? 1 : -1;
+	}
+
+	return (ia->lower > ib->lower) ? 1 : -1;
 }
 
 
diff --git a/contrib/btree_gist/btree_int4.c b/contrib/btree_gist/btree_int4.c
index f3c29f6051..aa0d4ac33f 100644
--- a/contrib/btree_gist/btree_int4.c
+++ b/contrib/btree_gist/btree_int4.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gist/btree_int4.c,v 1.8 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gist/btree_int4.c,v 1.10 2010/02/26 02:00:31 momjian Exp $
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
@@ -57,13 +57,18 @@ gbt_int4lt(const void *a, const void *b)
 static int
 gbt_int4key_cmp(const void *a, const void *b)
 {
+	int32KEY   *ia = (int32KEY *) (((Nsrt *) a)->t);
+	int32KEY   *ib = (int32KEY *) (((Nsrt *) b)->t);
 
-	if (*(int32 *) &(((Nsrt *) a)->t[0]) > *(int32 *) &(((Nsrt *) b)->t[0]))
-		return 1;
-	else if (*(int32 *) &(((Nsrt *) a)->t[0]) < *(int32 *) &(((Nsrt *) b)->t[0]))
-		return -1;
-	return 0;
+	if (ia->lower == ib->lower)
+	{
+		if (ia->upper == ib->upper)
+			return 0;
 
+		return (ia->upper > ib->upper) ? 1 : -1;
+	}
+
+	return (ia->lower > ib->lower) ? 1 : -1;
 }
 
 
diff --git a/contrib/btree_gist/btree_int8.c b/contrib/btree_gist/btree_int8.c
index c65e1d214d..4cf36a07fa 100644
--- a/contrib/btree_gist/btree_int8.c
+++ b/contrib/btree_gist/btree_int8.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gist/btree_int8.c,v 1.8 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gist/btree_int8.c,v 1.10 2010/02/26 02:00:31 momjian Exp $
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
@@ -57,13 +57,18 @@ gbt_int8lt(const void *a, const void *b)
 static int
 gbt_int8key_cmp(const void *a, const void *b)
 {
+	int64KEY   *ia = (int64KEY *) (((Nsrt *) a)->t);
+	int64KEY   *ib = (int64KEY *) (((Nsrt *) b)->t);
 
-	if (*(int64 *) &(((Nsrt *) a)->t[0]) > *(int64 *) &(((Nsrt *) b)->t[0]))
-		return 1;
-	else if (*(int64 *) &(((Nsrt *) a)->t[0]) < *(int64 *) &(((Nsrt *) b)->t[0]))
-		return -1;
-	return 0;
+	if (ia->lower == ib->lower)
+	{
+		if (ia->upper == ib->upper)
+			return 0;
 
+		return (ia->upper > ib->upper) ? 1 : -1;
+	}
+
+	return (ia->lower > ib->lower) ? 1 : -1;
 }
 
 
diff --git a/contrib/btree_gist/btree_interval.c b/contrib/btree_gist/btree_interval.c
index b136847923..32b9ddbad7 100644
--- a/contrib/btree_gist/btree_interval.c
+++ b/contrib/btree_gist/btree_interval.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gist/btree_interval.c,v 1.12 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gist/btree_interval.c,v 1.14 2010/02/26 02:00:31 momjian Exp $
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
@@ -65,12 +65,15 @@ gbt_intvlt(const void *a, const void *b)
 static int
 gbt_intvkey_cmp(const void *a, const void *b)
 {
-	return DatumGetInt32(
-						 DirectFunctionCall2(interval_cmp,
-										  IntervalPGetDatum(((Nsrt *) a)->t),
-										   IntervalPGetDatum(((Nsrt *) b)->t)
-											 )
-		);
+	intvKEY    *ia = (intvKEY *) (((Nsrt *) a)->t);
+	intvKEY    *ib = (intvKEY *) (((Nsrt *) b)->t);
+	int			res;
+
+	res = DatumGetInt32(DirectFunctionCall2(interval_cmp, IntervalPGetDatum(&ia->lower), IntervalPGetDatum(&ib->lower)));
+	if (res == 0)
+		return DatumGetInt32(DirectFunctionCall2(interval_cmp, IntervalPGetDatum(&ia->upper), IntervalPGetDatum(&ib->upper)));
+
+	return res;
 }
 
 
diff --git a/contrib/btree_gist/btree_macaddr.c b/contrib/btree_gist/btree_macaddr.c
index 5c5030faec..60092b4e9e 100644
--- a/contrib/btree_gist/btree_macaddr.c
+++ b/contrib/btree_gist/btree_macaddr.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gist/btree_macaddr.c,v 1.8 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gist/btree_macaddr.c,v 1.10 2010/02/26 02:00:31 momjian Exp $
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
@@ -63,13 +63,15 @@ gbt_macadlt(const void *a, const void *b)
 static int
 gbt_macadkey_cmp(const void *a, const void *b)
 {
-	return DatumGetInt32(
-						 DirectFunctionCall2(
-											 macaddr_cmp,
-										PointerGetDatum(&((Nsrt *) a)->t[0]),
-										 PointerGetDatum(&((Nsrt *) b)->t[0])
-											 )
-		);
+	macKEY	   *ia = (macKEY *) (((Nsrt *) a)->t);
+	macKEY	   *ib = (macKEY *) (((Nsrt *) b)->t);
+	int			res;
+
+	res = DatumGetInt32(DirectFunctionCall2(macaddr_cmp, MacaddrPGetDatum(&ia->lower), MacaddrPGetDatum(&ib->lower)));
+	if (res == 0)
+		return DatumGetInt32(DirectFunctionCall2(macaddr_cmp, MacaddrPGetDatum(&ia->upper), MacaddrPGetDatum(&ib->upper)));
+
+	return res;
 }
 
 
diff --git a/contrib/btree_gist/btree_oid.c b/contrib/btree_gist/btree_oid.c
index 6a0805635d..96e4be54d4 100644
--- a/contrib/btree_gist/btree_oid.c
+++ b/contrib/btree_gist/btree_oid.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gist/btree_oid.c,v 1.8 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gist/btree_oid.c,v 1.10 2010/02/26 02:00:31 momjian Exp $
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
@@ -57,13 +57,18 @@ gbt_oidlt(const void *a, const void *b)
 static int
 gbt_oidkey_cmp(const void *a, const void *b)
 {
+	oidKEY	   *ia = (oidKEY *) (((Nsrt *) a)->t);
+	oidKEY	   *ib = (oidKEY *) (((Nsrt *) b)->t);
 
-	if (*(Oid *) &(((Nsrt *) a)->t[0]) > *(Oid *) &(((Nsrt *) b)->t[0]))
-		return 1;
-	else if (*(Oid *) &(((Nsrt *) a)->t[0]) < *(Oid *) &(((Nsrt *) b)->t[0]))
-		return -1;
-	return 0;
+	if (ia->lower == ib->lower)
+	{
+		if (ia->upper == ib->upper)
+			return 0;
 
+		return (ia->upper > ib->upper) ? 1 : -1;
+	}
+
+	return (ia->lower > ib->lower) ? 1 : -1;
 }
 
 
diff --git a/contrib/btree_gist/btree_time.c b/contrib/btree_gist/btree_time.c
index 7287755fc7..8566a8efb7 100644
--- a/contrib/btree_gist/btree_time.c
+++ b/contrib/btree_gist/btree_time.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gist/btree_time.c,v 1.16 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gist/btree_time.c,v 1.18 2010/02/26 02:00:31 momjian Exp $
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
@@ -101,11 +101,15 @@ gbt_timelt(const void *a, const void *b)
 static int
 gbt_timekey_cmp(const void *a, const void *b)
 {
-	if (gbt_timegt((void *) &(((Nsrt *) a)->t[0]), (void *) &(((Nsrt *) b)->t[0])))
-		return 1;
-	else if (gbt_timelt((void *) &(((Nsrt *) a)->t[0]), (void *) &(((Nsrt *) b)->t[0])))
-		return -1;
-	return 0;
+	timeKEY    *ia = (timeKEY *) (((Nsrt *) a)->t);
+	timeKEY    *ib = (timeKEY *) (((Nsrt *) b)->t);
+	int			res;
+
+	res = DatumGetInt32(DirectFunctionCall2(time_cmp, TimeADTGetDatumFast(ia->lower), TimeADTGetDatumFast(ib->lower)));
+	if (res == 0)
+		return DatumGetInt32(DirectFunctionCall2(time_cmp, TimeADTGetDatumFast(ia->upper), TimeADTGetDatumFast(ib->upper)));
+
+	return res;
 }
 
 
diff --git a/contrib/btree_gist/btree_ts.c b/contrib/btree_gist/btree_ts.c
index e0780ef391..543f2129b0 100644
--- a/contrib/btree_gist/btree_ts.c
+++ b/contrib/btree_gist/btree_ts.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gist/btree_ts.c,v 1.17 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gist/btree_ts.c,v 1.19 2010/02/26 02:00:32 momjian Exp $
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
@@ -99,11 +99,15 @@ gbt_tslt(const void *a, const void *b)
 static int
 gbt_tskey_cmp(const void *a, const void *b)
 {
-	if (gbt_tsgt((void *) &(((Nsrt *) a)->t[0]), (void *) &(((Nsrt *) b)->t[0])))
-		return 1;
-	else if (gbt_tslt((void *) &(((Nsrt *) a)->t[0]), (void *) &(((Nsrt *) b)->t[0])))
-		return -1;
-	return 0;
+	tsKEY	   *ia = (tsKEY *) (((Nsrt *) a)->t);
+	tsKEY	   *ib = (tsKEY *) (((Nsrt *) b)->t);
+	int			res;
+
+	res = DatumGetInt32(DirectFunctionCall2(timestamp_cmp, TimestampGetDatumFast(ia->lower), TimestampGetDatumFast(ib->lower)));
+	if (res == 0)
+		return DatumGetInt32(DirectFunctionCall2(timestamp_cmp, TimestampGetDatumFast(ia->upper), TimestampGetDatumFast(ib->upper)));
+
+	return res;
 }
 
 
diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c
index 57d12e4cda..916706d8a4 100644
--- a/contrib/btree_gist/btree_utils_var.c
+++ b/contrib/btree_gist/btree_utils_var.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gist/btree_utils_var.c,v 1.21 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gist/btree_utils_var.c,v 1.23 2010/02/26 02:00:32 momjian Exp $
  */
 #include "btree_gist.h"
 
@@ -444,8 +444,13 @@ gbt_vsrt_cmp(const void *a, const void *b, void *arg)
 	GBT_VARKEY_R ar = gbt_var_key_readable(((const Vsrt *) a)->t);
 	GBT_VARKEY_R br = gbt_var_key_readable(((const Vsrt *) b)->t);
 	const gbtree_vinfo *tinfo = (const gbtree_vinfo *) arg;
+	int			res;
 
-	return (*tinfo->f_cmp) (ar.lower, br.lower);
+	res = (*tinfo->f_cmp) (ar.lower, br.lower);
+	if (res == 0)
+		return (*tinfo->f_cmp) (ar.upper, br.upper);
+
+	return res;
 }
 
 GIST_SPLITVEC *
diff --git a/contrib/citext/expected/citext.out b/contrib/citext/expected/citext.out
index 3694cb8b5b..21e73be2d7 100644
--- a/contrib/citext/expected/citext.out
+++ b/contrib/citext/expected/citext.out
@@ -271,10 +271,13 @@ SELECT name, 'A' = name AS t      FROM try where name = 'A';
 -- expected failures on duplicate key
 INSERT INTO try (name) VALUES ('a');
 ERROR:  duplicate key value violates unique constraint "try_pkey"
+DETAIL:  Key (name)=(a) already exists.
 INSERT INTO try (name) VALUES ('A');
 ERROR:  duplicate key value violates unique constraint "try_pkey"
+DETAIL:  Key (name)=(A) already exists.
 INSERT INTO try (name) VALUES ('aB');
 ERROR:  duplicate key value violates unique constraint "try_pkey"
+DETAIL:  Key (name)=(aB) already exists.
 -- Make sure that citext_smaller() and citext_lager() work properly.
 SELECT citext_smaller( 'aa'::citext, 'ab'::citext ) = 'aa' AS t;
  t 
@@ -734,18 +737,6 @@ SELECT 'f'::citext::"char" = 'f'::"char" AS t;
  t
 (1 row)
 
-SELECT 'foo'::bytea::citext = 'foo' AS t;
- t 
----
- t
-(1 row)
-
-SELECT 'foo'::citext::bytea = 'foo'::bytea AS t;
- t 
----
- t
-(1 row)
-
 SELECT '100'::money::citext = '$100.00' AS t;
  t 
 ---
diff --git a/contrib/citext/expected/citext_1.out b/contrib/citext/expected/citext_1.out
index 1a6bcdf0bc..5fa537bc19 100644
--- a/contrib/citext/expected/citext_1.out
+++ b/contrib/citext/expected/citext_1.out
@@ -271,10 +271,13 @@ SELECT name, 'A' = name AS t      FROM try where name = 'A';
 -- expected failures on duplicate key
 INSERT INTO try (name) VALUES ('a');
 ERROR:  duplicate key value violates unique constraint "try_pkey"
+DETAIL:  Key (name)=(a) already exists.
 INSERT INTO try (name) VALUES ('A');
 ERROR:  duplicate key value violates unique constraint "try_pkey"
+DETAIL:  Key (name)=(A) already exists.
 INSERT INTO try (name) VALUES ('aB');
 ERROR:  duplicate key value violates unique constraint "try_pkey"
+DETAIL:  Key (name)=(aB) already exists.
 -- Make sure that citext_smaller() and citext_lager() work properly.
 SELECT citext_smaller( 'aa'::citext, 'ab'::citext ) = 'aa' AS t;
  t 
@@ -734,18 +737,6 @@ SELECT 'f'::citext::"char" = 'f'::"char" AS t;
  t
 (1 row)
 
-SELECT 'foo'::bytea::citext = 'foo' AS t;
- t 
----
- t
-(1 row)
-
-SELECT 'foo'::citext::bytea = 'foo'::bytea AS t;
- t 
----
- t
-(1 row)
-
 SELECT '100'::money::citext = '$100.00' AS t;
  t 
 ---
diff --git a/contrib/citext/sql/citext.sql b/contrib/citext/sql/citext.sql
index 52999c2e63..9014e5d931 100644
--- a/contrib/citext/sql/citext.sql
+++ b/contrib/citext/sql/citext.sql
@@ -226,9 +226,6 @@ SELECT 'f'::citext::char = 'f'::char AS t;
 SELECT 'f'::"char"::citext = 'f' AS t;
 SELECT 'f'::citext::"char" = 'f'::"char" AS t;
 
-SELECT 'foo'::bytea::citext = 'foo' AS t;
-SELECT 'foo'::citext::bytea = 'foo'::bytea AS t;
-
 SELECT '100'::money::citext = '$100.00' AS t;
 SELECT '100'::citext::money = '100'::money AS t;
 
diff --git a/contrib/cube/CHANGES b/contrib/cube/CHANGES
index 5e5e7c8d4a..d3eca90f6d 100644
--- a/contrib/cube/CHANGES
+++ b/contrib/cube/CHANGES
@@ -89,7 +89,7 @@ cube_enlarge
 cube takes text input and returns a cube. This is useful for making cubes
 from computed strings.
 
-cube_dim returns the number of dimensions stored in the the data structure
+cube_dim returns the number of dimensions stored in the data structure
 for a cube. This is useful for constraints on the dimensions of a cube.
 
 cube_ll_coord returns the nth coordinate value for the lower left corner
diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile
index 7f91b14c64..2f3da437e5 100644
--- a/contrib/cube/Makefile
+++ b/contrib/cube/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.22 2008/08/29 13:02:32 petere Exp $
+# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.23 2009/08/28 20:26:18 petere Exp $
 
 MODULE_big = cube
 OBJS= cube.o cubeparse.o
@@ -24,23 +24,23 @@ endif
 
 
 # cubescan is compiled as part of cubeparse
-cubeparse.o: $(srcdir)/cubescan.c
+cubeparse.o: cubescan.c
 
-$(srcdir)/cubeparse.c: cubeparse.y
+cubeparse.c: cubeparse.y
 ifdef BISON
 	$(BISON) $(BISONFLAGS) -o $@ $<
 else
 	@$(missing) bison $< $@
 endif
 
-$(srcdir)/cubescan.c: cubescan.l
+cubescan.c: cubescan.l
 ifdef FLEX
 	$(FLEX) $(FLEXFLAGS) -o'$@' $<
 else
 	@$(missing) flex $< $@
 endif
 
-distprep: $(srcdir)/cubeparse.c $(srcdir)/cubescan.c
+distprep: cubeparse.c cubescan.c
 
 maintainer-clean:
-	rm -f $(srcdir)/cubeparse.c $(srcdir)/cubescan.c
+	rm -f cubeparse.c cubescan.c
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index 6f3cc71f16..4bfa7670fd 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -8,8 +8,8 @@
  * Darko Prenosil <[email protected]>
  * Shridhar Daithankar <[email protected]>
  *
- * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.82 2009/06/11 14:48:50 momjian Exp $
- * Copyright (c) 2001-2009, PostgreSQL Global Development Group
+ * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.99 2010/07/06 19:18:54 momjian Exp $
+ * Copyright (c) 2001-2010, PostgreSQL Global Development Group
  * ALL RIGHTS RESERVED;
  *
  * Permission to use, copy, modify, and distribute this software and its
@@ -54,6 +54,7 @@
 #include "nodes/nodes.h"
 #include "nodes/pg_list.h"
 #include "parser/parse_type.h"
+#include "parser/scansup.h"
 #include "utils/acl.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
@@ -80,26 +81,30 @@ typedef struct remoteConn
  * Internal declarations
  */
 static Datum dblink_record_internal(FunctionCallInfo fcinfo, bool is_async);
+static void materializeResult(FunctionCallInfo fcinfo, PGresult *res);
 static remoteConn *getConnectionByName(const char *name);
 static HTAB *createConnHash(void);
 static void createNewConnection(const char *name, remoteConn *rconn);
 static void deleteConnection(const char *name);
-static char **get_pkey_attnames(Oid relid, int16 *numatts);
+static char **get_pkey_attnames(Relation rel, int16 *numatts);
 static char **get_text_array_contents(ArrayType *array, int *numitems);
-static char *get_sql_insert(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals);
-static char *get_sql_delete(Oid relid, int2vector *pkattnums, int16 pknumatts, char **tgt_pkattvals);
-static char *get_sql_update(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals);
+static char *get_sql_insert(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals, char **tgt_pkattvals);
+static char *get_sql_delete(Relation rel, int *pkattnums, int pknumatts, char **tgt_pkattvals);
+static char *get_sql_update(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals, char **tgt_pkattvals);
 static char *quote_literal_cstr(char *rawstr);
 static char *quote_ident_cstr(char *rawstr);
-static int16 get_attnum_pk_pos(int2vector *pkattnums, int16 pknumatts, int16 key);
-static HeapTuple get_tuple_of_interest(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pkattvals);
-static Oid	get_relid_from_relname(text *relname_text);
-static char *generate_relation_name(Oid relid);
+static int	get_attnum_pk_pos(int *pkattnums, int pknumatts, int key);
+static HeapTuple get_tuple_of_interest(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals);
+static Relation get_rel_from_relname(text *relname_text, LOCKMODE lockmode, AclMode aclmode);
+static char *generate_relation_name(Relation rel);
 static void dblink_connstr_check(const char *connstr);
 static void dblink_security_check(PGconn *conn, remoteConn *rconn);
 static void dblink_res_error(const char *conname, PGresult *res, const char *dblink_context_msg, bool fail);
 static char *get_connect_string(const char *servername);
 static char *escape_param_str(const char *from);
+static void validate_pkattnums(Relation rel,
+				   int2vector *pkattnums_arg, int32 pknumatts_arg,
+				   int **pkattnums, int *pknumatts);
 
 /* Global */
 static remoteConn *pconn = NULL;
@@ -504,200 +509,94 @@ PG_FUNCTION_INFO_V1(dblink_fetch);
 Datum
 dblink_fetch(PG_FUNCTION_ARGS)
 {
-	FuncCallContext *funcctx;
-	TupleDesc	tupdesc = NULL;
-	int			call_cntr;
-	int			max_calls;
-	AttInMetadata *attinmeta;
+	ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
 	PGresult   *res = NULL;
-	MemoryContext oldcontext;
 	char	   *conname = NULL;
 	remoteConn *rconn = NULL;
+	PGconn	   *conn = NULL;
+	StringInfoData buf;
+	char	   *curname = NULL;
+	int			howmany = 0;
+	bool		fail = true;	/* default to backward compatible */
 
 	DBLINK_INIT;
 
-	/* stuff done only on the first call of the function */
-	if (SRF_IS_FIRSTCALL())
+	if (PG_NARGS() == 4)
 	{
-		PGconn	   *conn = NULL;
-		StringInfoData buf;
-		char	   *curname = NULL;
-		int			howmany = 0;
-		bool		fail = true;	/* default to backward compatible */
+		/* text,text,int,bool */
+		conname = text_to_cstring(PG_GETARG_TEXT_PP(0));
+		curname = text_to_cstring(PG_GETARG_TEXT_PP(1));
+		howmany = PG_GETARG_INT32(2);
+		fail = PG_GETARG_BOOL(3);
 
-		if (PG_NARGS() == 4)
+		rconn = getConnectionByName(conname);
+		if (rconn)
+			conn = rconn->conn;
+	}
+	else if (PG_NARGS() == 3)
+	{
+		/* text,text,int or text,int,bool */
+		if (get_fn_expr_argtype(fcinfo->flinfo, 2) == BOOLOID)
+		{
+			curname = text_to_cstring(PG_GETARG_TEXT_PP(0));
+			howmany = PG_GETARG_INT32(1);
+			fail = PG_GETARG_BOOL(2);
+			conn = pconn->conn;
+		}
+		else
 		{
-			/* text,text,int,bool */
 			conname = text_to_cstring(PG_GETARG_TEXT_PP(0));
 			curname = text_to_cstring(PG_GETARG_TEXT_PP(1));
 			howmany = PG_GETARG_INT32(2);
-			fail = PG_GETARG_BOOL(3);
 
 			rconn = getConnectionByName(conname);
 			if (rconn)
 				conn = rconn->conn;
 		}
-		else if (PG_NARGS() == 3)
-		{
-			/* text,text,int or text,int,bool */
-			if (get_fn_expr_argtype(fcinfo->flinfo, 2) == BOOLOID)
-			{
-				curname = text_to_cstring(PG_GETARG_TEXT_PP(0));
-				howmany = PG_GETARG_INT32(1);
-				fail = PG_GETARG_BOOL(2);
-				conn = pconn->conn;
-			}
-			else
-			{
-				conname = text_to_cstring(PG_GETARG_TEXT_PP(0));
-				curname = text_to_cstring(PG_GETARG_TEXT_PP(1));
-				howmany = PG_GETARG_INT32(2);
-
-				rconn = getConnectionByName(conname);
-				if (rconn)
-					conn = rconn->conn;
-			}
-		}
-		else if (PG_NARGS() == 2)
-		{
-			/* text,int */
-			curname = text_to_cstring(PG_GETARG_TEXT_PP(0));
-			howmany = PG_GETARG_INT32(1);
-			conn = pconn->conn;
-		}
-
-		if (!conn)
-			DBLINK_CONN_NOT_AVAIL;
-
-		initStringInfo(&buf);
-		appendStringInfo(&buf, "FETCH %d FROM %s", howmany, curname);
-
-		/* create a function context for cross-call persistence */
-		funcctx = SRF_FIRSTCALL_INIT();
-
-		/*
-		 * Try to execute the query.  Note that since libpq uses malloc, the
-		 * PGresult will be long-lived even though we are still in a
-		 * short-lived memory context.
-		 */
-		res = PQexec(conn, buf.data);
-		if (!res ||
-			(PQresultStatus(res) != PGRES_COMMAND_OK &&
-			 PQresultStatus(res) != PGRES_TUPLES_OK))
-		{
-			dblink_res_error(conname, res, "could not fetch from cursor", fail);
-			SRF_RETURN_DONE(funcctx);
-		}
-		else if (PQresultStatus(res) == PGRES_COMMAND_OK)
-		{
-			/* cursor does not exist - closed already or bad name */
-			PQclear(res);
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_CURSOR_NAME),
-					 errmsg("cursor \"%s\" does not exist", curname)));
-		}
-
-		funcctx->max_calls = PQntuples(res);
-
-		/* got results, keep track of them */
-		funcctx->user_fctx = res;
-
-		/* get a tuple descriptor for our result type */
-		switch (get_call_result_type(fcinfo, NULL, &tupdesc))
-		{
-			case TYPEFUNC_COMPOSITE:
-				/* success */
-				break;
-			case TYPEFUNC_RECORD:
-				/* failed to determine actual type of RECORD */
-				ereport(ERROR,
-						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 errmsg("function returning record called in context "
-								"that cannot accept type record")));
-				break;
-			default:
-				/* result type isn't composite */
-				elog(ERROR, "return type must be a row type");
-				break;
-		}
-
-		/* check result and tuple descriptor have the same number of columns */
-		if (PQnfields(res) != tupdesc->natts)
-			ereport(ERROR,
-					(errcode(ERRCODE_DATATYPE_MISMATCH),
-					 errmsg("remote query result rowtype does not match "
-							"the specified FROM clause rowtype")));
-
-		/*
-		 * fast track when no results.	We could exit earlier, but then we'd
-		 * not report error if the result tuple type is wrong.
-		 */
-		if (funcctx->max_calls < 1)
-		{
-			PQclear(res);
-			SRF_RETURN_DONE(funcctx);
-		}
-
-		/*
-		 * switch to memory context appropriate for multiple function calls,
-		 * so we can make long-lived copy of tupdesc etc
-		 */
-		oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
-
-		/* make sure we have a persistent copy of the tupdesc */
-		tupdesc = CreateTupleDescCopy(tupdesc);
+	}
+	else if (PG_NARGS() == 2)
+	{
+		/* text,int */
+		curname = text_to_cstring(PG_GETARG_TEXT_PP(0));
+		howmany = PG_GETARG_INT32(1);
+		conn = pconn->conn;
+	}
 
-		/* store needed metadata for subsequent calls */
-		attinmeta = TupleDescGetAttInMetadata(tupdesc);
-		funcctx->attinmeta = attinmeta;
+	if (!conn)
+		DBLINK_CONN_NOT_AVAIL;
 
-		MemoryContextSwitchTo(oldcontext);
-	}
+	/* let the caller know we're sending back a tuplestore */
+	rsinfo->returnMode = SFRM_Materialize;
+	rsinfo->setResult = NULL;
+	rsinfo->setDesc = NULL;
 
-	/* stuff done on every call of the function */
-	funcctx = SRF_PERCALL_SETUP();
+	initStringInfo(&buf);
+	appendStringInfo(&buf, "FETCH %d FROM %s", howmany, curname);
 
 	/*
-	 * initialize per-call variables
+	 * Try to execute the query.  Note that since libpq uses malloc, the
+	 * PGresult will be long-lived even though we are still in a short-lived
+	 * memory context.
 	 */
-	call_cntr = funcctx->call_cntr;
-	max_calls = funcctx->max_calls;
-
-	res = (PGresult *) funcctx->user_fctx;
-	attinmeta = funcctx->attinmeta;
-	tupdesc = attinmeta->tupdesc;
-
-	if (call_cntr < max_calls)	/* do when there is more left to send */
+	res = PQexec(conn, buf.data);
+	if (!res ||
+		(PQresultStatus(res) != PGRES_COMMAND_OK &&
+		 PQresultStatus(res) != PGRES_TUPLES_OK))
 	{
-		char	  **values;
-		HeapTuple	tuple;
-		Datum		result;
-		int			i;
-		int			nfields = PQnfields(res);
-
-		values = (char **) palloc(nfields * sizeof(char *));
-		for (i = 0; i < nfields; i++)
-		{
-			if (PQgetisnull(res, call_cntr, i) == 0)
-				values[i] = PQgetvalue(res, call_cntr, i);
-			else
-				values[i] = NULL;
-		}
-
-		/* build the tuple */
-		tuple = BuildTupleFromCStrings(attinmeta, values);
-
-		/* make the tuple into a datum */
-		result = HeapTupleGetDatum(tuple);
-
-		SRF_RETURN_NEXT(funcctx, result);
+		dblink_res_error(conname, res, "could not fetch from cursor", fail);
+		return (Datum) 0;
 	}
-	else
+	else if (PQresultStatus(res) == PGRES_COMMAND_OK)
 	{
-		/* do when there is no more left */
+		/* cursor does not exist - closed already or bad name */
 		PQclear(res);
-		SRF_RETURN_DONE(funcctx);
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_CURSOR_NAME),
+				 errmsg("cursor \"%s\" does not exist", curname)));
 	}
+
+	materializeResult(fcinfo, res);
+	return (Datum) 0;
 }
 
 /*
@@ -749,147 +648,156 @@ dblink_get_result(PG_FUNCTION_ARGS)
 static Datum
 dblink_record_internal(FunctionCallInfo fcinfo, bool is_async)
 {
-	FuncCallContext *funcctx;
-	TupleDesc	tupdesc = NULL;
-	int			call_cntr;
-	int			max_calls;
-	AttInMetadata *attinmeta;
+	ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
 	char	   *msg;
 	PGresult   *res = NULL;
-	bool		is_sql_cmd = false;
-	char	   *sql_cmd_status = NULL;
-	MemoryContext oldcontext;
+	PGconn	   *conn = NULL;
+	char	   *connstr = NULL;
+	char	   *sql = NULL;
+	char	   *conname = NULL;
+	remoteConn *rconn = NULL;
+	bool		fail = true;	/* default to backward compatible */
 	bool		freeconn = false;
 
+	/* check to see if caller supports us returning a tuplestore */
+	if (rsinfo == NULL || !IsA(rsinfo, ReturnSetInfo))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("set-valued function called in context that cannot accept a set")));
+	if (!(rsinfo->allowedModes & SFRM_Materialize))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("materialize mode required, but it is not " \
+						"allowed in this context")));
+
 	DBLINK_INIT;
 
-	/* stuff done only on the first call of the function */
-	if (SRF_IS_FIRSTCALL())
+	if (!is_async)
 	{
-		PGconn	   *conn = NULL;
-		char	   *connstr = NULL;
-		char	   *sql = NULL;
-		char	   *conname = NULL;
-		remoteConn *rconn = NULL;
-		bool		fail = true;	/* default to backward compatible */
-
-		/* create a function context for cross-call persistence */
-		funcctx = SRF_FIRSTCALL_INIT();
-
-		/*
-		 * switch to memory context appropriate for multiple function calls
-		 */
-		oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
-
-		if (!is_async)
+		if (PG_NARGS() == 3)
 		{
-			if (PG_NARGS() == 3)
-			{
-				/* text,text,bool */
-				DBLINK_GET_CONN;
-				sql = text_to_cstring(PG_GETARG_TEXT_PP(1));
-				fail = PG_GETARG_BOOL(2);
-			}
-			else if (PG_NARGS() == 2)
-			{
-				/* text,text or text,bool */
-				if (get_fn_expr_argtype(fcinfo->flinfo, 1) == BOOLOID)
-				{
-					conn = pconn->conn;
-					sql = text_to_cstring(PG_GETARG_TEXT_PP(0));
-					fail = PG_GETARG_BOOL(1);
-				}
-				else
-				{
-					DBLINK_GET_CONN;
-					sql = text_to_cstring(PG_GETARG_TEXT_PP(1));
-				}
-			}
-			else if (PG_NARGS() == 1)
-			{
-				/* text */
-				conn = pconn->conn;
-				sql = text_to_cstring(PG_GETARG_TEXT_PP(0));
-			}
-			else
-				/* shouldn't happen */
-				elog(ERROR, "wrong number of arguments");
+			/* text,text,bool */
+			DBLINK_GET_CONN;
+			sql = text_to_cstring(PG_GETARG_TEXT_PP(1));
+			fail = PG_GETARG_BOOL(2);
 		}
-		else	/* is_async */
+		else if (PG_NARGS() == 2)
 		{
-			/* get async result */
-			if (PG_NARGS() == 2)
+			/* text,text or text,bool */
+			if (get_fn_expr_argtype(fcinfo->flinfo, 1) == BOOLOID)
 			{
-				/* text,bool */
-				DBLINK_GET_CONN;
+				conn = pconn->conn;
+				sql = text_to_cstring(PG_GETARG_TEXT_PP(0));
 				fail = PG_GETARG_BOOL(1);
 			}
-			else if (PG_NARGS() == 1)
+			else
 			{
-				/* text */
 				DBLINK_GET_CONN;
+				sql = text_to_cstring(PG_GETARG_TEXT_PP(1));
 			}
-			else
-				/* shouldn't happen */
-				elog(ERROR, "wrong number of arguments");
 		}
-
-		if (!conn)
-			DBLINK_CONN_NOT_AVAIL;
-
-		/* synchronous query, or async result retrieval */
-		if (!is_async)
-			res = PQexec(conn, sql);
+		else if (PG_NARGS() == 1)
+		{
+			/* text */
+			conn = pconn->conn;
+			sql = text_to_cstring(PG_GETARG_TEXT_PP(0));
+		}
 		else
+			/* shouldn't happen */
+			elog(ERROR, "wrong number of arguments");
+	}
+	else	/* is_async */
+	{
+		/* get async result */
+		if (PG_NARGS() == 2)
 		{
-			res = PQgetResult(conn);
-			/* NULL means we're all done with the async results */
-			if (!res)
-			{
-				MemoryContextSwitchTo(oldcontext);
-				SRF_RETURN_DONE(funcctx);
-			}
+			/* text,bool */
+			DBLINK_GET_CONN;
+			fail = PG_GETARG_BOOL(1);
 		}
-
-		if (!res ||
-			(PQresultStatus(res) != PGRES_COMMAND_OK &&
-			 PQresultStatus(res) != PGRES_TUPLES_OK))
+		else if (PG_NARGS() == 1)
 		{
-			dblink_res_error(conname, res, "could not execute query", fail);
-			if (freeconn)
-				PQfinish(conn);
-			MemoryContextSwitchTo(oldcontext);
-			SRF_RETURN_DONE(funcctx);
+			/* text */
+			DBLINK_GET_CONN;
 		}
+		else
+			/* shouldn't happen */
+			elog(ERROR, "wrong number of arguments");
+	}
+
+	if (!conn)
+		DBLINK_CONN_NOT_AVAIL;
+
+	/* let the caller know we're sending back a tuplestore */
+	rsinfo->returnMode = SFRM_Materialize;
+	rsinfo->setResult = NULL;
+	rsinfo->setDesc = NULL;
+
+	/* synchronous query, or async result retrieval */
+	if (!is_async)
+		res = PQexec(conn, sql);
+	else
+	{
+		res = PQgetResult(conn);
+		/* NULL means we're all done with the async results */
+		if (!res)
+			return (Datum) 0;
+	}
+
+	/* if needed, close the connection to the database and cleanup */
+	if (freeconn)
+		PQfinish(conn);
+
+	if (!res ||
+		(PQresultStatus(res) != PGRES_COMMAND_OK &&
+		 PQresultStatus(res) != PGRES_TUPLES_OK))
+	{
+		dblink_res_error(conname, res, "could not execute query", fail);
+		return (Datum) 0;
+	}
+
+	materializeResult(fcinfo, res);
+	return (Datum) 0;
+}
+
+/*
+ * Materialize the PGresult to return them as the function result.
+ * The res will be released in this function.
+ */
+static void
+materializeResult(FunctionCallInfo fcinfo, PGresult *res)
+{
+	ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
+
+	Assert(rsinfo->returnMode == SFRM_Materialize);
+
+	PG_TRY();
+	{
+		TupleDesc	tupdesc;
+		bool		is_sql_cmd = false;
+		int			ntuples;
+		int			nfields;
 
 		if (PQresultStatus(res) == PGRES_COMMAND_OK)
 		{
 			is_sql_cmd = true;
 
-			/* need a tuple descriptor representing one TEXT column */
+			/*
+			 * need a tuple descriptor representing one TEXT column to return
+			 * the command status string as our result tuple
+			 */
 			tupdesc = CreateTemplateTupleDesc(1, false);
 			TupleDescInitEntry(tupdesc, (AttrNumber) 1, "status",
 							   TEXTOID, -1, 0);
-
-			/*
-			 * and save a copy of the command status string to return as our
-			 * result tuple
-			 */
-			sql_cmd_status = PQcmdStatus(res);
-			funcctx->max_calls = 1;
+			ntuples = 1;
+			nfields = 1;
 		}
 		else
-			funcctx->max_calls = PQntuples(res);
-
-		/* got results, keep track of them */
-		funcctx->user_fctx = res;
+		{
+			Assert(PQresultStatus(res) == PGRES_TUPLES_OK);
 
-		/* if needed, close the connection to the database and cleanup */
-		if (freeconn)
-			PQfinish(conn);
+			is_sql_cmd = false;
 
-		if (!is_sql_cmd)
-		{
 			/* get a tuple descriptor for our result type */
 			switch (get_call_result_type(fcinfo, NULL, &tupdesc))
 			{
@@ -911,87 +819,78 @@ dblink_record_internal(FunctionCallInfo fcinfo, bool is_async)
 
 			/* make sure we have a persistent copy of the tupdesc */
 			tupdesc = CreateTupleDescCopy(tupdesc);
+			ntuples = PQntuples(res);
+			nfields = PQnfields(res);
 		}
 
 		/*
 		 * check result and tuple descriptor have the same number of columns
 		 */
-		if (PQnfields(res) != tupdesc->natts)
+		if (nfields != tupdesc->natts)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATATYPE_MISMATCH),
 					 errmsg("remote query result rowtype does not match "
 							"the specified FROM clause rowtype")));
 
-		/* fast track when no results */
-		if (funcctx->max_calls < 1)
+		if (ntuples > 0)
 		{
-			if (res)
-				PQclear(res);
+			AttInMetadata *attinmeta;
+			Tuplestorestate *tupstore;
+			MemoryContext oldcontext;
+			int			row;
+			char	  **values;
+
+			attinmeta = TupleDescGetAttInMetadata(tupdesc);
+
+			oldcontext = MemoryContextSwitchTo(
+									rsinfo->econtext->ecxt_per_query_memory);
+			tupstore = tuplestore_begin_heap(true, false, work_mem);
+			rsinfo->setResult = tupstore;
+			rsinfo->setDesc = tupdesc;
 			MemoryContextSwitchTo(oldcontext);
-			SRF_RETURN_DONE(funcctx);
-		}
-
-		/* store needed metadata for subsequent calls */
-		attinmeta = TupleDescGetAttInMetadata(tupdesc);
-		funcctx->attinmeta = attinmeta;
 
-		MemoryContextSwitchTo(oldcontext);
-
-	}
-
-	/* stuff done on every call of the function */
-	funcctx = SRF_PERCALL_SETUP();
-
-	/*
-	 * initialize per-call variables
-	 */
-	call_cntr = funcctx->call_cntr;
-	max_calls = funcctx->max_calls;
-
-	res = (PGresult *) funcctx->user_fctx;
-	attinmeta = funcctx->attinmeta;
-	tupdesc = attinmeta->tupdesc;
+			values = (char **) palloc(nfields * sizeof(char *));
 
-	if (call_cntr < max_calls)	/* do when there is more left to send */
-	{
-		char	  **values;
-		HeapTuple	tuple;
-		Datum		result;
+			/* put all tuples into the tuplestore */
+			for (row = 0; row < ntuples; row++)
+			{
+				HeapTuple	tuple;
 
-		if (!is_sql_cmd)
-		{
-			int			i;
-			int			nfields = PQnfields(res);
+				if (!is_sql_cmd)
+				{
+					int			i;
 
-			values = (char **) palloc(nfields * sizeof(char *));
-			for (i = 0; i < nfields; i++)
-			{
-				if (PQgetisnull(res, call_cntr, i) == 0)
-					values[i] = PQgetvalue(res, call_cntr, i);
+					for (i = 0; i < nfields; i++)
+					{
+						if (PQgetisnull(res, row, i))
+							values[i] = NULL;
+						else
+							values[i] = PQgetvalue(res, row, i);
+					}
+				}
 				else
-					values[i] = NULL;
-			}
-		}
-		else
-		{
-			values = (char **) palloc(1 * sizeof(char *));
-			values[0] = sql_cmd_status;
-		}
+				{
+					values[0] = PQcmdStatus(res);
+				}
 
-		/* build the tuple */
-		tuple = BuildTupleFromCStrings(attinmeta, values);
+				/* build the tuple and put it into the tuplestore. */
+				tuple = BuildTupleFromCStrings(attinmeta, values);
+				tuplestore_puttuple(tupstore, tuple);
+			}
 
-		/* make the tuple into a datum */
-		result = HeapTupleGetDatum(tuple);
+			/* clean up and return the tuplestore */
+			tuplestore_donestoring(tupstore);
+		}
 
-		SRF_RETURN_NEXT(funcctx, result);
+		PQclear(res);
 	}
-	else
+	PG_CATCH();
 	{
-		/* do when there is no more left */
+		/* be sure to release the libpq result */
 		PQclear(res);
-		SRF_RETURN_DONE(funcctx);
+		PG_RE_THROW();
 	}
+	PG_END_TRY();
 }
 
 /*
@@ -1121,7 +1020,6 @@ dblink_exec(PG_FUNCTION_ARGS)
 	char	   *msg;
 	PGresult   *res = NULL;
 	text	   *sql_cmd_status = NULL;
-	TupleDesc	tupdesc = NULL;
 	PGconn	   *conn = NULL;
 	char	   *connstr = NULL;
 	char	   *sql = NULL;
@@ -1174,11 +1072,6 @@ dblink_exec(PG_FUNCTION_ARGS)
 	{
 		dblink_res_error(conname, res, "could not execute command", fail);
 
-		/* need a tuple descriptor representing one TEXT column */
-		tupdesc = CreateTemplateTupleDesc(1, false);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 1, "status",
-						   TEXTOID, -1, 0);
-
 		/*
 		 * and save a copy of the command status string to return as our
 		 * result tuple
@@ -1187,11 +1080,6 @@ dblink_exec(PG_FUNCTION_ARGS)
 	}
 	else if (PQresultStatus(res) == PGRES_COMMAND_OK)
 	{
-		/* need a tuple descriptor representing one TEXT column */
-		tupdesc = CreateTemplateTupleDesc(1, false);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 1, "status",
-						   TEXTOID, -1, 0);
-
 		/*
 		 * and save a copy of the command status string to return as our
 		 * result tuple
@@ -1226,7 +1114,6 @@ Datum
 dblink_get_pkey(PG_FUNCTION_ARGS)
 {
 	int16		numatts;
-	Oid			relid;
 	char	  **results;
 	FuncCallContext *funcctx;
 	int32		call_cntr;
@@ -1237,7 +1124,8 @@ dblink_get_pkey(PG_FUNCTION_ARGS)
 	/* stuff done only on the first call of the function */
 	if (SRF_IS_FIRSTCALL())
 	{
-		TupleDesc	tupdesc = NULL;
+		Relation	rel;
+		TupleDesc	tupdesc;
 
 		/* create a function context for cross-call persistence */
 		funcctx = SRF_FIRSTCALL_INIT();
@@ -1247,13 +1135,13 @@ dblink_get_pkey(PG_FUNCTION_ARGS)
 		 */
 		oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
 
-		/* convert relname to rel Oid */
-		relid = get_relid_from_relname(PG_GETARG_TEXT_P(0));
-		if (!OidIsValid(relid))
-			ereport(ERROR,
-					(errcode(ERRCODE_UNDEFINED_TABLE),
-					 errmsg("relation \"%s\" does not exist",
-							text_to_cstring(PG_GETARG_TEXT_PP(0)))));
+		/* open target relation */
+		rel = get_rel_from_relname(PG_GETARG_TEXT_P(0), AccessShareLock, ACL_SELECT);
+
+		/* get the array of attnums */
+		results = get_pkey_attnames(rel, &numatts);
+
+		relation_close(rel, AccessShareLock);
 
 		/*
 		 * need a tuple descriptor representing one INT and one TEXT column
@@ -1271,9 +1159,6 @@ dblink_get_pkey(PG_FUNCTION_ARGS)
 		attinmeta = TupleDescGetAttInMetadata(tupdesc);
 		funcctx->attinmeta = attinmeta;
 
-		/* get an array of attnums */
-		results = get_pkey_attnames(relid, &numatts);
-
 		if ((results != NULL) && (numatts > 0))
 		{
 			funcctx->max_calls = numatts;
@@ -1356,12 +1241,13 @@ Datum
 dblink_build_sql_insert(PG_FUNCTION_ARGS)
 {
 	text	   *relname_text = PG_GETARG_TEXT_P(0);
-	int2vector *pkattnums = (int2vector *) PG_GETARG_POINTER(1);
-	int32		pknumatts_tmp = PG_GETARG_INT32(2);
+	int2vector *pkattnums_arg = (int2vector *) PG_GETARG_POINTER(1);
+	int32		pknumatts_arg = PG_GETARG_INT32(2);
 	ArrayType  *src_pkattvals_arry = PG_GETARG_ARRAYTYPE_P(3);
 	ArrayType  *tgt_pkattvals_arry = PG_GETARG_ARRAYTYPE_P(4);
-	Oid			relid;
-	int16		pknumatts = 0;
+	Relation	rel;
+	int		   *pkattnums;
+	int			pknumatts;
 	char	  **src_pkattvals;
 	char	  **tgt_pkattvals;
 	int			src_nitems;
@@ -1369,30 +1255,15 @@ dblink_build_sql_insert(PG_FUNCTION_ARGS)
 	char	   *sql;
 
 	/*
-	 * Convert relname to rel OID.
+	 * Open target relation.
 	 */
-	relid = get_relid_from_relname(relname_text);
-	if (!OidIsValid(relid))
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_TABLE),
-				 errmsg("relation \"%s\" does not exist",
-						text_to_cstring(relname_text))));
+	rel = get_rel_from_relname(relname_text, AccessShareLock, ACL_SELECT);
 
 	/*
-	 * There should be at least one key attribute
+	 * Process pkattnums argument.
 	 */
-	if (pknumatts_tmp <= 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("number of key attributes must be > 0")));
-
-	if (pknumatts_tmp <= SHRT_MAX)
-		pknumatts = pknumatts_tmp;
-	else
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("input for number of primary key " \
-						"attributes too large")));
+	validate_pkattnums(rel, pkattnums_arg, pknumatts_arg,
+					   &pkattnums, &pknumatts);
 
 	/*
 	 * Source array is made up of key values that will be used to locate the
@@ -1427,7 +1298,12 @@ dblink_build_sql_insert(PG_FUNCTION_ARGS)
 	/*
 	 * Prep work is finally done. Go get the SQL string.
 	 */
-	sql = get_sql_insert(relid, pkattnums, pknumatts, src_pkattvals, tgt_pkattvals);
+	sql = get_sql_insert(rel, pkattnums, pknumatts, src_pkattvals, tgt_pkattvals);
+
+	/*
+	 * Now we can close the relation.
+	 */
+	relation_close(rel, AccessShareLock);
 
 	/*
 	 * And send it
@@ -1456,40 +1332,26 @@ Datum
 dblink_build_sql_delete(PG_FUNCTION_ARGS)
 {
 	text	   *relname_text = PG_GETARG_TEXT_P(0);
-	int2vector *pkattnums = (int2vector *) PG_GETARG_POINTER(1);
-	int32		pknumatts_tmp = PG_GETARG_INT32(2);
+	int2vector *pkattnums_arg = (int2vector *) PG_GETARG_POINTER(1);
+	int32		pknumatts_arg = PG_GETARG_INT32(2);
 	ArrayType  *tgt_pkattvals_arry = PG_GETARG_ARRAYTYPE_P(3);
-	Oid			relid;
-	int16		pknumatts = 0;
+	Relation	rel;
+	int		   *pkattnums;
+	int			pknumatts;
 	char	  **tgt_pkattvals;
 	int			tgt_nitems;
 	char	   *sql;
 
 	/*
-	 * Convert relname to rel OID.
+	 * Open target relation.
 	 */
-	relid = get_relid_from_relname(relname_text);
-	if (!OidIsValid(relid))
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_TABLE),
-				 errmsg("relation \"%s\" does not exist",
-						text_to_cstring(relname_text))));
+	rel = get_rel_from_relname(relname_text, AccessShareLock, ACL_SELECT);
 
 	/*
-	 * There should be at least one key attribute
+	 * Process pkattnums argument.
 	 */
-	if (pknumatts_tmp <= 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("number of key attributes must be > 0")));
-
-	if (pknumatts_tmp <= SHRT_MAX)
-		pknumatts = pknumatts_tmp;
-	else
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("input for number of primary key " \
-						"attributes too large")));
+	validate_pkattnums(rel, pkattnums_arg, pknumatts_arg,
+					   &pkattnums, &pknumatts);
 
 	/*
 	 * Target array is made up of key values that will be used to build the
@@ -1509,7 +1371,12 @@ dblink_build_sql_delete(PG_FUNCTION_ARGS)
 	/*
 	 * Prep work is finally done. Go get the SQL string.
 	 */
-	sql = get_sql_delete(relid, pkattnums, pknumatts, tgt_pkattvals);
+	sql = get_sql_delete(rel, pkattnums, pknumatts, tgt_pkattvals);
+
+	/*
+	 * Now we can close the relation.
+	 */
+	relation_close(rel, AccessShareLock);
 
 	/*
 	 * And send it
@@ -1542,12 +1409,13 @@ Datum
 dblink_build_sql_update(PG_FUNCTION_ARGS)
 {
 	text	   *relname_text = PG_GETARG_TEXT_P(0);
-	int2vector *pkattnums = (int2vector *) PG_GETARG_POINTER(1);
-	int32		pknumatts_tmp = PG_GETARG_INT32(2);
+	int2vector *pkattnums_arg = (int2vector *) PG_GETARG_POINTER(1);
+	int32		pknumatts_arg = PG_GETARG_INT32(2);
 	ArrayType  *src_pkattvals_arry = PG_GETARG_ARRAYTYPE_P(3);
 	ArrayType  *tgt_pkattvals_arry = PG_GETARG_ARRAYTYPE_P(4);
-	Oid			relid;
-	int16		pknumatts = 0;
+	Relation	rel;
+	int		   *pkattnums;
+	int			pknumatts;
 	char	  **src_pkattvals;
 	char	  **tgt_pkattvals;
 	int			src_nitems;
@@ -1555,30 +1423,15 @@ dblink_build_sql_update(PG_FUNCTION_ARGS)
 	char	   *sql;
 
 	/*
-	 * Convert relname to rel OID.
+	 * Open target relation.
 	 */
-	relid = get_relid_from_relname(relname_text);
-	if (!OidIsValid(relid))
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_TABLE),
-				 errmsg("relation \"%s\" does not exist",
-						text_to_cstring(relname_text))));
+	rel = get_rel_from_relname(relname_text, AccessShareLock, ACL_SELECT);
 
 	/*
-	 * There should be one source array key values for each key attnum
+	 * Process pkattnums argument.
 	 */
-	if (pknumatts_tmp <= 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("number of key attributes must be > 0")));
-
-	if (pknumatts_tmp <= SHRT_MAX)
-		pknumatts = pknumatts_tmp;
-	else
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("input for number of primary key " \
-						"attributes too large")));
+	validate_pkattnums(rel, pkattnums_arg, pknumatts_arg,
+					   &pkattnums, &pknumatts);
 
 	/*
 	 * Source array is made up of key values that will be used to locate the
@@ -1613,7 +1466,12 @@ dblink_build_sql_update(PG_FUNCTION_ARGS)
 	/*
 	 * Prep work is finally done. Go get the SQL string.
 	 */
-	sql = get_sql_update(relid, pkattnums, pknumatts, src_pkattvals, tgt_pkattvals);
+	sql = get_sql_update(rel, pkattnums, pknumatts, src_pkattvals, tgt_pkattvals);
+
+	/*
+	 * Now we can close the relation.
+	 */
+	relation_close(rel, AccessShareLock);
 
 	/*
 	 * And send it
@@ -1635,6 +1493,86 @@ dblink_current_query(PG_FUNCTION_ARGS)
 	PG_RETURN_DATUM(current_query(fcinfo));
 }
 
+/*
+ * Retrieve async notifications for a connection.
+ *
+ * Returns an setof record of notifications, or an empty set if none recieved.
+ * Can optionally take a named connection as parameter, but uses the unnamed connection per default.
+ *
+ */
+#define DBLINK_NOTIFY_COLS		3
+
+PG_FUNCTION_INFO_V1(dblink_get_notify);
+Datum
+dblink_get_notify(PG_FUNCTION_ARGS)
+{
+	PGconn	   *conn = NULL;
+	remoteConn *rconn = NULL;
+	PGnotify   *notify;
+	ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
+	TupleDesc	tupdesc;
+	Tuplestorestate *tupstore;
+	MemoryContext per_query_ctx;
+	MemoryContext oldcontext;
+
+	DBLINK_INIT;
+	if (PG_NARGS() == 1)
+		DBLINK_GET_NAMED_CONN;
+	else
+		conn = pconn->conn;
+
+	/* create the tuplestore */
+	per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
+	oldcontext = MemoryContextSwitchTo(per_query_ctx);
+
+	tupdesc = CreateTemplateTupleDesc(DBLINK_NOTIFY_COLS, false);
+	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "notify_name",
+					   TEXTOID, -1, 0);
+	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "be_pid",
+					   INT4OID, -1, 0);
+	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "extra",
+					   TEXTOID, -1, 0);
+
+	tupstore = tuplestore_begin_heap(true, false, work_mem);
+	rsinfo->returnMode = SFRM_Materialize;
+	rsinfo->setResult = tupstore;
+	rsinfo->setDesc = tupdesc;
+
+	MemoryContextSwitchTo(oldcontext);
+
+	PQconsumeInput(conn);
+	while ((notify = PQnotifies(conn)) != NULL)
+	{
+		Datum		values[DBLINK_NOTIFY_COLS];
+		bool		nulls[DBLINK_NOTIFY_COLS];
+
+		memset(values, 0, sizeof(values));
+		memset(nulls, 0, sizeof(nulls));
+
+		if (notify->relname != NULL)
+			values[0] = CStringGetTextDatum(notify->relname);
+		else
+			nulls[0] = true;
+
+		values[1] = Int32GetDatum(notify->be_pid);
+
+		if (notify->extra != NULL)
+			values[2] = CStringGetTextDatum(notify->extra);
+		else
+			nulls[2] = true;
+
+		tuplestore_putvalues(tupstore, tupdesc, values, nulls);
+
+		PQfreemem(notify);
+		PQconsumeInput(conn);
+	}
+
+	/* clean up and return the tuplestore */
+	tuplestore_donestoring(tupstore);
+
+	return (Datum) 0;
+}
+
 /*************************************************************
  * internal functions
  */
@@ -1647,7 +1585,7 @@ dblink_current_query(PG_FUNCTION_ARGS)
  * Return NULL, and set numatts = 0, if no primary key exists.
  */
 static char **
-get_pkey_attnames(Oid relid, int16 *numatts)
+get_pkey_attnames(Relation rel, int16 *numatts)
 {
 	Relation	indexRelation;
 	ScanKeyData skey;
@@ -1655,22 +1593,11 @@ get_pkey_attnames(Oid relid, int16 *numatts)
 	HeapTuple	indexTuple;
 	int			i;
 	char	  **result = NULL;
-	Relation	rel;
 	TupleDesc	tupdesc;
-	AclResult	aclresult;
 
 	/* initialize numatts to 0 in case no primary key exists */
 	*numatts = 0;
 
-	/* open relation using relid, check permissions, get tupdesc */
-	rel = relation_open(relid, AccessShareLock);
-
-	aclresult = pg_class_aclcheck(RelationGetRelid(rel), GetUserId(),
-								  ACL_SELECT);
-	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_CLASS,
-					   RelationGetRelationName(rel));
-
 	tupdesc = rel->rd_att;
 
 	/* Prepare to scan pg_index for entries having indrelid = this rel. */
@@ -1678,7 +1605,7 @@ get_pkey_attnames(Oid relid, int16 *numatts)
 	ScanKeyInit(&skey,
 				Anum_pg_index_indrelid,
 				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(relid));
+				ObjectIdGetDatum(RelationGetRelid(rel)));
 
 	scan = systable_beginscan(indexRelation, IndexIndrelidIndexId, true,
 							  SnapshotNow, 1, &skey);
@@ -1704,7 +1631,6 @@ get_pkey_attnames(Oid relid, int16 *numatts)
 
 	systable_endscan(scan);
 	heap_close(indexRelation, AccessShareLock);
-	relation_close(rel, AccessShareLock);
 
 	return result;
 }
@@ -1770,32 +1696,27 @@ get_text_array_contents(ArrayType *array, int *numitems)
 }
 
 static char *
-get_sql_insert(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals)
+get_sql_insert(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals, char **tgt_pkattvals)
 {
-	Relation	rel;
 	char	   *relname;
 	HeapTuple	tuple;
 	TupleDesc	tupdesc;
 	int			natts;
 	StringInfoData buf;
 	char	   *val;
-	int16		key;
+	int			key;
 	int			i;
 	bool		needComma;
 
 	initStringInfo(&buf);
 
 	/* get relation name including any needed schema prefix and quoting */
-	relname = generate_relation_name(relid);
+	relname = generate_relation_name(rel);
 
-	/*
-	 * Open relation using relid
-	 */
-	rel = relation_open(relid, AccessShareLock);
 	tupdesc = rel->rd_att;
 	natts = tupdesc->natts;
 
-	tuple = get_tuple_of_interest(relid, pkattnums, pknumatts, src_pkattvals);
+	tuple = get_tuple_of_interest(rel, pkattnums, pknumatts, src_pkattvals);
 	if (!tuple)
 		ereport(ERROR,
 				(errcode(ERRCODE_CARDINALITY_VIOLATION),
@@ -1820,7 +1741,7 @@ get_sql_insert(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pka
 	appendStringInfo(&buf, ") VALUES(");
 
 	/*
-	 * remember attvals are 1 based
+	 * Note: i is physical column number (counting from 0).
 	 */
 	needComma = false;
 	for (i = 0; i < natts; i++)
@@ -1831,12 +1752,9 @@ get_sql_insert(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pka
 		if (needComma)
 			appendStringInfo(&buf, ",");
 
-		if (tgt_pkattvals != NULL)
-			key = get_attnum_pk_pos(pkattnums, pknumatts, i + 1);
-		else
-			key = -1;
+		key = get_attnum_pk_pos(pkattnums, pknumatts, i);
 
-		if (key > -1)
+		if (key >= 0)
 			val = tgt_pkattvals[key] ? pstrdup(tgt_pkattvals[key]) : NULL;
 		else
 			val = SPI_getvalue(tuple, tupdesc, i + 1);
@@ -1852,46 +1770,34 @@ get_sql_insert(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pka
 	}
 	appendStringInfo(&buf, ")");
 
-	relation_close(rel, AccessShareLock);
 	return (buf.data);
 }
 
 static char *
-get_sql_delete(Oid relid, int2vector *pkattnums, int16 pknumatts, char **tgt_pkattvals)
+get_sql_delete(Relation rel, int *pkattnums, int pknumatts, char **tgt_pkattvals)
 {
-	Relation	rel;
 	char	   *relname;
 	TupleDesc	tupdesc;
-	int			natts;
 	StringInfoData buf;
 	int			i;
 
 	initStringInfo(&buf);
 
 	/* get relation name including any needed schema prefix and quoting */
-	relname = generate_relation_name(relid);
+	relname = generate_relation_name(rel);
 
-	/*
-	 * Open relation using relid
-	 */
-	rel = relation_open(relid, AccessShareLock);
 	tupdesc = rel->rd_att;
-	natts = tupdesc->natts;
 
 	appendStringInfo(&buf, "DELETE FROM %s WHERE ", relname);
 	for (i = 0; i < pknumatts; i++)
 	{
-		int16		pkattnum = pkattnums->values[i];
+		int			pkattnum = pkattnums[i];
 
 		if (i > 0)
 			appendStringInfo(&buf, " AND ");
 
 		appendStringInfoString(&buf,
-		   quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum - 1]->attname)));
-
-		if (tgt_pkattvals == NULL)
-			/* internal error */
-			elog(ERROR, "target key array must not be NULL");
+			   quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum]->attname)));
 
 		if (tgt_pkattvals[i] != NULL)
 			appendStringInfo(&buf, " = %s",
@@ -1900,37 +1806,31 @@ get_sql_delete(Oid relid, int2vector *pkattnums, int16 pknumatts, char **tgt_pka
 			appendStringInfo(&buf, " IS NULL");
 	}
 
-	relation_close(rel, AccessShareLock);
 	return (buf.data);
 }
 
 static char *
-get_sql_update(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals)
+get_sql_update(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals, char **tgt_pkattvals)
 {
-	Relation	rel;
 	char	   *relname;
 	HeapTuple	tuple;
 	TupleDesc	tupdesc;
 	int			natts;
 	StringInfoData buf;
 	char	   *val;
-	int16		key;
+	int			key;
 	int			i;
 	bool		needComma;
 
 	initStringInfo(&buf);
 
 	/* get relation name including any needed schema prefix and quoting */
-	relname = generate_relation_name(relid);
+	relname = generate_relation_name(rel);
 
-	/*
-	 * Open relation using relid
-	 */
-	rel = relation_open(relid, AccessShareLock);
 	tupdesc = rel->rd_att;
 	natts = tupdesc->natts;
 
-	tuple = get_tuple_of_interest(relid, pkattnums, pknumatts, src_pkattvals);
+	tuple = get_tuple_of_interest(rel, pkattnums, pknumatts, src_pkattvals);
 	if (!tuple)
 		ereport(ERROR,
 				(errcode(ERRCODE_CARDINALITY_VIOLATION),
@@ -1938,6 +1838,9 @@ get_sql_update(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pka
 
 	appendStringInfo(&buf, "UPDATE %s SET ", relname);
 
+	/*
+	 * Note: i is physical column number (counting from 0).
+	 */
 	needComma = false;
 	for (i = 0; i < natts; i++)
 	{
@@ -1950,12 +1853,9 @@ get_sql_update(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pka
 		appendStringInfo(&buf, "%s = ",
 					  quote_ident_cstr(NameStr(tupdesc->attrs[i]->attname)));
 
-		if (tgt_pkattvals != NULL)
-			key = get_attnum_pk_pos(pkattnums, pknumatts, i + 1);
-		else
-			key = -1;
+		key = get_attnum_pk_pos(pkattnums, pknumatts, i);
 
-		if (key > -1)
+		if (key >= 0)
 			val = tgt_pkattvals[key] ? pstrdup(tgt_pkattvals[key]) : NULL;
 		else
 			val = SPI_getvalue(tuple, tupdesc, i + 1);
@@ -1974,29 +1874,22 @@ get_sql_update(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pka
 
 	for (i = 0; i < pknumatts; i++)
 	{
-		int16		pkattnum = pkattnums->values[i];
+		int			pkattnum = pkattnums[i];
 
 		if (i > 0)
 			appendStringInfo(&buf, " AND ");
 
 		appendStringInfo(&buf, "%s",
-		   quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum - 1]->attname)));
+			   quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum]->attname)));
 
-		if (tgt_pkattvals != NULL)
-			val = tgt_pkattvals[i] ? pstrdup(tgt_pkattvals[i]) : NULL;
-		else
-			val = SPI_getvalue(tuple, tupdesc, pkattnum);
+		val = tgt_pkattvals[i];
 
 		if (val != NULL)
-		{
 			appendStringInfo(&buf, " = %s", quote_literal_cstr(val));
-			pfree(val);
-		}
 		else
 			appendStringInfo(&buf, " IS NULL");
 	}
 
-	relation_close(rel, AccessShareLock);
 	return (buf.data);
 }
 
@@ -2038,8 +1931,8 @@ quote_ident_cstr(char *rawstr)
 	return result;
 }
 
-static int16
-get_attnum_pk_pos(int2vector *pkattnums, int16 pknumatts, int16 key)
+static int
+get_attnum_pk_pos(int *pkattnums, int pknumatts, int key)
 {
 	int			i;
 
@@ -2047,35 +1940,23 @@ get_attnum_pk_pos(int2vector *pkattnums, int16 pknumatts, int16 key)
 	 * Not likely a long list anyway, so just scan for the value
 	 */
 	for (i = 0; i < pknumatts; i++)
-		if (key == pkattnums->values[i])
+		if (key == pkattnums[i])
 			return i;
 
 	return -1;
 }
 
 static HeapTuple
-get_tuple_of_interest(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pkattvals)
+get_tuple_of_interest(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals)
 {
-	Relation	rel;
 	char	   *relname;
 	TupleDesc	tupdesc;
+	int			natts;
 	StringInfoData buf;
 	int			ret;
 	HeapTuple	tuple;
 	int			i;
 
-	initStringInfo(&buf);
-
-	/* get relation name including any needed schema prefix and quoting */
-	relname = generate_relation_name(relid);
-
-	/*
-	 * Open relation using relid
-	 */
-	rel = relation_open(relid, AccessShareLock);
-	tupdesc = CreateTupleDescCopy(rel->rd_att);
-	relation_close(rel, AccessShareLock);
-
 	/*
 	 * Connect to SPI manager
 	 */
@@ -2083,21 +1964,46 @@ get_tuple_of_interest(Oid relid, int2vector *pkattnums, int16 pknumatts, char **
 		/* internal error */
 		elog(ERROR, "SPI connect failure - returned %d", ret);
 
+	initStringInfo(&buf);
+
+	/* get relation name including any needed schema prefix and quoting */
+	relname = generate_relation_name(rel);
+
+	tupdesc = rel->rd_att;
+	natts = tupdesc->natts;
+
 	/*
-	 * Build sql statement to look up tuple of interest Use src_pkattvals as
-	 * the criteria.
+	 * Build sql statement to look up tuple of interest, ie, the one matching
+	 * src_pkattvals.  We used to use "SELECT *" here, but it's simpler to
+	 * generate a result tuple that matches the table's physical structure,
+	 * with NULLs for any dropped columns.	Otherwise we have to deal with two
+	 * different tupdescs and everything's very confusing.
 	 */
-	appendStringInfo(&buf, "SELECT * FROM %s WHERE ", relname);
+	appendStringInfoString(&buf, "SELECT ");
+
+	for (i = 0; i < natts; i++)
+	{
+		if (i > 0)
+			appendStringInfoString(&buf, ", ");
+
+		if (tupdesc->attrs[i]->attisdropped)
+			appendStringInfoString(&buf, "NULL");
+		else
+			appendStringInfoString(&buf,
+					  quote_ident_cstr(NameStr(tupdesc->attrs[i]->attname)));
+	}
+
+	appendStringInfo(&buf, " FROM %s WHERE ", relname);
 
 	for (i = 0; i < pknumatts; i++)
 	{
-		int16		pkattnum = pkattnums->values[i];
+		int			pkattnum = pkattnums[i];
 
 		if (i > 0)
 			appendStringInfo(&buf, " AND ");
 
 		appendStringInfoString(&buf,
-		   quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum - 1]->attname)));
+			   quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum]->attname)));
 
 		if (src_pkattvals[i] != NULL)
 			appendStringInfo(&buf, " = %s",
@@ -2145,52 +2051,49 @@ get_tuple_of_interest(Oid relid, int2vector *pkattnums, int16 pknumatts, char **
 	return NULL;
 }
 
-static Oid
-get_relid_from_relname(text *relname_text)
+/*
+ * Open the relation named by relname_text, acquire specified type of lock,
+ * verify we have specified permissions.
+ * Caller must close rel when done with it.
+ */
+static Relation
+get_rel_from_relname(text *relname_text, LOCKMODE lockmode, AclMode aclmode)
 {
 	RangeVar   *relvar;
 	Relation	rel;
-	Oid			relid;
+	AclResult	aclresult;
 
 	relvar = makeRangeVarFromNameList(textToQualifiedNameList(relname_text));
-	rel = heap_openrv(relvar, AccessShareLock);
-	relid = RelationGetRelid(rel);
-	relation_close(rel, AccessShareLock);
+	rel = heap_openrv(relvar, lockmode);
+
+	aclresult = pg_class_aclcheck(RelationGetRelid(rel), GetUserId(),
+								  aclmode);
+	if (aclresult != ACLCHECK_OK)
+		aclcheck_error(aclresult, ACL_KIND_CLASS,
+					   RelationGetRelationName(rel));
 
-	return relid;
+	return rel;
 }
 
 /*
  * generate_relation_name - copied from ruleutils.c
- *		Compute the name to display for a relation specified by OID
+ *		Compute the name to display for a relation
  *
  * The result includes all necessary quoting and schema-prefixing.
  */
 static char *
-generate_relation_name(Oid relid)
+generate_relation_name(Relation rel)
 {
-	HeapTuple	tp;
-	Form_pg_class reltup;
 	char	   *nspname;
 	char	   *result;
 
-	tp = SearchSysCache(RELOID,
-						ObjectIdGetDatum(relid),
-						0, 0, 0);
-	if (!HeapTupleIsValid(tp))
-		elog(ERROR, "cache lookup failed for relation %u", relid);
-
-	reltup = (Form_pg_class) GETSTRUCT(tp);
-
 	/* Qualify the name if not visible in search path */
-	if (RelationIsVisible(relid))
+	if (RelationIsVisible(RelationGetRelid(rel)))
 		nspname = NULL;
 	else
-		nspname = get_namespace_name(reltup->relnamespace);
+		nspname = get_namespace_name(rel->rd_rel->relnamespace);
 
-	result = quote_qualified_identifier(nspname, NameStr(reltup->relname));
-
-	ReleaseSysCache(tp);
+	result = quote_qualified_identifier(nspname, RelationGetRelationName(rel));
 
 	return result;
 }
@@ -2200,13 +2103,13 @@ static remoteConn *
 getConnectionByName(const char *name)
 {
 	remoteConnHashEnt *hentry;
-	char		key[NAMEDATALEN];
+	char	   *key;
 
 	if (!remoteConnHash)
 		remoteConnHash = createConnHash();
 
-	MemSet(key, 0, NAMEDATALEN);
-	snprintf(key, NAMEDATALEN - 1, "%s", name);
+	key = pstrdup(name);
+	truncate_identifier(key, strlen(key), true);
 	hentry = (remoteConnHashEnt *) hash_search(remoteConnHash,
 											   key, HASH_FIND, NULL);
 
@@ -2232,20 +2135,25 @@ createNewConnection(const char *name, remoteConn *rconn)
 {
 	remoteConnHashEnt *hentry;
 	bool		found;
-	char		key[NAMEDATALEN];
+	char	   *key;
 
 	if (!remoteConnHash)
 		remoteConnHash = createConnHash();
 
-	MemSet(key, 0, NAMEDATALEN);
-	snprintf(key, NAMEDATALEN - 1, "%s", name);
+	key = pstrdup(name);
+	truncate_identifier(key, strlen(key), true);
 	hentry = (remoteConnHashEnt *) hash_search(remoteConnHash, key,
 											   HASH_ENTER, &found);
 
 	if (found)
+	{
+		PQfinish(rconn->conn);
+		pfree(rconn);
+
 		ereport(ERROR,
 				(errcode(ERRCODE_DUPLICATE_OBJECT),
 				 errmsg("duplicate connection name")));
+	}
 
 	hentry->rconn = rconn;
 	strlcpy(hentry->name, name, sizeof(hentry->name));
@@ -2256,14 +2164,13 @@ deleteConnection(const char *name)
 {
 	remoteConnHashEnt *hentry;
 	bool		found;
-	char		key[NAMEDATALEN];
+	char	   *key;
 
 	if (!remoteConnHash)
 		remoteConnHash = createConnHash();
 
-	MemSet(key, 0, NAMEDATALEN);
-	snprintf(key, NAMEDATALEN - 1, "%s", name);
-
+	key = pstrdup(name);
+	truncate_identifier(key, strlen(key), true);
 	hentry = (remoteConnHashEnt *) hash_search(remoteConnHash,
 											   key, HASH_REMOVE, &found);
 
@@ -2397,10 +2304,12 @@ get_connect_string(const char *servername)
 	StringInfo	buf = makeStringInfo();
 	ForeignDataWrapper *fdw;
 	AclResult	aclresult;
+	char	   *srvname;
 
 	/* first gather the server connstr options */
-	if (strlen(servername) < NAMEDATALEN)
-		foreign_server = GetForeignServerByName(servername, true);
+	srvname = pstrdup(servername);
+	truncate_identifier(srvname, strlen(srvname), false);
+	foreign_server = GetForeignServerByName(srvname, true);
 
 	if (foreign_server)
 	{
@@ -2467,3 +2376,74 @@ escape_param_str(const char *str)
 
 	return buf->data;
 }
+
+/*
+ * Validate the PK-attnums argument for dblink_build_sql_insert() and related
+ * functions, and translate to the internal representation.
+ *
+ * The user supplies an int2vector of 1-based logical attnums, plus a count
+ * argument (the need for the separate count argument is historical, but we
+ * still check it).  We check that each attnum corresponds to a valid,
+ * non-dropped attribute of the rel.  We do *not* prevent attnums from being
+ * listed twice, though the actual use-case for such things is dubious.
+ * Note that before Postgres 9.0, the user's attnums were interpreted as
+ * physical not logical column numbers; this was changed for future-proofing.
+ *
+ * The internal representation is a palloc'd int array of 0-based physical
+ * attnums.
+ */
+static void
+validate_pkattnums(Relation rel,
+				   int2vector *pkattnums_arg, int32 pknumatts_arg,
+				   int **pkattnums, int *pknumatts)
+{
+	TupleDesc	tupdesc = rel->rd_att;
+	int			natts = tupdesc->natts;
+	int			i;
+
+	/* Don't take more array elements than there are */
+	pknumatts_arg = Min(pknumatts_arg, pkattnums_arg->dim1);
+
+	/* Must have at least one pk attnum selected */
+	if (pknumatts_arg <= 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("number of key attributes must be > 0")));
+
+	/* Allocate output array */
+	*pkattnums = (int *) palloc(pknumatts_arg * sizeof(int));
+	*pknumatts = pknumatts_arg;
+
+	/* Validate attnums and convert to internal form */
+	for (i = 0; i < pknumatts_arg; i++)
+	{
+		int			pkattnum = pkattnums_arg->values[i];
+		int			lnum;
+		int			j;
+
+		/* Can throw error immediately if out of range */
+		if (pkattnum <= 0 || pkattnum > natts)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("invalid attribute number %d", pkattnum)));
+
+		/* Identify which physical column has this logical number */
+		lnum = 0;
+		for (j = 0; j < natts; j++)
+		{
+			/* dropped columns don't count */
+			if (tupdesc->attrs[j]->attisdropped)
+				continue;
+
+			if (++lnum == pkattnum)
+				break;
+		}
+
+		if (j < natts)
+			(*pkattnums)[i] = j;
+		else
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("invalid attribute number %d", pkattnum)));
+	}
+}
diff --git a/contrib/dblink/dblink.h b/contrib/dblink/dblink.h
index 829748d892..1918fdee44 100644
--- a/contrib/dblink/dblink.h
+++ b/contrib/dblink/dblink.h
@@ -8,8 +8,8 @@
  * Darko Prenosil <[email protected]>
  * Shridhar Daithankar <[email protected]>
  *
- * $PostgreSQL: pgsql/contrib/dblink/dblink.h,v 1.22 2009/06/09 17:41:02 tgl Exp $
- * Copyright (c) 2001-2009, PostgreSQL Global Development Group
+ * $PostgreSQL: pgsql/contrib/dblink/dblink.h,v 1.24 2010/01/02 16:57:32 momjian Exp $
+ * Copyright (c) 2001-2010, PostgreSQL Global Development Group
  * ALL RIGHTS RESERVED;
  *
  * Permission to use, copy, modify, and distribute this software and its
@@ -57,5 +57,6 @@ extern Datum dblink_build_sql_insert(PG_FUNCTION_ARGS);
 extern Datum dblink_build_sql_delete(PG_FUNCTION_ARGS);
 extern Datum dblink_build_sql_update(PG_FUNCTION_ARGS);
 extern Datum dblink_current_query(PG_FUNCTION_ARGS);
+extern Datum dblink_get_notify(PG_FUNCTION_ARGS);
 
 #endif   /* DBLINK_H */
diff --git a/contrib/dblink/dblink.sql.in b/contrib/dblink/dblink.sql.in
index e774644dcf..ff656736a4 100644
--- a/contrib/dblink/dblink.sql.in
+++ b/contrib/dblink/dblink.sql.in
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/contrib/dblink/dblink.sql.in,v 1.18 2009/06/09 17:41:02 tgl Exp $ */
+/* $PostgreSQL: pgsql/contrib/dblink/dblink.sql.in,v 1.19 2009/08/05 16:11:07 joe Exp $ */
 
 -- Adjust this setting to control where the objects get created.
 SET search_path = public;
@@ -202,3 +202,22 @@ CREATE OR REPLACE FUNCTION dblink_error_message(text)
 RETURNS text
 AS 'MODULE_PATHNAME', 'dblink_error_message'
 LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION dblink_get_notify(
+    OUT notify_name TEXT,
+    OUT be_pid INT4,
+    OUT extra TEXT
+) 
+RETURNS setof record
+AS 'MODULE_PATHNAME', 'dblink_get_notify'
+LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION dblink_get_notify(
+    conname TEXT,
+    OUT notify_name TEXT,
+    OUT be_pid INT4,
+    OUT extra TEXT
+) 
+RETURNS setof record
+AS 'MODULE_PATHNAME', 'dblink_get_notify'
+LANGUAGE C STRICT;
diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out
index 102444d88c..c59a67c737 100644
--- a/contrib/dblink/expected/dblink.out
+++ b/contrib/dblink/expected/dblink.out
@@ -39,6 +39,9 @@ SELECT dblink_build_sql_insert('foo','1 2',2,'{"0", "a"}','{"99", "xyz"}');
  INSERT INTO foo(f1,f2,f3) VALUES('99','xyz','{a0,b0,c0}')
 (1 row)
 
+-- too many pk fields, should fail
+SELECT dblink_build_sql_insert('foo','1 2 3 4',4,'{"0", "a", "{a0,b0,c0}"}','{"99", "xyz", "{za0,zb0,zc0}"}');
+ERROR:  invalid attribute number 4
 -- build an update statement based on a local tuple,
 -- replacing the primary key values with new ones
 SELECT dblink_build_sql_update('foo','1 2',2,'{"0", "a"}','{"99", "xyz"}');
@@ -47,6 +50,9 @@ SELECT dblink_build_sql_update('foo','1 2',2,'{"0", "a"}','{"99", "xyz"}');
  UPDATE foo SET f1 = '99', f2 = 'xyz', f3 = '{a0,b0,c0}' WHERE f1 = '99' AND f2 = 'xyz'
 (1 row)
 
+-- too many pk fields, should fail
+SELECT dblink_build_sql_update('foo','1 2 3 4',4,'{"0", "a", "{a0,b0,c0}"}','{"99", "xyz", "{za0,zb0,zc0}"}');
+ERROR:  invalid attribute number 4
 -- build a delete statement based on a local tuple,
 SELECT dblink_build_sql_delete('foo','1 2',2,'{"0", "a"}');
            dblink_build_sql_delete           
@@ -54,6 +60,9 @@ SELECT dblink_build_sql_delete('foo','1 2',2,'{"0", "a"}');
  DELETE FROM foo WHERE f1 = '0' AND f2 = 'a'
 (1 row)
 
+-- too many pk fields, should fail
+SELECT dblink_build_sql_delete('foo','1 2 3 4',4,'{"0", "a", "{a0,b0,c0}"}');
+ERROR:  invalid attribute number 4
 -- retest using a quoted and schema qualified table
 CREATE SCHEMA "MySchema";
 CREATE TABLE "MySchema"."Foo"(f1 int, f2 text, f3 text[], primary key (f1,f2));
@@ -827,3 +836,91 @@ DROP USER dblink_regression_test;
 DROP USER MAPPING FOR public SERVER fdtest;
 DROP SERVER fdtest;
 DROP FOREIGN DATA WRAPPER postgresql;
+-- test asynchronous notifications
+SELECT dblink_connect('dbname=contrib_regression');
+ dblink_connect 
+----------------
+ OK
+(1 row)
+
+--should return listen
+SELECT dblink_exec('LISTEN regression');
+ dblink_exec 
+-------------
+ LISTEN
+(1 row)
+
+--should return listen
+SELECT dblink_exec('LISTEN foobar');
+ dblink_exec 
+-------------
+ LISTEN
+(1 row)
+
+SELECT dblink_exec('NOTIFY regression');
+ dblink_exec 
+-------------
+ NOTIFY
+(1 row)
+
+SELECT dblink_exec('NOTIFY foobar');
+ dblink_exec 
+-------------
+ NOTIFY
+(1 row)
+
+SELECT notify_name, be_pid = (select t.be_pid from dblink('select pg_backend_pid()') as t(be_pid int)) AS is_self_notify, extra from dblink_get_notify();
+ notify_name | is_self_notify | extra 
+-------------+----------------+-------
+ regression  | t              | 
+ foobar      | t              | 
+(2 rows)
+
+SELECT * from dblink_get_notify();
+ notify_name | be_pid | extra 
+-------------+--------+-------
+(0 rows)
+
+SELECT dblink_disconnect();
+ dblink_disconnect 
+-------------------
+ OK
+(1 row)
+
+-- test dropped columns in dblink_build_sql_insert, dblink_build_sql_update
+CREATE TEMP TABLE test_dropped
+(
+	col1 INT NOT NULL DEFAULT 111,
+	id SERIAL PRIMARY KEY,
+	col2 INT NOT NULL DEFAULT 112,
+	col2b INT NOT NULL DEFAULT 113
+);
+NOTICE:  CREATE TABLE will create implicit sequence "test_dropped_id_seq" for serial column "test_dropped.id"
+NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "test_dropped_pkey" for table "test_dropped"
+INSERT INTO test_dropped VALUES(default);
+ALTER TABLE test_dropped
+	DROP COLUMN col1,
+	DROP COLUMN col2,
+	ADD COLUMN col3 VARCHAR(10) NOT NULL DEFAULT 'foo',
+	ADD COLUMN col4 INT NOT NULL DEFAULT 42;
+SELECT dblink_build_sql_insert('test_dropped', '1', 1,
+                               ARRAY['1'::TEXT], ARRAY['2'::TEXT]);
+                          dblink_build_sql_insert                          
+---------------------------------------------------------------------------
+ INSERT INTO test_dropped(id,col2b,col3,col4) VALUES('2','113','foo','42')
+(1 row)
+
+SELECT dblink_build_sql_update('test_dropped', '1', 1,
+                               ARRAY['1'::TEXT], ARRAY['2'::TEXT]);
+                                  dblink_build_sql_update                                  
+-------------------------------------------------------------------------------------------
+ UPDATE test_dropped SET id = '2', col2b = '113', col3 = 'foo', col4 = '42' WHERE id = '2'
+(1 row)
+
+SELECT dblink_build_sql_delete('test_dropped', '1', 1,
+                               ARRAY['2'::TEXT]);
+         dblink_build_sql_delete         
+-----------------------------------------
+ DELETE FROM test_dropped WHERE id = '2'
+(1 row)
+
diff --git a/contrib/dblink/sql/dblink.sql b/contrib/dblink/sql/dblink.sql
index a8190c6564..a6d7811bfc 100644
--- a/contrib/dblink/sql/dblink.sql
+++ b/contrib/dblink/sql/dblink.sql
@@ -34,13 +34,19 @@ FROM dblink_get_pkey('foo');
 -- build an insert statement based on a local tuple,
 -- replacing the primary key values with new ones
 SELECT dblink_build_sql_insert('foo','1 2',2,'{"0", "a"}','{"99", "xyz"}');
+-- too many pk fields, should fail
+SELECT dblink_build_sql_insert('foo','1 2 3 4',4,'{"0", "a", "{a0,b0,c0}"}','{"99", "xyz", "{za0,zb0,zc0}"}');
 
 -- build an update statement based on a local tuple,
 -- replacing the primary key values with new ones
 SELECT dblink_build_sql_update('foo','1 2',2,'{"0", "a"}','{"99", "xyz"}');
+-- too many pk fields, should fail
+SELECT dblink_build_sql_update('foo','1 2 3 4',4,'{"0", "a", "{a0,b0,c0}"}','{"99", "xyz", "{za0,zb0,zc0}"}');
 
 -- build a delete statement based on a local tuple,
 SELECT dblink_build_sql_delete('foo','1 2',2,'{"0", "a"}');
+-- too many pk fields, should fail
+SELECT dblink_build_sql_delete('foo','1 2 3 4',4,'{"0", "a", "{a0,b0,c0}"}');
 
 -- retest using a quoted and schema qualified table
 CREATE SCHEMA "MySchema";
@@ -389,3 +395,46 @@ DROP USER dblink_regression_test;
 DROP USER MAPPING FOR public SERVER fdtest;
 DROP SERVER fdtest;
 DROP FOREIGN DATA WRAPPER postgresql;
+
+-- test asynchronous notifications
+SELECT dblink_connect('dbname=contrib_regression');
+
+--should return listen
+SELECT dblink_exec('LISTEN regression');
+--should return listen
+SELECT dblink_exec('LISTEN foobar');
+
+SELECT dblink_exec('NOTIFY regression');
+SELECT dblink_exec('NOTIFY foobar');
+
+SELECT notify_name, be_pid = (select t.be_pid from dblink('select pg_backend_pid()') as t(be_pid int)) AS is_self_notify, extra from dblink_get_notify();
+
+SELECT * from dblink_get_notify();
+
+SELECT dblink_disconnect();
+
+-- test dropped columns in dblink_build_sql_insert, dblink_build_sql_update
+CREATE TEMP TABLE test_dropped
+(
+	col1 INT NOT NULL DEFAULT 111,
+	id SERIAL PRIMARY KEY,
+	col2 INT NOT NULL DEFAULT 112,
+	col2b INT NOT NULL DEFAULT 113
+);
+
+INSERT INTO test_dropped VALUES(default);
+
+ALTER TABLE test_dropped
+	DROP COLUMN col1,
+	DROP COLUMN col2,
+	ADD COLUMN col3 VARCHAR(10) NOT NULL DEFAULT 'foo',
+	ADD COLUMN col4 INT NOT NULL DEFAULT 42;
+
+SELECT dblink_build_sql_insert('test_dropped', '1', 1,
+                               ARRAY['1'::TEXT], ARRAY['2'::TEXT]);
+
+SELECT dblink_build_sql_update('test_dropped', '1', 1,
+                               ARRAY['1'::TEXT], ARRAY['2'::TEXT]);
+
+SELECT dblink_build_sql_delete('test_dropped', '1', 1,
+                               ARRAY['2'::TEXT]);
diff --git a/contrib/dblink/uninstall_dblink.sql b/contrib/dblink/uninstall_dblink.sql
index 522440c595..98478115f1 100644
--- a/contrib/dblink/uninstall_dblink.sql
+++ b/contrib/dblink/uninstall_dblink.sql
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/contrib/dblink/uninstall_dblink.sql,v 1.7 2008/04/05 02:26:14 momjian Exp $ */
+/* $PostgreSQL: pgsql/contrib/dblink/uninstall_dblink.sql,v 1.9 2010/06/07 15:14:36 teodor Exp $ */
 
 -- Adjust this setting to control where the objects get dropped.
 SET search_path = public;
@@ -63,6 +63,10 @@ DROP FUNCTION dblink_connect (text, text);
 
 DROP FUNCTION dblink_connect (text);
 
+DROP FUNCTION dblink_connect_u (text, text);
+
+DROP FUNCTION dblink_connect_u (text);
+
 DROP FUNCTION dblink_cancel_query(text);
 
 DROP FUNCTION dblink_error_message(text);
@@ -76,3 +80,7 @@ DROP FUNCTION dblink_get_result(text, boolean);
 DROP FUNCTION dblink_is_busy(text);
 
 DROP FUNCTION dblink_send_query(text, text);
+
+DROP FUNCTION dblink_get_notify();
+
+DROP FUNCTION dblink_get_notify(text);
diff --git a/contrib/dict_int/dict_int.c b/contrib/dict_int/dict_int.c
index e555cdb893..8e1918613f 100644
--- a/contrib/dict_int/dict_int.c
+++ b/contrib/dict_int/dict_int.c
@@ -3,10 +3,10 @@
  * dict_int.c
  *	  Text search dictionary for integers
  *
- * Copyright (c) 2007-2009, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2010, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/contrib/dict_int/dict_int.c,v 1.5 2009/06/11 14:48:50 momjian Exp $
+ *	  $PostgreSQL: pgsql/contrib/dict_int/dict_int.c,v 1.6 2010/01/02 16:57:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/contrib/dict_xsyn/dict_xsyn.c b/contrib/dict_xsyn/dict_xsyn.c
index 511ef271e3..dc16d9583e 100644
--- a/contrib/dict_xsyn/dict_xsyn.c
+++ b/contrib/dict_xsyn/dict_xsyn.c
@@ -3,10 +3,10 @@
  * dict_xsyn.c
  *	  Extended synonym dictionary
  *
- * Copyright (c) 2007-2009, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2010, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/contrib/dict_xsyn/dict_xsyn.c,v 1.6 2009/01/01 17:23:32 momjian Exp $
+ *	  $PostgreSQL: pgsql/contrib/dict_xsyn/dict_xsyn.c,v 1.9 2010/02/26 02:00:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,7 +33,10 @@ typedef struct
 	int			len;
 	Syn		   *syn;
 
+	bool		matchorig;
 	bool		keeporig;
+	bool		matchsynonyms;
+	bool		keepsynonyms;
 } DictSyn;
 
 
@@ -88,7 +91,8 @@ read_dictionary(DictSyn *d, char *filename)
 	{
 		char	   *value;
 		char	   *key;
-		char	   *end = NULL;
+		char	   *pos;
+		char	   *end;
 
 		if (*line == '\0')
 			continue;
@@ -96,26 +100,36 @@ read_dictionary(DictSyn *d, char *filename)
 		value = lowerstr(line);
 		pfree(line);
 
-		key = find_word(value, &end);
-		if (!key)
+		pos = value;
+		while ((key = find_word(pos, &end)) != NULL)
 		{
-			pfree(value);
-			continue;
-		}
+			/* Enlarge syn structure if full */
+			if (cur == d->len)
+			{
+				d->len = (d->len > 0) ? 2 * d->len : 16;
+				if (d->syn)
+					d->syn = (Syn *) repalloc(d->syn, sizeof(Syn) * d->len);
+				else
+					d->syn = (Syn *) palloc(sizeof(Syn) * d->len);
+			}
 
-		if (cur == d->len)
-		{
-			d->len = (d->len > 0) ? 2 * d->len : 16;
-			if (d->syn)
-				d->syn = (Syn *) repalloc(d->syn, sizeof(Syn) * d->len);
-			else
-				d->syn = (Syn *) palloc(sizeof(Syn) * d->len);
-		}
+			/* Save first word only if we will match it */
+			if (pos != value || d->matchorig)
+			{
+				d->syn[cur].key = pnstrdup(key, end - key);
+				d->syn[cur].value = pstrdup(value);
 
-		d->syn[cur].key = pnstrdup(key, end - key);
-		d->syn[cur].value = value;
+				cur++;
+			}
+
+			pos = end;
 
-		cur++;
+			/* Don't bother scanning synonyms if we will not match them */
+			if (!d->matchsynonyms)
+				break;
+		}
+
+		pfree(value);
 	}
 
 	tsearch_readline_end(&trst);
@@ -133,23 +147,40 @@ dxsyn_init(PG_FUNCTION_ARGS)
 	List	   *dictoptions = (List *) PG_GETARG_POINTER(0);
 	DictSyn    *d;
 	ListCell   *l;
+	char	   *filename = NULL;
 
 	d = (DictSyn *) palloc0(sizeof(DictSyn));
 	d->len = 0;
 	d->syn = NULL;
+	d->matchorig = true;
 	d->keeporig = true;
+	d->matchsynonyms = false;
+	d->keepsynonyms = true;
 
 	foreach(l, dictoptions)
 	{
 		DefElem    *defel = (DefElem *) lfirst(l);
 
-		if (pg_strcasecmp(defel->defname, "KEEPORIG") == 0)
+		if (pg_strcasecmp(defel->defname, "MATCHORIG") == 0)
+		{
+			d->matchorig = defGetBoolean(defel);
+		}
+		else if (pg_strcasecmp(defel->defname, "KEEPORIG") == 0)
 		{
 			d->keeporig = defGetBoolean(defel);
 		}
+		else if (pg_strcasecmp(defel->defname, "MATCHSYNONYMS") == 0)
+		{
+			d->matchsynonyms = defGetBoolean(defel);
+		}
+		else if (pg_strcasecmp(defel->defname, "KEEPSYNONYMS") == 0)
+		{
+			d->keepsynonyms = defGetBoolean(defel);
+		}
 		else if (pg_strcasecmp(defel->defname, "RULES") == 0)
 		{
-			read_dictionary(d, defGetString(defel));
+			/* we can't read the rules before parsing all options! */
+			filename = defGetString(defel);
 		}
 		else
 		{
@@ -160,6 +191,9 @@ dxsyn_init(PG_FUNCTION_ARGS)
 		}
 	}
 
+	if (filename)
+		read_dictionary(d, filename);
+
 	PG_RETURN_POINTER(d);
 }
 
@@ -194,41 +228,33 @@ dxsyn_lexize(PG_FUNCTION_ARGS)
 
 	/* Parse string of synonyms and return array of words */
 	{
-		char	   *value = pstrdup(found->value);
-		int			value_length = strlen(value);
-		char	   *pos = value;
+		char	   *value = found->value;
+		char	   *syn;
+		char	   *pos;
+		char	   *end;
 		int			nsyns = 0;
-		bool		is_first = true;
 
-		res = palloc(0);
+		res = palloc(sizeof(TSLexeme));
 
-		while (pos < value + value_length)
+		pos = value;
+		while ((syn = find_word(pos, &end)) != NULL)
 		{
-			char	   *end;
-			char	   *syn = find_word(pos, &end);
-
-			if (!syn)
-				break;
-			*end = '\0';
-
 			res = repalloc(res, sizeof(TSLexeme) * (nsyns + 2));
-			res[nsyns].lexeme = NULL;
 
-			/* first word is added to result only if KEEPORIG flag is set */
-			if (d->keeporig || !is_first)
+			/* The first word is output only if keeporig=true */
+			if (pos != value || d->keeporig)
 			{
-				res[nsyns].lexeme = pstrdup(syn);
-				res[nsyns + 1].lexeme = NULL;
-
+				res[nsyns].lexeme = pnstrdup(syn, end - syn);
 				nsyns++;
 			}
 
-			is_first = false;
+			pos = end;
 
-			pos = end + 1;
+			/* Stop if we are not to output the synonyms */
+			if (!d->keepsynonyms)
+				break;
 		}
-
-		pfree(value);
+		res[nsyns].lexeme = NULL;
 	}
 
 	PG_RETURN_POINTER(res);
diff --git a/contrib/dict_xsyn/expected/dict_xsyn.out b/contrib/dict_xsyn/expected/dict_xsyn.out
index 99071ea8c7..d91697a97e 100644
--- a/contrib/dict_xsyn/expected/dict_xsyn.out
+++ b/contrib/dict_xsyn/expected/dict_xsyn.out
@@ -5,10 +5,76 @@
 SET client_min_messages = warning;
 \set ECHO none
 RESET client_min_messages;
---configuration
-ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=false);
+-- default configuration - match first word and return it among with all synonyms
+ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=true, MATCHORIG=true, KEEPSYNONYMS=true, MATCHSYNONYMS=false);
 --lexize
 SELECT ts_lexize('xsyn', 'supernova');
+        ts_lexize         
+--------------------------
+ {supernova,sn,sne,1987a}
+(1 row)
+
+SELECT ts_lexize('xsyn', 'sn');
+ ts_lexize 
+-----------
+ 
+(1 row)
+
+SELECT ts_lexize('xsyn', 'grb');
+ ts_lexize 
+-----------
+ 
+(1 row)
+
+-- the same, but return only synonyms
+ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=false, MATCHORIG=true, KEEPSYNONYMS=true, MATCHSYNONYMS=false);
+SELECT ts_lexize('xsyn', 'supernova');
+   ts_lexize    
+----------------
+ {sn,sne,1987a}
+(1 row)
+
+SELECT ts_lexize('xsyn', 'sn');
+ ts_lexize 
+-----------
+ 
+(1 row)
+
+SELECT ts_lexize('xsyn', 'grb');
+ ts_lexize 
+-----------
+ 
+(1 row)
+
+-- match any word and return all words
+ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=true, MATCHORIG=true, KEEPSYNONYMS=true, MATCHSYNONYMS=true);
+SELECT ts_lexize('xsyn', 'supernova');
+        ts_lexize         
+--------------------------
+ {supernova,sn,sne,1987a}
+(1 row)
+
+SELECT ts_lexize('xsyn', 'sn');
+        ts_lexize         
+--------------------------
+ {supernova,sn,sne,1987a}
+(1 row)
+
+SELECT ts_lexize('xsyn', 'grb');
+ ts_lexize 
+-----------
+ 
+(1 row)
+
+-- match any word and return all words except first one
+ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=false, MATCHORIG=true, KEEPSYNONYMS=true, MATCHSYNONYMS=true);
+SELECT ts_lexize('xsyn', 'supernova');
+   ts_lexize    
+----------------
+ {sn,sne,1987a}
+(1 row)
+
+SELECT ts_lexize('xsyn', 'sn');
    ts_lexize    
 ----------------
  {sn,sne,1987a}
@@ -20,3 +86,63 @@ SELECT ts_lexize('xsyn', 'grb');
  
 (1 row)
 
+-- match any synonym but not first word, and return first word instead
+ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=true, MATCHORIG=false, KEEPSYNONYMS=false, MATCHSYNONYMS=true);
+SELECT ts_lexize('xsyn', 'supernova');
+ ts_lexize 
+-----------
+ 
+(1 row)
+
+SELECT ts_lexize('xsyn', 'sn');
+  ts_lexize  
+-------------
+ {supernova}
+(1 row)
+
+SELECT ts_lexize('xsyn', 'grb');
+ ts_lexize 
+-----------
+ 
+(1 row)
+
+-- do not match or return anything
+ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=false, MATCHORIG=false, KEEPSYNONYMS=false, MATCHSYNONYMS=false);
+SELECT ts_lexize('xsyn', 'supernova');
+ ts_lexize 
+-----------
+ 
+(1 row)
+
+SELECT ts_lexize('xsyn', 'sn');
+ ts_lexize 
+-----------
+ 
+(1 row)
+
+SELECT ts_lexize('xsyn', 'grb');
+ ts_lexize 
+-----------
+ 
+(1 row)
+
+-- match any word but return nothing
+ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=false, MATCHORIG=true, KEEPSYNONYMS=false, MATCHSYNONYMS=true);
+SELECT ts_lexize('xsyn', 'supernova');
+ ts_lexize 
+-----------
+ {}
+(1 row)
+
+SELECT ts_lexize('xsyn', 'sn');
+ ts_lexize 
+-----------
+ {}
+(1 row)
+
+SELECT ts_lexize('xsyn', 'grb');
+ ts_lexize 
+-----------
+ 
+(1 row)
+
diff --git a/contrib/dict_xsyn/sql/dict_xsyn.sql b/contrib/dict_xsyn/sql/dict_xsyn.sql
index 17f6df9cf3..9db0851700 100644
--- a/contrib/dict_xsyn/sql/dict_xsyn.sql
+++ b/contrib/dict_xsyn/sql/dict_xsyn.sql
@@ -8,9 +8,46 @@ SET client_min_messages = warning;
 \set ECHO all
 RESET client_min_messages;
 
---configuration
-ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=false);
+-- default configuration - match first word and return it among with all synonyms
+ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=true, MATCHORIG=true, KEEPSYNONYMS=true, MATCHSYNONYMS=false);
 
 --lexize
 SELECT ts_lexize('xsyn', 'supernova');
+SELECT ts_lexize('xsyn', 'sn');
+SELECT ts_lexize('xsyn', 'grb');
+
+-- the same, but return only synonyms
+ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=false, MATCHORIG=true, KEEPSYNONYMS=true, MATCHSYNONYMS=false);
+SELECT ts_lexize('xsyn', 'supernova');
+SELECT ts_lexize('xsyn', 'sn');
+SELECT ts_lexize('xsyn', 'grb');
+
+-- match any word and return all words
+ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=true, MATCHORIG=true, KEEPSYNONYMS=true, MATCHSYNONYMS=true);
+SELECT ts_lexize('xsyn', 'supernova');
+SELECT ts_lexize('xsyn', 'sn');
+SELECT ts_lexize('xsyn', 'grb');
+
+-- match any word and return all words except first one
+ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=false, MATCHORIG=true, KEEPSYNONYMS=true, MATCHSYNONYMS=true);
+SELECT ts_lexize('xsyn', 'supernova');
+SELECT ts_lexize('xsyn', 'sn');
+SELECT ts_lexize('xsyn', 'grb');
+
+-- match any synonym but not first word, and return first word instead
+ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=true, MATCHORIG=false, KEEPSYNONYMS=false, MATCHSYNONYMS=true);
+SELECT ts_lexize('xsyn', 'supernova');
+SELECT ts_lexize('xsyn', 'sn');
+SELECT ts_lexize('xsyn', 'grb');
+
+-- do not match or return anything
+ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=false, MATCHORIG=false, KEEPSYNONYMS=false, MATCHSYNONYMS=false);
+SELECT ts_lexize('xsyn', 'supernova');
+SELECT ts_lexize('xsyn', 'sn');
+SELECT ts_lexize('xsyn', 'grb');
+
+-- match any word but return nothing
+ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=false, MATCHORIG=true, KEEPSYNONYMS=false, MATCHSYNONYMS=true);
+SELECT ts_lexize('xsyn', 'supernova');
+SELECT ts_lexize('xsyn', 'sn');
 SELECT ts_lexize('xsyn', 'grb');
diff --git a/contrib/earthdistance/Makefile b/contrib/earthdistance/Makefile
index 64cc40fedc..ab72ac7fc9 100644
--- a/contrib/earthdistance/Makefile
+++ b/contrib/earthdistance/Makefile
@@ -1,11 +1,11 @@
-# $PostgreSQL: pgsql/contrib/earthdistance/Makefile,v 1.19 2007/11/10 23:59:50 momjian Exp $
+# $PostgreSQL: pgsql/contrib/earthdistance/Makefile,v 1.20 2010/07/05 23:15:55 tgl Exp $
 
 MODULES = earthdistance
 DATA_built = earthdistance.sql
 DATA = uninstall_earthdistance.sql
 REGRESS = earthdistance
 
-SHLIB_LINK += $(filter -lm, $(LIBS))
+LDFLAGS_SL += $(filter -lm, $(LIBS))
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/fuzzystrmatch/dmetaphone.c b/contrib/fuzzystrmatch/dmetaphone.c
index 113acb566a..f23a3a2aa6 100644
--- a/contrib/fuzzystrmatch/dmetaphone.c
+++ b/contrib/fuzzystrmatch/dmetaphone.c
@@ -1,7 +1,7 @@
 /*
  * This is a port of the Double Metaphone algorithm for use in PostgreSQL.
  *
- * $PostgreSQL: pgsql/contrib/fuzzystrmatch/dmetaphone.c,v 1.13 2009/06/11 14:48:51 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/fuzzystrmatch/dmetaphone.c,v 1.15 2010/07/06 19:18:55 momjian Exp $
  *
  * Double Metaphone computes 2 "sounds like" strings - a primary and an
  * alternate. In most cases they are the same, but for foreign names
@@ -461,7 +461,7 @@ DoubleMetaphone(char *str, char **codes)
 					current += 1;
 				break;
 
-			case '�':
+			case '\xc7':		/* C with cedilla */
 				MetaphAdd(primary, "S");
 				MetaphAdd(secondary, "S");
 				current += 1;
@@ -1037,7 +1037,7 @@ DoubleMetaphone(char *str, char **codes)
 				MetaphAdd(secondary, "N");
 				break;
 
-			case '�':
+			case '\xd1':		/* N with tilde */
 				current += 1;
 				MetaphAdd(primary, "N");
 				MetaphAdd(secondary, "N");
diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.c b/contrib/fuzzystrmatch/fuzzystrmatch.c
index b3def054a9..0bf7c681a1 100644
--- a/contrib/fuzzystrmatch/fuzzystrmatch.c
+++ b/contrib/fuzzystrmatch/fuzzystrmatch.c
@@ -5,8 +5,8 @@
  *
  * Joe Conway <[email protected]>
  *
- * $PostgreSQL: pgsql/contrib/fuzzystrmatch/fuzzystrmatch.c,v 1.30 2009/06/11 14:48:51 momjian Exp $
- * Copyright (c) 2001-2009, PostgreSQL Global Development Group
+ * $PostgreSQL: pgsql/contrib/fuzzystrmatch/fuzzystrmatch.c,v 1.32 2010/01/02 16:57:32 momjian Exp $
+ * Copyright (c) 2001-2010, PostgreSQL Global Development Group
  * ALL RIGHTS RESERVED;
  *
  * levenshtein()
@@ -207,13 +207,13 @@ levenshtein_internal(const char *s, const char *t,
 	n = strlen(t);
 
 	/*
-	 * If either m or n is 0, the answer is the other value. This makes sense
-	 * since it would take that many insertions to build a matching string
+	 * We can transform an empty s into t with n insertions, or a non-empty t
+	 * into an empty s with m deletions.
 	 */
 	if (!m)
-		return n;
+		return n * ins_c;
 	if (!n)
-		return m;
+		return m * del_c;
 
 	/*
 	 * For security concerns, restrict excessive CPU+RAM usage. (This
@@ -241,7 +241,7 @@ levenshtein_internal(const char *s, const char *t,
 
 	/* Initialize the "previous" row to 0..cols */
 	for (i = 0; i < m; i++)
-		prev[i] = i;
+		prev[i] = i * del_c;
 
 	/* Loop through rows of the notional array */
 	for (y = t, j = 1; j < n; y++, j++)
@@ -252,7 +252,7 @@ levenshtein_internal(const char *s, const char *t,
 		 * First cell must increment sequentially, as we're on the j'th row of
 		 * the (m+1)x(n+1) array.
 		 */
-		curr[0] = j;
+		curr[0] = j * ins_c;
 
 		for (x = s, i = 1; i < m; x++, i++)
 		{
diff --git a/contrib/hstore/Makefile b/contrib/hstore/Makefile
index adb014d0d1..bb69d70805 100644
--- a/contrib/hstore/Makefile
+++ b/contrib/hstore/Makefile
@@ -1,11 +1,12 @@
-# $PostgreSQL: pgsql/contrib/hstore/Makefile,v 1.6 2007/11/10 23:59:51 momjian Exp $
+# $PostgreSQL: pgsql/contrib/hstore/Makefile,v 1.7 2009/09/30 19:50:22 tgl Exp $
 
 subdir = contrib/hstore
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
 MODULE_big = hstore
-OBJS = hstore_io.o hstore_op.o hstore_gist.o hstore_gin.o crc32.o
+OBJS = hstore_io.o hstore_op.o hstore_gist.o hstore_gin.o hstore_compat.o \
+	crc32.o
 
 DATA_built = hstore.sql
 DATA = uninstall_hstore.sql
diff --git a/contrib/hstore/expected/hstore.out b/contrib/hstore/expected/hstore.out
index eee23d3a05..e78264d12b 100644
--- a/contrib/hstore/expected/hstore.out
+++ b/contrib/hstore/expected/hstore.out
@@ -4,6 +4,8 @@
 --
 SET client_min_messages = warning;
 \set ECHO none
+psql:hstore.sql:228: WARNING:  => is deprecated as an operator name
+DETAIL:  This name may be disallowed altogether in future versions of PostgreSQL.
 RESET client_min_messages;
 set escape_string_warning=off;
 --hstore;
@@ -278,6 +280,31 @@ select ('aa=>"NULL", c=>d , b=>16'::hstore->'aa') is null;
  f
 (1 row)
 
+-- -> array operator
+select 'aa=>"NULL", c=>d , b=>16'::hstore -> ARRAY['aa','c'];
+  ?column?  
+------------
+ {"NULL",d}
+(1 row)
+
+select 'aa=>"NULL", c=>d , b=>16'::hstore -> ARRAY['c','aa'];
+  ?column?  
+------------
+ {d,"NULL"}
+(1 row)
+
+select 'aa=>NULL, c=>d , b=>16'::hstore -> ARRAY['aa','c',null];
+   ?column?    
+---------------
+ {NULL,d,NULL}
+(1 row)
+
+select 'aa=>1, c=>3, b=>2, d=>4'::hstore -> ARRAY[['b','d'],['aa','c']];
+   ?column?    
+---------------
+ {{2,4},{1,3}}
+(1 row)
+
 -- exists/defined
 select exist('a=>NULL, b=>qq', 'a');
  exist 
@@ -327,6 +354,90 @@ select defined('a=>"NULL", b=>qq', 'a');
  t
 (1 row)
 
+select hstore 'a=>NULL, b=>qq' ? 'a';
+ ?column? 
+----------
+ t
+(1 row)
+
+select hstore 'a=>NULL, b=>qq' ? 'b';
+ ?column? 
+----------
+ t
+(1 row)
+
+select hstore 'a=>NULL, b=>qq' ? 'c';
+ ?column? 
+----------
+ f
+(1 row)
+
+select hstore 'a=>"NULL", b=>qq' ? 'a';
+ ?column? 
+----------
+ t
+(1 row)
+
+select hstore 'a=>NULL, b=>qq' ?| ARRAY['a','b'];
+ ?column? 
+----------
+ t
+(1 row)
+
+select hstore 'a=>NULL, b=>qq' ?| ARRAY['b','a'];
+ ?column? 
+----------
+ t
+(1 row)
+
+select hstore 'a=>NULL, b=>qq' ?| ARRAY['c','a'];
+ ?column? 
+----------
+ t
+(1 row)
+
+select hstore 'a=>NULL, b=>qq' ?| ARRAY['c','d'];
+ ?column? 
+----------
+ f
+(1 row)
+
+select hstore 'a=>NULL, b=>qq' ?| '{}'::text[];
+ ?column? 
+----------
+ f
+(1 row)
+
+select hstore 'a=>NULL, b=>qq' ?& ARRAY['a','b'];
+ ?column? 
+----------
+ t
+(1 row)
+
+select hstore 'a=>NULL, b=>qq' ?& ARRAY['b','a'];
+ ?column? 
+----------
+ t
+(1 row)
+
+select hstore 'a=>NULL, b=>qq' ?& ARRAY['c','a'];
+ ?column? 
+----------
+ f
+(1 row)
+
+select hstore 'a=>NULL, b=>qq' ?& ARRAY['c','d'];
+ ?column? 
+----------
+ f
+(1 row)
+
+select hstore 'a=>NULL, b=>qq' ?& '{}'::text[];
+ ?column? 
+----------
+ f
+(1 row)
+
 -- delete 
 select delete('a=>1 , b=>2, c=>3'::hstore, 'a');
        delete       
@@ -358,6 +469,193 @@ select delete('a=>1 , b=>2, c=>3'::hstore, 'd');
  "a"=>"1", "b"=>"2", "c"=>"3"
 (1 row)
 
+select 'a=>1 , b=>2, c=>3'::hstore - 'a'::text;
+      ?column?      
+--------------------
+ "b"=>"2", "c"=>"3"
+(1 row)
+
+select 'a=>null , b=>2, c=>3'::hstore - 'a'::text;
+      ?column?      
+--------------------
+ "b"=>"2", "c"=>"3"
+(1 row)
+
+select 'a=>1 , b=>2, c=>3'::hstore - 'b'::text;
+      ?column?      
+--------------------
+ "a"=>"1", "c"=>"3"
+(1 row)
+
+select 'a=>1 , b=>2, c=>3'::hstore - 'c'::text;
+      ?column?      
+--------------------
+ "a"=>"1", "b"=>"2"
+(1 row)
+
+select 'a=>1 , b=>2, c=>3'::hstore - 'd'::text;
+           ?column?           
+------------------------------
+ "a"=>"1", "b"=>"2", "c"=>"3"
+(1 row)
+
+select pg_column_size('a=>1 , b=>2, c=>3'::hstore - 'b'::text)
+         = pg_column_size('a=>1, b=>2'::hstore);
+ ?column? 
+----------
+ t
+(1 row)
+
+-- delete (array)
+select delete('a=>1 , b=>2, c=>3'::hstore, ARRAY['d','e']);
+            delete            
+------------------------------
+ "a"=>"1", "b"=>"2", "c"=>"3"
+(1 row)
+
+select delete('a=>1 , b=>2, c=>3'::hstore, ARRAY['d','b']);
+       delete       
+--------------------
+ "a"=>"1", "c"=>"3"
+(1 row)
+
+select delete('a=>1 , b=>2, c=>3'::hstore, ARRAY['a','c']);
+  delete  
+----------
+ "b"=>"2"
+(1 row)
+
+select delete('a=>1 , b=>2, c=>3'::hstore, ARRAY[['b'],['c'],['a']]);
+ delete 
+--------
+ 
+(1 row)
+
+select delete('a=>1 , b=>2, c=>3'::hstore, '{}'::text[]);
+            delete            
+------------------------------
+ "a"=>"1", "b"=>"2", "c"=>"3"
+(1 row)
+
+select 'a=>1 , b=>2, c=>3'::hstore - ARRAY['d','e'];
+           ?column?           
+------------------------------
+ "a"=>"1", "b"=>"2", "c"=>"3"
+(1 row)
+
+select 'a=>1 , b=>2, c=>3'::hstore - ARRAY['d','b'];
+      ?column?      
+--------------------
+ "a"=>"1", "c"=>"3"
+(1 row)
+
+select 'a=>1 , b=>2, c=>3'::hstore - ARRAY['a','c'];
+ ?column? 
+----------
+ "b"=>"2"
+(1 row)
+
+select 'a=>1 , b=>2, c=>3'::hstore - ARRAY[['b'],['c'],['a']];
+ ?column? 
+----------
+ 
+(1 row)
+
+select 'a=>1 , b=>2, c=>3'::hstore - '{}'::text[];
+           ?column?           
+------------------------------
+ "a"=>"1", "b"=>"2", "c"=>"3"
+(1 row)
+
+select pg_column_size('a=>1 , b=>2, c=>3'::hstore - ARRAY['a','c'])
+         = pg_column_size('b=>2'::hstore);
+ ?column? 
+----------
+ t
+(1 row)
+
+select pg_column_size('a=>1 , b=>2, c=>3'::hstore - '{}'::text[])
+         = pg_column_size('a=>1, b=>2, c=>3'::hstore);
+ ?column? 
+----------
+ t
+(1 row)
+
+-- delete (hstore)
+select delete('aa=>1 , b=>2, c=>3'::hstore, 'aa=>4, b=>2'::hstore);
+       delete        
+---------------------
+ "c"=>"3", "aa"=>"1"
+(1 row)
+
+select delete('aa=>1 , b=>2, c=>3'::hstore, 'aa=>NULL, c=>3'::hstore);
+       delete        
+---------------------
+ "b"=>"2", "aa"=>"1"
+(1 row)
+
+select delete('aa=>1 , b=>2, c=>3'::hstore, 'aa=>1, b=>2, c=>3'::hstore);
+ delete 
+--------
+ 
+(1 row)
+
+select delete('aa=>1 , b=>2, c=>3'::hstore, 'b=>2'::hstore);
+       delete        
+---------------------
+ "c"=>"3", "aa"=>"1"
+(1 row)
+
+select delete('aa=>1 , b=>2, c=>3'::hstore, ''::hstore);
+            delete             
+-------------------------------
+ "b"=>"2", "c"=>"3", "aa"=>"1"
+(1 row)
+
+select 'aa=>1 , b=>2, c=>3'::hstore - 'aa=>4, b=>2'::hstore;
+      ?column?       
+---------------------
+ "c"=>"3", "aa"=>"1"
+(1 row)
+
+select 'aa=>1 , b=>2, c=>3'::hstore - 'aa=>NULL, c=>3'::hstore;
+      ?column?       
+---------------------
+ "b"=>"2", "aa"=>"1"
+(1 row)
+
+select 'aa=>1 , b=>2, c=>3'::hstore - 'aa=>1, b=>2, c=>3'::hstore;
+ ?column? 
+----------
+ 
+(1 row)
+
+select 'aa=>1 , b=>2, c=>3'::hstore - 'b=>2'::hstore;
+      ?column?       
+---------------------
+ "c"=>"3", "aa"=>"1"
+(1 row)
+
+select 'aa=>1 , b=>2, c=>3'::hstore - ''::hstore;
+           ?column?            
+-------------------------------
+ "b"=>"2", "c"=>"3", "aa"=>"1"
+(1 row)
+
+select pg_column_size('a=>1 , b=>2, c=>3'::hstore - 'b=>2'::hstore)
+         = pg_column_size('a=>1, c=>3'::hstore);
+ ?column? 
+----------
+ t
+(1 row)
+
+select pg_column_size('a=>1 , b=>2, c=>3'::hstore - ''::hstore)
+         = pg_column_size('a=>1, b=>2, c=>3'::hstore);
+ ?column? 
+----------
+ t
+(1 row)
+
 -- ||
 select 'aa=>1 , b=>2, cq=>3'::hstore || 'cq=>l, b=>g, fg=>f';
                  ?column?                  
@@ -389,6 +687,33 @@ select ''::hstore || 'cq=>l, b=>g, fg=>f';
  "b"=>"g", "cq"=>"l", "fg"=>"f"
 (1 row)
 
+select pg_column_size(''::hstore || ''::hstore) = pg_column_size(''::hstore);
+ ?column? 
+----------
+ t
+(1 row)
+
+select pg_column_size('aa=>1'::hstore || 'b=>2'::hstore)
+         = pg_column_size('aa=>1, b=>2'::hstore);
+ ?column? 
+----------
+ t
+(1 row)
+
+select pg_column_size('aa=>1, b=>2'::hstore || ''::hstore)
+         = pg_column_size('aa=>1, b=>2'::hstore);
+ ?column? 
+----------
+ t
+(1 row)
+
+select pg_column_size(''::hstore || 'aa=>1, b=>2'::hstore)
+         = pg_column_size('aa=>1, b=>2'::hstore);
+ ?column? 
+----------
+ t
+(1 row)
+
 -- =>
 select 'a=>g, b=>c'::hstore || ( 'asd'=>'gf' );
             ?column?             
@@ -414,6 +739,368 @@ select 'a=>g, b=>c'::hstore || ( 'b'=>NULL );
  "a"=>"g", "b"=>NULL
 (1 row)
 
+select ('a=>g, b=>c'::hstore || ( NULL=>'b' )) is null;
+ ?column? 
+----------
+ t
+(1 row)
+
+select pg_column_size(('b'=>'gf'))
+         = pg_column_size('b=>gf'::hstore);
+ ?column? 
+----------
+ t
+(1 row)
+
+select pg_column_size('a=>g, b=>c'::hstore || ('b'=>'gf'))
+         = pg_column_size('a=>g, b=>gf'::hstore);
+ ?column? 
+----------
+ t
+(1 row)
+
+-- slice()
+select slice(hstore 'aa=>1, b=>2, c=>3', ARRAY['g','h','i']);
+ slice 
+-------
+ 
+(1 row)
+
+select slice(hstore 'aa=>1, b=>2, c=>3', ARRAY['c','b']);
+       slice        
+--------------------
+ "b"=>"2", "c"=>"3"
+(1 row)
+
+select slice(hstore 'aa=>1, b=>2, c=>3', ARRAY['aa','b']);
+        slice        
+---------------------
+ "b"=>"2", "aa"=>"1"
+(1 row)
+
+select slice(hstore 'aa=>1, b=>2, c=>3', ARRAY['c','b','aa']);
+             slice             
+-------------------------------
+ "b"=>"2", "c"=>"3", "aa"=>"1"
+(1 row)
+
+select pg_column_size(slice(hstore 'aa=>1, b=>2, c=>3', ARRAY['c','b']))
+         = pg_column_size('b=>2, c=>3'::hstore);
+ ?column? 
+----------
+ t
+(1 row)
+
+select pg_column_size(slice(hstore 'aa=>1, b=>2, c=>3', ARRAY['c','b','aa']))
+         = pg_column_size('aa=>1, b=>2, c=>3'::hstore);
+ ?column? 
+----------
+ t
+(1 row)
+
+-- array input
+select '{}'::text[]::hstore;
+ hstore 
+--------
+ 
+(1 row)
+
+select ARRAY['a','g','b','h','asd']::hstore;
+ERROR:  array must have even number of elements
+select ARRAY['a','g','b','h','asd','i']::hstore;
+             array              
+--------------------------------
+ "a"=>"g", "b"=>"h", "asd"=>"i"
+(1 row)
+
+select ARRAY[['a','g'],['b','h'],['asd','i']]::hstore;
+             array              
+--------------------------------
+ "a"=>"g", "b"=>"h", "asd"=>"i"
+(1 row)
+
+select ARRAY[['a','g','b'],['h','asd','i']]::hstore;
+ERROR:  array must have two columns
+select ARRAY[[['a','g'],['b','h'],['asd','i']]]::hstore;
+ERROR:  wrong number of array subscripts
+select hstore('{}'::text[]);
+ hstore 
+--------
+ 
+(1 row)
+
+select hstore(ARRAY['a','g','b','h','asd']);
+ERROR:  array must have even number of elements
+select hstore(ARRAY['a','g','b','h','asd','i']);
+             hstore             
+--------------------------------
+ "a"=>"g", "b"=>"h", "asd"=>"i"
+(1 row)
+
+select hstore(ARRAY[['a','g'],['b','h'],['asd','i']]);
+             hstore             
+--------------------------------
+ "a"=>"g", "b"=>"h", "asd"=>"i"
+(1 row)
+
+select hstore(ARRAY[['a','g','b'],['h','asd','i']]);
+ERROR:  array must have two columns
+select hstore(ARRAY[[['a','g'],['b','h'],['asd','i']]]);
+ERROR:  wrong number of array subscripts
+select hstore('[0:5]={a,g,b,h,asd,i}'::text[]);
+             hstore             
+--------------------------------
+ "a"=>"g", "b"=>"h", "asd"=>"i"
+(1 row)
+
+select hstore('[0:2][1:2]={{a,g},{b,h},{asd,i}}'::text[]);
+             hstore             
+--------------------------------
+ "a"=>"g", "b"=>"h", "asd"=>"i"
+(1 row)
+
+-- pairs of arrays
+select hstore(ARRAY['a','b','asd'], ARRAY['g','h','i']);
+             hstore             
+--------------------------------
+ "a"=>"g", "b"=>"h", "asd"=>"i"
+(1 row)
+
+select hstore(ARRAY['a','b','asd'], ARRAY['g','h',NULL]);
+             hstore              
+---------------------------------
+ "a"=>"g", "b"=>"h", "asd"=>NULL
+(1 row)
+
+select hstore(ARRAY['z','y','x'], ARRAY['1','2','3']);
+            hstore            
+------------------------------
+ "x"=>"3", "y"=>"2", "z"=>"1"
+(1 row)
+
+select hstore(ARRAY['aaa','bb','c','d'], ARRAY[null::text,null,null,null]);
+                    hstore                     
+-----------------------------------------------
+ "c"=>NULL, "d"=>NULL, "bb"=>NULL, "aaa"=>NULL
+(1 row)
+
+select hstore(ARRAY['aaa','bb','c','d'], null);
+                    hstore                     
+-----------------------------------------------
+ "c"=>NULL, "d"=>NULL, "bb"=>NULL, "aaa"=>NULL
+(1 row)
+
+select quote_literal(hstore('{}'::text[], '{}'::text[]));
+ quote_literal 
+---------------
+ ''
+(1 row)
+
+select quote_literal(hstore('{}'::text[], null));
+ quote_literal 
+---------------
+ ''
+(1 row)
+
+select hstore(ARRAY['a'], '{}'::text[]);  -- error
+ERROR:  arrays must have same bounds
+select hstore('{}'::text[], ARRAY['a']);  -- error
+ERROR:  arrays must have same bounds
+select pg_column_size(hstore(ARRAY['a','b','asd'], ARRAY['g','h','i']))
+         = pg_column_size('a=>g, b=>h, asd=>i'::hstore);
+ ?column? 
+----------
+ t
+(1 row)
+
+-- records
+select hstore(v) from (values (1, 'foo', 1.2, 3::float8)) v(a,b,c,d);
+                     hstore                     
+------------------------------------------------
+ "f1"=>"1", "f2"=>"foo", "f3"=>"1.2", "f4"=>"3"
+(1 row)
+
+create domain hstestdom1 as integer not null default 0;
+create table testhstore0 (a integer, b text, c numeric, d float8);
+create table testhstore1 (a integer, b text, c numeric, d float8, e hstestdom1);
+insert into testhstore0 values (1, 'foo', 1.2, 3::float8);
+insert into testhstore1 values (1, 'foo', 1.2, 3::float8);
+select hstore(v) from testhstore1 v;
+                        hstore                        
+------------------------------------------------------
+ "a"=>"1", "b"=>"foo", "c"=>"1.2", "d"=>"3", "e"=>"0"
+(1 row)
+
+select hstore(null::testhstore0);
+                   hstore                   
+--------------------------------------------
+ "a"=>NULL, "b"=>NULL, "c"=>NULL, "d"=>NULL
+(1 row)
+
+select hstore(null::testhstore1);
+                        hstore                         
+-------------------------------------------------------
+ "a"=>NULL, "b"=>NULL, "c"=>NULL, "d"=>NULL, "e"=>NULL
+(1 row)
+
+select pg_column_size(hstore(v))
+         = pg_column_size('a=>1, b=>"foo", c=>"1.2", d=>"3", e=>"0"'::hstore)
+  from testhstore1 v;
+ ?column? 
+----------
+ t
+(1 row)
+
+select populate_record(v, ('c' => '3.45')) from testhstore1 v;
+ populate_record  
+------------------
+ (1,foo,3.45,3,0)
+(1 row)
+
+select populate_record(v, ('d' => '3.45')) from testhstore1 v;
+  populate_record   
+--------------------
+ (1,foo,1.2,3.45,0)
+(1 row)
+
+select populate_record(v, ('e' => '123')) from testhstore1 v;
+  populate_record  
+-------------------
+ (1,foo,1.2,3,123)
+(1 row)
+
+select populate_record(v, ('e' => null)) from testhstore1 v;
+ERROR:  domain hstestdom1 does not allow null values
+select populate_record(v, ('c' => null)) from testhstore1 v;
+ populate_record 
+-----------------
+ (1,foo,,3,0)
+(1 row)
+
+select populate_record(v, ('b' => 'foo') || ('a' => '123')) from testhstore1 v;
+  populate_record  
+-------------------
+ (123,foo,1.2,3,0)
+(1 row)
+
+select populate_record(v, ('b' => 'foo') || ('e' => null)) from testhstore0 v;
+ populate_record 
+-----------------
+ (1,foo,1.2,3)
+(1 row)
+
+select populate_record(v, ('b' => 'foo') || ('e' => null)) from testhstore1 v;
+ERROR:  domain hstestdom1 does not allow null values
+select populate_record(v, '') from testhstore0 v;
+ populate_record 
+-----------------
+ (1,foo,1.2,3)
+(1 row)
+
+select populate_record(v, '') from testhstore1 v;
+ populate_record 
+-----------------
+ (1,foo,1.2,3,0)
+(1 row)
+
+select populate_record(null::testhstore1, ('c' => '3.45') || ('a' => '123'));
+ERROR:  domain hstestdom1 does not allow null values
+select populate_record(null::testhstore1, ('c' => '3.45') || ('e' => '123'));
+ populate_record 
+-----------------
+ (,,3.45,,123)
+(1 row)
+
+select populate_record(null::testhstore0, '');
+ populate_record 
+-----------------
+ (,,,)
+(1 row)
+
+select populate_record(null::testhstore1, '');
+ERROR:  domain hstestdom1 does not allow null values
+select v #= ('c' => '3.45') from testhstore1 v;
+     ?column?     
+------------------
+ (1,foo,3.45,3,0)
+(1 row)
+
+select v #= ('d' => '3.45') from testhstore1 v;
+      ?column?      
+--------------------
+ (1,foo,1.2,3.45,0)
+(1 row)
+
+select v #= ('e' => '123') from testhstore1 v;
+     ?column?      
+-------------------
+ (1,foo,1.2,3,123)
+(1 row)
+
+select v #= ('c' => null) from testhstore1 v;
+   ?column?   
+--------------
+ (1,foo,,3,0)
+(1 row)
+
+select v #= ('e' => null) from testhstore0 v;
+   ?column?    
+---------------
+ (1,foo,1.2,3)
+(1 row)
+
+select v #= ('e' => null) from testhstore1 v;
+ERROR:  domain hstestdom1 does not allow null values
+select v #= (('b' => 'foo') || ('a' => '123')) from testhstore1 v;
+     ?column?      
+-------------------
+ (123,foo,1.2,3,0)
+(1 row)
+
+select v #= (('b' => 'foo') || ('e' => '123')) from testhstore1 v;
+     ?column?      
+-------------------
+ (1,foo,1.2,3,123)
+(1 row)
+
+select v #= hstore '' from testhstore0 v;
+   ?column?    
+---------------
+ (1,foo,1.2,3)
+(1 row)
+
+select v #= hstore '' from testhstore1 v;
+    ?column?     
+-----------------
+ (1,foo,1.2,3,0)
+(1 row)
+
+select null::testhstore1 #= (('c' => '3.45') || ('a' => '123'));
+ERROR:  domain hstestdom1 does not allow null values
+select null::testhstore1 #= (('c' => '3.45') || ('e' => '123'));
+   ?column?    
+---------------
+ (,,3.45,,123)
+(1 row)
+
+select null::testhstore0 #= hstore '';
+ ?column? 
+----------
+ (,,,)
+(1 row)
+
+select null::testhstore1 #= hstore '';
+ERROR:  domain hstestdom1 does not allow null values
+select v #= h from testhstore1 v, (values (hstore 'a=>123',1),('b=>foo,c=>3.21',2),('a=>null',3),('e=>123',4),('f=>blah',5)) x(h,i) order by i;
+     ?column?      
+-------------------
+ (123,foo,1.2,3,0)
+ (1,foo,3.21,3,0)
+ (,foo,1.2,3,0)
+ (1,foo,1.2,3,123)
+ (1,foo,1.2,3,0)
+(5 rows)
+
 -- keys/values
 select akeys('aa=>1 , b=>2, cq=>3'::hstore || 'cq=>l, b=>g, fg=>f');
     akeys     
@@ -440,9 +1127,9 @@ select avals('aa=>1 , b=>2, cq=>3'::hstore || 'cq=>l, b=>g, fg=>f');
 (1 row)
 
 select avals('aa=>1 , b=>2, cq=>3'::hstore || 'cq=>l, b=>g, fg=>NULL');
-   avals    
-------------
- {g,1,l,""}
+    avals     
+--------------
+ {g,1,l,NULL}
 (1 row)
 
 select avals('""=>1');
@@ -457,6 +1144,30 @@ select avals('');
  {}
 (1 row)
 
+select hstore_to_array('aa=>1, cq=>l, b=>g, fg=>NULL'::hstore);
+     hstore_to_array     
+-------------------------
+ {b,g,aa,1,cq,l,fg,NULL}
+(1 row)
+
+select %% 'aa=>1, cq=>l, b=>g, fg=>NULL';
+        ?column?         
+-------------------------
+ {b,g,aa,1,cq,l,fg,NULL}
+(1 row)
+
+select hstore_to_matrix('aa=>1, cq=>l, b=>g, fg=>NULL'::hstore);
+        hstore_to_matrix         
+---------------------------------
+ {{b,g},{aa,1},{cq,l},{fg,NULL}}
+(1 row)
+
+select %# 'aa=>1, cq=>l, b=>g, fg=>NULL';
+            ?column?             
+---------------------------------
+ {{b,g},{aa,1},{cq,l},{fg,NULL}}
+(1 row)
+
 select * from skeys('aa=>1 , b=>2, cq=>3'::hstore || 'cq=>l, b=>g, fg=>f');
  skeys 
 -------
@@ -583,6 +1294,18 @@ select count(*) from testhstore where h ? 'public';
    194
 (1 row)
 
+select count(*) from testhstore where h ?| ARRAY['public','disabled'];
+ count 
+-------
+   337
+(1 row)
+
+select count(*) from testhstore where h ?& ARRAY['public','disabled'];
+ count 
+-------
+    42
+(1 row)
+
 create index hidx on testhstore using gist(h);
 set enable_seqscan=off;
 select count(*) from testhstore where h @> 'wait=>NULL';
@@ -609,6 +1332,18 @@ select count(*) from testhstore where h ? 'public';
    194
 (1 row)
 
+select count(*) from testhstore where h ?| ARRAY['public','disabled'];
+ count 
+-------
+   337
+(1 row)
+
+select count(*) from testhstore where h ?& ARRAY['public','disabled'];
+ count 
+-------
+    42
+(1 row)
+
 drop index hidx;
 create index hidx on testhstore using gin (h);
 set enable_seqscan=off;
@@ -636,6 +1371,18 @@ select count(*) from testhstore where h ? 'public';
    194
 (1 row)
 
+select count(*) from testhstore where h ?| ARRAY['public','disabled'];
+ count 
+-------
+   337
+(1 row)
+
+select count(*) from testhstore where h ?& ARRAY['public','disabled'];
+ count 
+-------
+    42
+(1 row)
+
 select count(*) from (select (each(h)).key from testhstore) as wow ;
  count 
 -------
@@ -669,3 +1416,48 @@ select key, count(*) from (select (each(h)).key from testhstore) as wow group by
  abstract  |   161
 (22 rows)
 
+-- sort/hash
+select count(distinct h) from testhstore;
+ count 
+-------
+   885
+(1 row)
+
+set enable_hashagg = false;
+select count(*) from (select h from (select * from testhstore union all select * from testhstore) hs group by h) hs2;
+ count 
+-------
+   885
+(1 row)
+
+set enable_hashagg = true;
+set enable_sort = false;
+select count(*) from (select h from (select * from testhstore union all select * from testhstore) hs group by h) hs2;
+ count 
+-------
+   885
+(1 row)
+
+select distinct * from (values (hstore '' || ''),('')) v(h);
+ h 
+---
+ 
+(1 row)
+
+set enable_sort = true;
+-- btree
+drop index hidx;
+create index hidx on testhstore using btree (h);
+set enable_seqscan=off;
+select count(*) from testhstore where h #># 'p=>1';
+ count 
+-------
+   125
+(1 row)
+
+select count(*) from testhstore where h = 'pos=>98, line=>371, node=>CBA, indexed=>t';
+ count 
+-------
+     1
+(1 row)
+
diff --git a/contrib/hstore/hstore.h b/contrib/hstore/hstore.h
index e8ea58b567..796dce575e 100644
--- a/contrib/hstore/hstore.h
+++ b/contrib/hstore/hstore.h
@@ -1,59 +1,197 @@
 /*
- * $PostgreSQL: pgsql/contrib/hstore/hstore.h,v 1.8 2009/06/11 14:48:51 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/hstore/hstore.h,v 1.10 2010/02/26 02:00:32 momjian Exp $
  */
 #ifndef __HSTORE_H__
 #define __HSTORE_H__
 
 #include "fmgr.h"
+#include "utils/array.h"
 
 
+/*
+ * HEntry: there is one of these for each key _and_ value in an hstore
+ *
+ * the position offset points to the _end_ so that we can get the length
+ * by subtraction from the previous entry.	the ISFIRST flag lets us tell
+ * whether there is a previous entry.
+ */
 typedef struct
 {
-	uint16		keylen;
-	uint16		vallen;
-	uint32
-				valisnull:1,
-				pos:31;
+	uint32		entry;
 } HEntry;
 
-/* these are determined by the sizes of the keylen and vallen fields */
-/* in struct HEntry and struct Pairs */
-#define HSTORE_MAX_KEY_LEN 65535
-#define HSTORE_MAX_VALUE_LEN 65535
+#define HENTRY_ISFIRST 0x80000000
+#define HENTRY_ISNULL  0x40000000
+#define HENTRY_POSMASK 0x3FFFFFFF
 
+/* note possible multiple evaluations, also access to prior array element */
+#define HSE_ISFIRST(he_) (((he_).entry & HENTRY_ISFIRST) != 0)
+#define HSE_ISNULL(he_) (((he_).entry & HENTRY_ISNULL) != 0)
+#define HSE_ENDPOS(he_) ((he_).entry & HENTRY_POSMASK)
+#define HSE_OFF(he_) (HSE_ISFIRST(he_) ? 0 : HSE_ENDPOS((&(he_))[-1]))
+#define HSE_LEN(he_) (HSE_ISFIRST(he_)	\
+					  ? HSE_ENDPOS(he_) \
+					  : HSE_ENDPOS(he_) - HSE_ENDPOS((&(he_))[-1]))
+
+/*
+ * determined by the size of "endpos" (ie HENTRY_POSMASK), though this is a
+ * bit academic since currently varlenas (and hence both the input and the
+ * whole hstore) have the same limit
+ */
+#define HSTORE_MAX_KEY_LEN 0x3FFFFFFF
+#define HSTORE_MAX_VALUE_LEN 0x3FFFFFFF
 
 typedef struct
 {
 	int32		vl_len_;		/* varlena header (do not touch directly!) */
-	int4		size;
-	char		data[1];
+	uint32		size_;			/* flags and number of items in hstore */
+	/* array of HEntry follows */
 } HStore;
 
-#define HSHRDSIZE	(VARHDRSZ + sizeof(int4))
-#define CALCDATASIZE(x, lenstr) ( (x) * sizeof(HEntry) + HSHRDSIZE + (lenstr) )
-#define ARRPTR(x)		( (HEntry*) ( (char*)(x) + HSHRDSIZE ) )
-#define STRPTR(x)		( (char*)(x) + HSHRDSIZE + ( sizeof(HEntry) * ((HStore*)x)->size ) )
+/*
+ * it's not possible to get more than 2^28 items into an hstore,
+ * so we reserve the top few bits of the size field. See hstore_compat.c
+ * for one reason why.	Some bits are left for future use here.
+ */
+#define HS_FLAG_NEWVERSION 0x80000000
+
+#define HS_COUNT(hsp_) ((hsp_)->size_ & 0x0FFFFFFF)
+#define HS_SETCOUNT(hsp_,c_) ((hsp_)->size_ = (c_) | HS_FLAG_NEWVERSION)
+
+
+#define HSHRDSIZE	(sizeof(HStore))
+#define CALCDATASIZE(x, lenstr) ( (x) * 2 * sizeof(HEntry) + HSHRDSIZE + (lenstr) )
+
+/* note multiple evaluations of x */
+#define ARRPTR(x)		( (HEntry*) ( (HStore*)(x) + 1 ) )
+#define STRPTR(x)		( (char*)(ARRPTR(x) + HS_COUNT((HStore*)(x)) * 2) )
+
+/* note multiple/non evaluations */
+#define HS_KEY(arr_,str_,i_) ((str_) + HSE_OFF((arr_)[2*(i_)]))
+#define HS_VAL(arr_,str_,i_) ((str_) + HSE_OFF((arr_)[2*(i_)+1]))
+#define HS_KEYLEN(arr_,i_) (HSE_LEN((arr_)[2*(i_)]))
+#define HS_VALLEN(arr_,i_) (HSE_LEN((arr_)[2*(i_)+1]))
+#define HS_VALISNULL(arr_,i_) (HSE_ISNULL((arr_)[2*(i_)+1]))
+
+/*
+ * currently, these following macros are the _only_ places that rely
+ * on internal knowledge of HEntry. Everything else should be using
+ * the above macros. Exception: the in-place upgrade in hstore_compat.c
+ * messes with entries directly.
+ */
+
+/*
+ * copy one key/value pair (which must be contiguous starting at
+ * sptr_) into an under-construction hstore; dent_ is an HEntry*,
+ * dbuf_ is the destination's string buffer, dptr_ is the current
+ * position in the destination. lots of modification and multiple
+ * evaluation here.
+ */
+#define HS_COPYITEM(dent_,dbuf_,dptr_,sptr_,klen_,vlen_,vnull_)			\
+	do {																\
+		memcpy((dptr_), (sptr_), (klen_)+(vlen_));						\
+		(dptr_) += (klen_)+(vlen_);										\
+		(dent_)++->entry = ((dptr_) - (dbuf_) - (vlen_)) & HENTRY_POSMASK; \
+		(dent_)++->entry = ((((dptr_) - (dbuf_)) & HENTRY_POSMASK)		\
+							 | ((vnull_) ? HENTRY_ISNULL : 0));			\
+	} while(0)
+
+/*
+ * add one key/item pair, from a Pairs structure, into an
+ * under-construction hstore
+ */
+#define HS_ADDITEM(dent_,dbuf_,dptr_,pair_)								\
+	do {																\
+		memcpy((dptr_), (pair_).key, (pair_).keylen);					\
+		(dptr_) += (pair_).keylen;										\
+		(dent_)++->entry = ((dptr_) - (dbuf_)) & HENTRY_POSMASK;		\
+		if ((pair_).isnull)												\
+			(dent_)++->entry = ((((dptr_) - (dbuf_)) & HENTRY_POSMASK)	\
+								 | HENTRY_ISNULL);						\
+		else															\
+		{																\
+			memcpy((dptr_), (pair_).val, (pair_).vallen);				\
+			(dptr_) += (pair_).vallen;									\
+			(dent_)++->entry = ((dptr_) - (dbuf_)) & HENTRY_POSMASK;	\
+		}																\
+	} while (0)
+
+/* finalize a newly-constructed hstore */
+#define HS_FINALIZE(hsp_,count_,buf_,ptr_)							\
+	do {															\
+		int buflen = (ptr_) - (buf_);								\
+		if ((count_))												\
+			ARRPTR(hsp_)[0].entry |= HENTRY_ISFIRST;				\
+		if ((count_) != HS_COUNT((hsp_)))							\
+		{															\
+			HS_SETCOUNT((hsp_),(count_));							\
+			memmove(STRPTR(hsp_), (buf_), buflen);					\
+		}															\
+		SET_VARSIZE((hsp_), CALCDATASIZE((count_), buflen));		\
+	} while (0)
+
+/* ensure the varlena size of an existing hstore is correct */
+#define HS_FIXSIZE(hsp_,count_)											\
+	do {																\
+		int bl = (count_) ? HSE_ENDPOS(ARRPTR(hsp_)[2*(count_)-1]) : 0; \
+		SET_VARSIZE((hsp_), CALCDATASIZE((count_),bl));					\
+	} while (0)
+
+/* DatumGetHStoreP includes support for reading old-format hstore values */
+extern HStore *hstoreUpgrade(Datum orig);
 
+#define DatumGetHStoreP(d) hstoreUpgrade(d)
 
-#define PG_GETARG_HS(x) ((HStore*)PG_DETOAST_DATUM(PG_GETARG_DATUM(x)))
+#define PG_GETARG_HS(x) DatumGetHStoreP(PG_GETARG_DATUM(x))
 
+
+/*
+ * Pairs is a "decompressed" representation of one key/value pair.
+ * The two strings are not necessarily null-terminated.
+ */
 typedef struct
 {
 	char	   *key;
 	char	   *val;
-	uint16		keylen;
-	uint16		vallen;
-	bool		isnull;
-	bool		needfree;
+	size_t		keylen;
+	size_t		vallen;
+	bool		isnull;			/* value is null? */
+	bool		needfree;		/* need to pfree the value? */
 } Pairs;
 
-int			comparePairs(const void *a, const void *b);
-int			uniquePairs(Pairs *a, int4 l, int4 *buflen);
+extern int	hstoreUniquePairs(Pairs *a, int4 l, int4 *buflen);
+extern HStore *hstorePairs(Pairs *pairs, int4 pcount, int4 buflen);
+
+extern size_t hstoreCheckKeyLen(size_t len);
+extern size_t hstoreCheckValLen(size_t len);
 
-size_t		hstoreCheckKeyLen(size_t len);
-size_t		hstoreCheckValLen(size_t len);
+extern int	hstoreFindKey(HStore *hs, int *lowbound, char *key, int keylen);
+extern Pairs *hstoreArrayToPairs(ArrayType *a, int *npairs);
 
 #define HStoreContainsStrategyNumber	7
 #define HStoreExistsStrategyNumber		9
+#define HStoreExistsAnyStrategyNumber	10
+#define HStoreExistsAllStrategyNumber	11
+#define HStoreOldContainsStrategyNumber 13		/* backwards compatibility */
+
+/*
+ * defining HSTORE_POLLUTE_NAMESPACE=0 will prevent use of old function names;
+ * for now, we default to on for the benefit of people restoring old dumps
+ */
+#ifndef HSTORE_POLLUTE_NAMESPACE
+#define HSTORE_POLLUTE_NAMESPACE 1
+#endif
+
+#if HSTORE_POLLUTE_NAMESPACE
+#define HSTORE_POLLUTE(newname_,oldname_) \
+	PG_FUNCTION_INFO_V1(oldname_);		  \
+	Datum oldname_(PG_FUNCTION_ARGS);	  \
+	Datum newname_(PG_FUNCTION_ARGS);	  \
+	Datum oldname_(PG_FUNCTION_ARGS) { return newname_(fcinfo); } \
+	extern int no_such_variable
+#else
+#define HSTORE_POLLUTE(newname_,oldname_) \
+	extern int no_such_variable
+#endif
 
 #endif   /* __HSTORE_H__ */
diff --git a/contrib/hstore/hstore.sql.in b/contrib/hstore/hstore.sql.in
index 29a78ed052..c7a5e8e556 100644
--- a/contrib/hstore/hstore.sql.in
+++ b/contrib/hstore/hstore.sql.in
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/contrib/hstore/hstore.sql.in,v 1.11 2009/06/11 18:30:03 tgl Exp $ */
+/* $PostgreSQL: pgsql/contrib/hstore/hstore.sql.in,v 1.15 2010/07/02 20:36:48 rhaas Exp $ */
 
 -- Adjust this setting to control where the objects get created.
 SET search_path = public;
@@ -8,23 +8,40 @@ CREATE TYPE hstore;
 CREATE OR REPLACE FUNCTION hstore_in(cstring)
 RETURNS hstore
 AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
+LANGUAGE C STRICT IMMUTABLE;
 
 CREATE OR REPLACE FUNCTION hstore_out(hstore)
 RETURNS cstring
 AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
+LANGUAGE C STRICT IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION hstore_recv(internal)
+RETURNS hstore
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION hstore_send(hstore)
+RETURNS bytea
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT IMMUTABLE;
 
 CREATE TYPE hstore (
         INTERNALLENGTH = -1,
         INPUT = hstore_in,
         OUTPUT = hstore_out,
+        RECEIVE = hstore_recv,
+        SEND = hstore_send,
         STORAGE = extended
 );
 
+CREATE OR REPLACE FUNCTION hstore_version_diag(hstore)
+RETURNS integer
+AS 'MODULE_PATHNAME','hstore_version_diag'
+LANGUAGE C STRICT IMMUTABLE;
+
 CREATE OR REPLACE FUNCTION fetchval(hstore,text)
 RETURNS text
-AS 'MODULE_PATHNAME'
+AS 'MODULE_PATHNAME','hstore_fetchval'
 LANGUAGE C STRICT IMMUTABLE;
 
 CREATE OPERATOR -> (
@@ -33,14 +50,30 @@ CREATE OPERATOR -> (
 	PROCEDURE = fetchval
 );
 
+CREATE OR REPLACE FUNCTION slice_array(hstore,text[])
+RETURNS text[]
+AS 'MODULE_PATHNAME','hstore_slice_to_array'
+LANGUAGE C STRICT IMMUTABLE;
+
+CREATE OPERATOR -> (
+	LEFTARG = hstore,
+	RIGHTARG = text[],
+	PROCEDURE = slice_array
+);
+
+CREATE OR REPLACE FUNCTION slice(hstore,text[])
+RETURNS hstore
+AS 'MODULE_PATHNAME','hstore_slice_to_hstore'
+LANGUAGE C STRICT IMMUTABLE;
+
 CREATE OR REPLACE FUNCTION isexists(hstore,text)
 RETURNS bool
-AS 'MODULE_PATHNAME','exists'
+AS 'MODULE_PATHNAME','hstore_exists'
 LANGUAGE C STRICT IMMUTABLE;
 
 CREATE OR REPLACE FUNCTION exist(hstore,text)
 RETURNS bool
-AS 'MODULE_PATHNAME','exists'
+AS 'MODULE_PATHNAME','hstore_exists'
 LANGUAGE C STRICT IMMUTABLE;
 
 CREATE OPERATOR ? (
@@ -51,24 +84,78 @@ CREATE OPERATOR ? (
 	JOIN = contjoinsel
 );
 
+CREATE OR REPLACE FUNCTION exists_any(hstore,text[])
+RETURNS bool
+AS 'MODULE_PATHNAME','hstore_exists_any'
+LANGUAGE C STRICT IMMUTABLE;
+
+CREATE OPERATOR ?| (
+	LEFTARG = hstore,
+	RIGHTARG = text[],
+	PROCEDURE = exists_any,
+	RESTRICT = contsel,
+	JOIN = contjoinsel
+);
+
+CREATE OR REPLACE FUNCTION exists_all(hstore,text[])
+RETURNS bool
+AS 'MODULE_PATHNAME','hstore_exists_all'
+LANGUAGE C STRICT IMMUTABLE;
+
+CREATE OPERATOR ?& (
+	LEFTARG = hstore,
+	RIGHTARG = text[],
+	PROCEDURE = exists_all,
+	RESTRICT = contsel,
+	JOIN = contjoinsel
+);
+
 CREATE OR REPLACE FUNCTION isdefined(hstore,text)
 RETURNS bool
-AS 'MODULE_PATHNAME','defined'
+AS 'MODULE_PATHNAME','hstore_defined'
 LANGUAGE C STRICT IMMUTABLE;
 
 CREATE OR REPLACE FUNCTION defined(hstore,text)
 RETURNS bool
-AS 'MODULE_PATHNAME','defined'
+AS 'MODULE_PATHNAME','hstore_defined'
 LANGUAGE C STRICT IMMUTABLE;
 
 CREATE OR REPLACE FUNCTION delete(hstore,text)
 RETURNS hstore
-AS 'MODULE_PATHNAME','delete'
+AS 'MODULE_PATHNAME','hstore_delete'
 LANGUAGE C STRICT IMMUTABLE;
 
+CREATE OR REPLACE FUNCTION delete(hstore,text[])
+RETURNS hstore
+AS 'MODULE_PATHNAME','hstore_delete_array'
+LANGUAGE C STRICT IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION delete(hstore,hstore)
+RETURNS hstore
+AS 'MODULE_PATHNAME','hstore_delete_hstore'
+LANGUAGE C STRICT IMMUTABLE;
+
+CREATE OPERATOR - (
+	LEFTARG = hstore,
+	RIGHTARG = text,
+	PROCEDURE = delete
+);
+
+CREATE OPERATOR - (
+	LEFTARG = hstore,
+	RIGHTARG = text[],
+	PROCEDURE = delete
+);
+
+CREATE OPERATOR - (
+	LEFTARG = hstore,
+	RIGHTARG = hstore,
+	PROCEDURE = delete
+);
+
 CREATE OR REPLACE FUNCTION hs_concat(hstore,hstore)
 RETURNS hstore
-AS 'MODULE_PATHNAME'
+AS 'MODULE_PATHNAME','hstore_concat'
 LANGUAGE C STRICT IMMUTABLE;
 
 CREATE OPERATOR || (
@@ -79,12 +166,12 @@ CREATE OPERATOR || (
 
 CREATE OR REPLACE FUNCTION hs_contains(hstore,hstore)
 RETURNS bool
-AS 'MODULE_PATHNAME'
+AS 'MODULE_PATHNAME','hstore_contains'
 LANGUAGE C STRICT IMMUTABLE;
 
 CREATE OR REPLACE FUNCTION hs_contained(hstore,hstore)
 RETURNS bool
-AS 'MODULE_PATHNAME'
+AS 'MODULE_PATHNAME','hstore_contained'
 LANGUAGE C STRICT IMMUTABLE;
 
 CREATE OPERATOR @> (
@@ -126,57 +213,231 @@ CREATE OPERATOR ~ (
 
 CREATE OR REPLACE FUNCTION tconvert(text,text)
 RETURNS hstore
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE; -- not STRICT
+AS 'MODULE_PATHNAME','hstore_from_text'
+LANGUAGE C IMMUTABLE; -- not STRICT; needs to allow (key,NULL)
+
+CREATE OR REPLACE FUNCTION hstore(text,text)
+RETURNS hstore
+AS 'MODULE_PATHNAME','hstore_from_text'
+LANGUAGE C IMMUTABLE; -- not STRICT; needs to allow (key,NULL)
 
 CREATE OPERATOR => (
 	LEFTARG = text,
 	RIGHTARG = text,
-	PROCEDURE = tconvert
+	PROCEDURE = hstore
+);
+
+CREATE OR REPLACE FUNCTION hstore(text[],text[])
+RETURNS hstore
+AS 'MODULE_PATHNAME', 'hstore_from_arrays'
+LANGUAGE C IMMUTABLE; -- not STRICT; allows (keys,null)
+
+CREATE FUNCTION hstore(text[])
+RETURNS hstore
+AS 'MODULE_PATHNAME', 'hstore_from_array'
+LANGUAGE C IMMUTABLE STRICT;
+
+CREATE CAST (text[] AS hstore)
+  WITH FUNCTION hstore(text[]);
+
+CREATE OR REPLACE FUNCTION hstore(record)
+RETURNS hstore
+AS 'MODULE_PATHNAME', 'hstore_from_record'
+LANGUAGE C IMMUTABLE; -- not STRICT; allows (null::recordtype)
+
+CREATE OR REPLACE FUNCTION hstore_to_array(hstore)
+RETURNS text[]
+AS 'MODULE_PATHNAME','hstore_to_array'
+LANGUAGE C STRICT IMMUTABLE;
+
+CREATE OPERATOR %% (
+       RIGHTARG = hstore,
+       PROCEDURE = hstore_to_array
+);
+
+CREATE OR REPLACE FUNCTION hstore_to_matrix(hstore)
+RETURNS text[]
+AS 'MODULE_PATHNAME','hstore_to_matrix'
+LANGUAGE C STRICT IMMUTABLE;
+
+CREATE OPERATOR %# (
+       RIGHTARG = hstore,
+       PROCEDURE = hstore_to_matrix
 );
 
 CREATE OR REPLACE FUNCTION akeys(hstore)
-RETURNS _text
-AS 'MODULE_PATHNAME'
+RETURNS text[]
+AS 'MODULE_PATHNAME','hstore_akeys'
 LANGUAGE C STRICT IMMUTABLE;
 
 CREATE OR REPLACE FUNCTION avals(hstore)
-RETURNS _text
-AS 'MODULE_PATHNAME'
+RETURNS text[]
+AS 'MODULE_PATHNAME','hstore_avals'
 LANGUAGE C STRICT IMMUTABLE;
 
 CREATE OR REPLACE FUNCTION skeys(hstore)
 RETURNS setof text
-AS 'MODULE_PATHNAME'
+AS 'MODULE_PATHNAME','hstore_skeys'
 LANGUAGE C STRICT IMMUTABLE;
 
 CREATE OR REPLACE FUNCTION svals(hstore)
 RETURNS setof text
-AS 'MODULE_PATHNAME'
+AS 'MODULE_PATHNAME','hstore_svals'
 LANGUAGE C STRICT IMMUTABLE;
 
 CREATE OR REPLACE FUNCTION each(IN hs hstore,
     OUT key text,
     OUT value text)
 RETURNS SETOF record
-AS 'MODULE_PATHNAME'
+AS 'MODULE_PATHNAME','hstore_each'
 LANGUAGE C STRICT IMMUTABLE;
 
+CREATE OR REPLACE FUNCTION populate_record(anyelement,hstore)
+RETURNS anyelement
+AS 'MODULE_PATHNAME', 'hstore_populate_record'
+LANGUAGE C IMMUTABLE; -- not STRICT; allows (null::rectype,hstore)
+
+CREATE OPERATOR #= (
+	LEFTARG = anyelement,
+	RIGHTARG = hstore,
+	PROCEDURE = populate_record
+);
 
+-- btree support
 
--- define the GiST support methods
+CREATE OR REPLACE FUNCTION hstore_eq(hstore,hstore)
+RETURNS boolean
+AS 'MODULE_PATHNAME','hstore_eq'
+LANGUAGE C STRICT IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION hstore_ne(hstore,hstore)
+RETURNS boolean
+AS 'MODULE_PATHNAME','hstore_ne'
+LANGUAGE C STRICT IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION hstore_gt(hstore,hstore)
+RETURNS boolean
+AS 'MODULE_PATHNAME','hstore_gt'
+LANGUAGE C STRICT IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION hstore_ge(hstore,hstore)
+RETURNS boolean
+AS 'MODULE_PATHNAME','hstore_ge'
+LANGUAGE C STRICT IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION hstore_lt(hstore,hstore)
+RETURNS boolean
+AS 'MODULE_PATHNAME','hstore_lt'
+LANGUAGE C STRICT IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION hstore_le(hstore,hstore)
+RETURNS boolean
+AS 'MODULE_PATHNAME','hstore_le'
+LANGUAGE C STRICT IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION hstore_cmp(hstore,hstore)
+RETURNS integer
+AS 'MODULE_PATHNAME','hstore_cmp'
+LANGUAGE C STRICT IMMUTABLE;
+
+CREATE OPERATOR = (
+       LEFTARG = hstore,
+       RIGHTARG = hstore,
+       PROCEDURE = hstore_eq,
+       COMMUTATOR = =,
+       NEGATOR = <>,
+       RESTRICT = eqsel,
+       JOIN = eqjoinsel,
+       MERGES,
+       HASHES
+);
+CREATE OPERATOR <> (
+       LEFTARG = hstore,
+       RIGHTARG = hstore,
+       PROCEDURE = hstore_ne,
+       COMMUTATOR = <>,
+       NEGATOR = =,
+       RESTRICT = neqsel,
+       JOIN = neqjoinsel
+);
+
+-- the comparison operators have funky names (and are undocumented)
+-- in an attempt to discourage anyone from actually using them. they
+-- only exist to support the btree opclass
+
+CREATE OPERATOR #<# (
+       LEFTARG = hstore,
+       RIGHTARG = hstore,
+       PROCEDURE = hstore_lt,
+       COMMUTATOR = #>#,
+       NEGATOR = #>=#,
+       RESTRICT = scalarltsel,
+       JOIN = scalarltjoinsel
+);
+CREATE OPERATOR #<=# (
+       LEFTARG = hstore,
+       RIGHTARG = hstore,
+       PROCEDURE = hstore_le,
+       COMMUTATOR = #>=#,
+       NEGATOR = #>#,
+       RESTRICT = scalarltsel,
+       JOIN = scalarltjoinsel
+);
+CREATE OPERATOR #># (
+       LEFTARG = hstore,
+       RIGHTARG = hstore,
+       PROCEDURE = hstore_gt,
+       COMMUTATOR = #<#,
+       NEGATOR = #<=#,
+       RESTRICT = scalargtsel,
+       JOIN = scalargtjoinsel
+);
+CREATE OPERATOR #>=# (
+       LEFTARG = hstore,
+       RIGHTARG = hstore,
+       PROCEDURE = hstore_ge,
+       COMMUTATOR = #<=#,
+       NEGATOR = #<#,
+       RESTRICT = scalargtsel,
+       JOIN = scalargtjoinsel
+);
+
+CREATE OPERATOR CLASS btree_hstore_ops
+DEFAULT FOR TYPE hstore USING btree
+AS
+	OPERATOR	1	#<# ,
+	OPERATOR	2	#<=# ,
+	OPERATOR	3	= ,
+	OPERATOR	4	#>=# ,
+	OPERATOR	5	#># ,
+	FUNCTION	1	hstore_cmp(hstore,hstore);
+
+-- hash support
+
+CREATE OR REPLACE FUNCTION hstore_hash(hstore)
+RETURNS integer
+AS 'MODULE_PATHNAME','hstore_hash'
+LANGUAGE C STRICT IMMUTABLE;
+
+CREATE OPERATOR CLASS hash_hstore_ops
+DEFAULT FOR TYPE hstore USING hash
+AS
+	OPERATOR	1	= ,
+	FUNCTION	1	hstore_hash(hstore);
+
+-- GiST support
 
 CREATE TYPE ghstore;
 
 CREATE OR REPLACE FUNCTION ghstore_in(cstring)
 RETURNS ghstore
 AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
+LANGUAGE C STRICT IMMUTABLE;
 
 CREATE OR REPLACE FUNCTION ghstore_out(ghstore)
 RETURNS cstring
 AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT;
+LANGUAGE C STRICT IMMUTABLE;
 
 CREATE TYPE ghstore (
         INTERNALLENGTH = -1,
@@ -219,12 +480,13 @@ RETURNS bool
 AS 'MODULE_PATHNAME'
 LANGUAGE C IMMUTABLE STRICT;
 
--- register the opclass for indexing (not as default)
 CREATE OPERATOR CLASS gist_hstore_ops
 DEFAULT FOR TYPE hstore USING gist
 AS
-       	OPERATOR        7       @> ,
-       	OPERATOR        9       ?(hstore,text) ,
+	OPERATOR        7       @> ,
+	OPERATOR        9       ?(hstore,text) ,
+	OPERATOR        10      ?|(hstore,text[]) ,
+	OPERATOR        11      ?&(hstore,text[]) ,
         --OPERATOR        8       <@ ,
         OPERATOR        13      @ ,
         --OPERATOR        14      ~ ,
@@ -237,7 +499,7 @@ AS
         FUNCTION        7       ghstore_same (internal, internal, internal),
         STORAGE         ghstore;
 
--- define the GIN support methods
+-- GIN support
 
 CREATE OR REPLACE FUNCTION gin_extract_hstore(internal, internal)
 RETURNS internal
@@ -257,10 +519,12 @@ LANGUAGE C IMMUTABLE STRICT;
 CREATE OPERATOR CLASS gin_hstore_ops
 DEFAULT FOR TYPE hstore USING gin
 AS
-	OPERATOR        7       @> ,
+	OPERATOR        7       @>,
 	OPERATOR        9       ?(hstore,text),
+	OPERATOR        10      ?|(hstore,text[]),
+	OPERATOR        11      ?&(hstore,text[]),
 	FUNCTION        1       bttextcmp(text,text),
 	FUNCTION        2       gin_extract_hstore(internal, internal),
 	FUNCTION        3       gin_extract_hstore_query(internal, internal, int2, internal, internal),
 	FUNCTION        4       gin_consistent_hstore(internal, int2, internal, int4, internal, internal),
-STORAGE         text;
+	STORAGE         text;
diff --git a/contrib/hstore/hstore_compat.c b/contrib/hstore/hstore_compat.c
new file mode 100644
index 0000000000..033d945f9c
--- /dev/null
+++ b/contrib/hstore/hstore_compat.c
@@ -0,0 +1,368 @@
+/*
+ * $PostgreSQL: pgsql/contrib/hstore/hstore_compat.c,v 1.2 2010/02/26 02:00:32 momjian Exp $
+ *
+ * Notes on old/new hstore format disambiguation.
+ *
+ * There are three formats to consider:
+ * 1) old contrib/hstore (referred to as hstore-old)
+ * 2) prerelease pgfoundry hstore
+ * 3) new contrib/hstore
+ *
+ * (2) and (3) are identical except for the HS_FLAG_NEWVERSION
+ * bit, which is set in (3) but not (2).
+ *
+ * Values that are already in format (3), or which are
+ * unambiguously in format (2), are handled by the first
+ * "return immediately" test in hstoreUpgrade().
+ *
+ * To stress a point: we ONLY get here with possibly-ambiguous
+ * values if we're doing some sort of in-place migration from an
+ * old prerelease pgfoundry hstore-new; and we explicitly don't
+ * support that without fixing up any potentially padded values
+ * first. Most of the code here is serious overkill, but the
+ * performance penalty isn't serious (especially compared to the
+ * palloc() that we have to do anyway) and the belt-and-braces
+ * validity checks provide some reassurance. (If for some reason
+ * we get a value that would have worked on the old code, but
+ * which would be botched by the conversion code, the validity
+ * checks will fail it first so we get an error rather than bad
+ * data.)
+ *
+ * Note also that empty hstores are the same in (2) and (3), so
+ * there are some special-case paths for them.
+ *
+ * We tell the difference between formats (2) and (3) as follows (but
+ * note that there are some edge cases where we can't tell; see
+ * comments in hstoreUpgrade):
+ *
+ * First, since there must be at least one entry, we look at
+ * how the bits line up. The new format looks like:
+ *
+ * 10kkkkkkkkkkkkkkkkkkkkkkkkkkkkkk  (k..k = keylen)
+ * 0nvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  (v..v = keylen+vallen)
+ *
+ * The old format looks like one of these, depending on endianness
+ * and bitfield layout: (k..k = keylen, v..v = vallen, p..p = pos,
+ * n = isnull)
+ *
+ * kkkkkkkkkkkkkkkkvvvvvvvvvvvvvvvv
+ * nppppppppppppppppppppppppppppppp
+ *
+ * kkkkkkkkkkkkkkkkvvvvvvvvvvvvvvvv
+ * pppppppppppppppppppppppppppppppn
+ *
+ * vvvvvvvvvvvvvvvvkkkkkkkkkkkkkkkk
+ * nppppppppppppppppppppppppppppppp
+ *
+ * vvvvvvvvvvvvvvvvkkkkkkkkkkkkkkkk
+ * pppppppppppppppppppppppppppppppn   (usual i386 format)
+ *
+ * If the entry is in old format, for the first entry "pos" must be 0.
+ * We can obviously see that either keylen or vallen must be >32768
+ * for there to be any ambiguity (which is why lengths less than that
+ * are fasttracked in hstore.h) Since "pos"==0, the "v" field in the
+ * new-format interpretation can only be 0 or 1, which constrains all
+ * but three bits of the old-format's k and v fields. But in addition
+ * to all of this, the data length implied by the keylen and vallen
+ * must fit in the varlena size. So the only ambiguous edge case for
+ * hstores with only one entry occurs between a new-format entry with
+ * an excess (~32k) of padding, and an old-format entry. But we know
+ * which format to use in that case based on how we were compiled, so
+ * no actual data corruption can occur.
+ *
+ * If there is more than one entry, the requirement that keys do not
+ * decrease in length, and that positions increase contiguously, and
+ * that the end of the data not be beyond the end of the varlena
+ * itself, disambiguates in almost all other cases. There is a small
+ * set of ambiguous cases which could occur if the old-format value
+ * has a large excess of padding and just the right pattern of key
+ * sizes, but these are also handled based on how we were compiled.
+ *
+ * The otherwise undocumented function hstore_version_diag is provided
+ * for testing purposes.
+ */
+#include "postgres.h"
+
+#include "funcapi.h"
+
+#include "hstore.h"
+
+/*
+ * This is the structure used for entries in the old contrib/hstore
+ * implementation. Notice that this is the same size as the new entry
+ * (two 32-bit words per key/value pair) and that the header is the
+ * same, so the old and new versions of ARRPTR, STRPTR, CALCDATASIZE
+ * etc. are compatible.
+ *
+ * If the above statement isn't true on some bizarre platform, we're
+ * a bit hosed (see Assert in hstoreValidOldFormat).
+ */
+typedef struct
+{
+	uint16		keylen;
+	uint16		vallen;
+	uint32
+				valisnull:1,
+				pos:31;
+} HOldEntry;
+
+static int	hstoreValidNewFormat(HStore *hs);
+static int	hstoreValidOldFormat(HStore *hs);
+
+
+/*
+ * Validity test for a new-format hstore.
+ *	0 = not valid
+ *	1 = valid but with "slop" in the length
+ *	2 = exactly valid
+ */
+static int
+hstoreValidNewFormat(HStore *hs)
+{
+	int			count = HS_COUNT(hs);
+	HEntry	   *entries = ARRPTR(hs);
+	int			buflen = (count) ? HSE_ENDPOS(entries[2 * (count) - 1]) : 0;
+	int			vsize = CALCDATASIZE(count, buflen);
+	int			i;
+
+	if (hs->size_ & HS_FLAG_NEWVERSION)
+		return 2;
+
+	if (count == 0)
+		return 2;
+
+	if (!HSE_ISFIRST(entries[0]))
+		return 0;
+
+	if (vsize > VARSIZE(hs))
+		return 0;
+
+	/* entry position must be nondecreasing */
+
+	for (i = 1; i < 2 * count; ++i)
+	{
+		if (HSE_ISFIRST(entries[i])
+			|| (HSE_ENDPOS(entries[i]) < HSE_ENDPOS(entries[i - 1])))
+			return 0;
+	}
+
+	/* key length must be nondecreasing and keys must not be null */
+
+	for (i = 1; i < count; ++i)
+	{
+		if (HS_KEYLEN(entries, i) < HS_KEYLEN(entries, i - 1))
+			return 0;
+		if (HSE_ISNULL(entries[2 * i]))
+			return 0;
+	}
+
+	if (vsize != VARSIZE(hs))
+		return 1;
+
+	return 2;
+}
+
+/*
+ * Validity test for an old-format hstore.
+ *	0 = not valid
+ *	1 = valid but with "slop" in the length
+ *	2 = exactly valid
+ */
+static int
+hstoreValidOldFormat(HStore *hs)
+{
+	int			count = hs->size_;
+	HOldEntry  *entries = (HOldEntry *) ARRPTR(hs);
+	int			vsize;
+	int			lastpos = 0;
+	int			i;
+
+	if (hs->size_ & HS_FLAG_NEWVERSION)
+		return 0;
+
+	Assert(sizeof(HOldEntry) == sizeof(HEntry));
+
+	if (count == 0)
+		return 2;
+
+	if (count > 0xFFFFFFF)
+		return 0;
+
+	if (CALCDATASIZE(count, 0) > VARSIZE(hs))
+		return 0;
+
+	if (entries[0].pos != 0)
+		return 0;
+
+	/* key length must be nondecreasing */
+
+	for (i = 1; i < count; ++i)
+	{
+		if (entries[i].keylen < entries[i - 1].keylen)
+			return 0;
+	}
+
+	/*
+	 * entry position must be strictly increasing, except for the first entry
+	 * (which can be ""=>"" and thus zero-length); and all entries must be
+	 * properly contiguous
+	 */
+
+	for (i = 0; i < count; ++i)
+	{
+		if (entries[i].pos != lastpos)
+			return 0;
+		lastpos += (entries[i].keylen
+					+ ((entries[i].valisnull) ? 0 : entries[i].vallen));
+	}
+
+	vsize = CALCDATASIZE(count, lastpos);
+
+	if (vsize > VARSIZE(hs))
+		return 0;
+
+	if (vsize != VARSIZE(hs))
+		return 1;
+
+	return 2;
+}
+
+
+/*
+ * hstoreUpgrade: PG_DETOAST_DATUM plus support for conversion of old hstores
+ */
+HStore *
+hstoreUpgrade(Datum orig)
+{
+	HStore	   *hs = (HStore *) PG_DETOAST_DATUM(orig);
+	int			valid_new;
+	int			valid_old;
+	bool		writable;
+
+	/* Return immediately if no conversion needed */
+	if ((hs->size_ & HS_FLAG_NEWVERSION) ||
+		hs->size_ == 0 ||
+		(VARSIZE(hs) < 32768 && HSE_ISFIRST((ARRPTR(hs)[0]))))
+		return hs;
+
+	valid_new = hstoreValidNewFormat(hs);
+	valid_old = hstoreValidOldFormat(hs);
+	/* Do we have a writable copy? */
+	writable = ((void *) hs != (void *) DatumGetPointer(orig));
+
+	if (!valid_old || hs->size_ == 0)
+	{
+		if (valid_new)
+		{
+			/*
+			 * force the "new version" flag and the correct varlena length,
+			 * but only if we have a writable copy already (which we almost
+			 * always will, since short new-format values won't come through
+			 * here)
+			 */
+			if (writable)
+			{
+				HS_SETCOUNT(hs, HS_COUNT(hs));
+				HS_FIXSIZE(hs, HS_COUNT(hs));
+			}
+			return hs;
+		}
+		else
+		{
+			elog(ERROR, "invalid hstore value found");
+		}
+	}
+
+	/*
+	 * this is the tricky edge case. It is only possible in some quite extreme
+	 * cases (the hstore must have had a lot of wasted padding space at the
+	 * end). But the only way a "new" hstore value could get here is if we're
+	 * upgrading in place from a pre-release version of hstore-new (NOT
+	 * contrib/hstore), so we work off the following assumptions: 1. If you're
+	 * moving from old contrib/hstore to hstore-new, you're required to fix up
+	 * any potential conflicts first, e.g. by running ALTER TABLE ... USING
+	 * col::text::hstore; on all hstore columns before upgrading. 2. If you're
+	 * moving from old contrib/hstore to new contrib/hstore, then "new" values
+	 * are impossible here 3. If you're moving from pre-release hstore-new to
+	 * hstore-new, then "old" values are impossible here 4. If you're moving
+	 * from pre-release hstore-new to new contrib/hstore, you're not doing so
+	 * as an in-place upgrade, so there is no issue So the upshot of all this
+	 * is that we can treat all the edge cases as "new" if we're being built
+	 * as hstore-new, and "old" if we're being built as contrib/hstore.
+	 *
+	 * XXX the WARNING can probably be downgraded to DEBUG1 once this has been
+	 * beta-tested. But for now, it would be very useful to know if anyone can
+	 * actually reach this case in a non-contrived setting.
+	 */
+
+	if (valid_new)
+	{
+#if HSTORE_IS_HSTORE_NEW
+		elog(WARNING, "ambiguous hstore value resolved as hstore-new");
+
+		/*
+		 * force the "new version" flag and the correct varlena length, but
+		 * only if we have a writable copy already (which we almost always
+		 * will, since short new-format values won't come through here)
+		 */
+		if (writable)
+		{
+			HS_SETCOUNT(hs, HS_COUNT(hs));
+			HS_FIXSIZE(hs, HS_COUNT(hs));
+		}
+		return hs;
+#else
+		elog(WARNING, "ambiguous hstore value resolved as hstore-old");
+#endif
+	}
+
+	/*
+	 * must have an old-style value. Overwrite it in place as a new-style one,
+	 * making sure we have a writable copy first.
+	 */
+
+	if (!writable)
+		hs = (HStore *) PG_DETOAST_DATUM_COPY(orig);
+
+	{
+		int			count = hs->size_;
+		HEntry	   *new_entries = ARRPTR(hs);
+		HOldEntry  *old_entries = (HOldEntry *) ARRPTR(hs);
+		int			i;
+
+		for (i = 0; i < count; ++i)
+		{
+			uint32		pos = old_entries[i].pos;
+			uint32		keylen = old_entries[i].keylen;
+			uint32		vallen = old_entries[i].vallen;
+			bool		isnull = old_entries[i].valisnull;
+
+			if (isnull)
+				vallen = 0;
+
+			new_entries[2 * i].entry = (pos + keylen) & HENTRY_POSMASK;
+			new_entries[2 * i + 1].entry = (((pos + keylen + vallen) & HENTRY_POSMASK)
+											| ((isnull) ? HENTRY_ISNULL : 0));
+		}
+
+		if (count)
+			new_entries[0].entry |= HENTRY_ISFIRST;
+		HS_SETCOUNT(hs, count);
+		HS_FIXSIZE(hs, count);
+	}
+
+	return hs;
+}
+
+
+PG_FUNCTION_INFO_V1(hstore_version_diag);
+Datum		hstore_version_diag(PG_FUNCTION_ARGS);
+Datum
+hstore_version_diag(PG_FUNCTION_ARGS)
+{
+	HStore	   *hs = (HStore *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
+	int			valid_new = hstoreValidNewFormat(hs);
+	int			valid_old = hstoreValidOldFormat(hs);
+
+	PG_RETURN_INT32(valid_old * 10 + valid_new);
+}
diff --git a/contrib/hstore/hstore_gin.c b/contrib/hstore/hstore_gin.c
index 9c9a83d128..f5056f53ec 100644
--- a/contrib/hstore/hstore_gin.c
+++ b/contrib/hstore/hstore_gin.c
@@ -1,9 +1,10 @@
 /*
- * $PostgreSQL: pgsql/contrib/hstore/hstore_gin.c,v 1.6 2009/06/11 14:48:51 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/hstore/hstore_gin.c,v 1.8 2010/02/26 02:00:32 momjian Exp $
  */
 #include "postgres.h"
 
 #include "access/gin.h"
+#include "catalog/pg_type.h"
 
 #include "hstore.h"
 
@@ -35,43 +36,36 @@ gin_extract_hstore(PG_FUNCTION_ARGS)
 	HStore	   *hs = PG_GETARG_HS(0);
 	int32	   *nentries = (int32 *) PG_GETARG_POINTER(1);
 	Datum	   *entries = NULL;
+	HEntry	   *hsent = ARRPTR(hs);
+	char	   *ptr = STRPTR(hs);
+	int			count = HS_COUNT(hs);
+	int			i;
 
-	*nentries = 2 * hs->size;
+	*nentries = 2 * count;
+	if (count)
+		entries = (Datum *) palloc(sizeof(Datum) * 2 * count);
 
-	if (hs->size > 0)
+	for (i = 0; i < count; ++i)
 	{
-		HEntry	   *ptr = ARRPTR(hs);
-		char	   *words = STRPTR(hs);
-		int			i = 0;
+		text	   *item;
 
-		entries = (Datum *) palloc(sizeof(Datum) * 2 * hs->size);
+		item = makeitem(HS_KEY(hsent, ptr, i), HS_KEYLEN(hsent, i));
+		*VARDATA(item) = KEYFLAG;
+		entries[2 * i] = PointerGetDatum(item);
 
-		while (ptr - ARRPTR(hs) < hs->size)
+		if (HS_VALISNULL(hsent, i))
 		{
-			text	   *item;
-
-			item = makeitem(words + ptr->pos, ptr->keylen);
-			*VARDATA(item) = KEYFLAG;
-			entries[i++] = PointerGetDatum(item);
-
-			if (ptr->valisnull)
-			{
-				item = makeitem(NULL, 0);
-				*VARDATA(item) = NULLFLAG;
-
-			}
-			else
-			{
-				item = makeitem(words + ptr->pos + ptr->keylen, ptr->vallen);
-				*VARDATA(item) = VALFLAG;
-			}
-			entries[i++] = PointerGetDatum(item);
-
-			ptr++;
+			item = makeitem(NULL, 0);
+			*VARDATA(item) = NULLFLAG;
+		}
+		else
+		{
+			item = makeitem(HS_VAL(hsent, ptr, i), HS_VALLEN(hsent, i));
+			*VARDATA(item) = VALFLAG;
 		}
+		entries[2 * i + 1] = PointerGetDatum(item);
 	}
 
-	PG_FREE_IF_COPY(hs, 0);
 	PG_RETURN_POINTER(entries);
 }
 
@@ -85,8 +79,7 @@ gin_extract_hstore_query(PG_FUNCTION_ARGS)
 
 	if (strategy == HStoreContainsStrategyNumber)
 	{
-		PG_RETURN_DATUM(DirectFunctionCall2(
-											gin_extract_hstore,
+		PG_RETURN_DATUM(DirectFunctionCall2(gin_extract_hstore,
 											PG_GETARG_DATUM(0),
 											PG_GETARG_DATUM(1)
 											));
@@ -94,19 +87,51 @@ gin_extract_hstore_query(PG_FUNCTION_ARGS)
 	else if (strategy == HStoreExistsStrategyNumber)
 	{
 		text	   *item,
-				   *q = PG_GETARG_TEXT_P(0);
+				   *query = PG_GETARG_TEXT_PP(0);
 		int32	   *nentries = (int32 *) PG_GETARG_POINTER(1);
 		Datum	   *entries = NULL;
 
 		*nentries = 1;
 		entries = (Datum *) palloc(sizeof(Datum));
 
-		item = makeitem(VARDATA(q), VARSIZE(q) - VARHDRSZ);
+		item = makeitem(VARDATA_ANY(query), VARSIZE_ANY_EXHDR(query));
 		*VARDATA(item) = KEYFLAG;
 		entries[0] = PointerGetDatum(item);
 
 		PG_RETURN_POINTER(entries);
 	}
+	else if (strategy == HStoreExistsAnyStrategyNumber ||
+			 strategy == HStoreExistsAllStrategyNumber)
+	{
+		ArrayType  *query = PG_GETARG_ARRAYTYPE_P(0);
+		Datum	   *key_datums;
+		bool	   *key_nulls;
+		int			key_count;
+		int			i,
+					j;
+		int32	   *nentries = (int32 *) PG_GETARG_POINTER(1);
+		Datum	   *entries = NULL;
+		text	   *item;
+
+		deconstruct_array(query,
+						  TEXTOID, -1, false, 'i',
+						  &key_datums, &key_nulls, &key_count);
+
+		entries = (Datum *) palloc(sizeof(Datum) * key_count);
+
+		for (i = 0, j = 0; i < key_count; ++i)
+		{
+			if (key_nulls[i])
+				continue;
+			item = makeitem(VARDATA(key_datums[i]), VARSIZE(key_datums[i]) - VARHDRSZ);
+			*VARDATA(item) = KEYFLAG;
+			entries[j++] = PointerGetDatum(item);
+		}
+
+		*nentries = j ? j : -1;
+
+		PG_RETURN_POINTER(entries);
+	}
 	else
 		elog(ERROR, "Unsupported strategy number: %d", strategy);
 
@@ -121,32 +146,47 @@ gin_consistent_hstore(PG_FUNCTION_ARGS)
 {
 	bool	   *check = (bool *) PG_GETARG_POINTER(0);
 	StrategyNumber strategy = PG_GETARG_UINT16(1);
-	HStore	   *query = PG_GETARG_HS(2);
 
-	/* int32	nkeys = PG_GETARG_INT32(3); */
+	/* HStore	   *query = PG_GETARG_HS(2); */
+	int32		nkeys = PG_GETARG_INT32(3);
+
 	/* Pointer	   *extra_data = (Pointer *) PG_GETARG_POINTER(4); */
 	bool	   *recheck = (bool *) PG_GETARG_POINTER(5);
 	bool		res = true;
 
+	*recheck = false;
+
 	if (strategy == HStoreContainsStrategyNumber)
 	{
 		int			i;
 
 		/*
 		 * Index lost information about correspondence of keys and values, so
-		 * we need recheck
+		 * we need recheck (pre-8.4 this is handled at SQL level)
 		 */
 		*recheck = true;
-		for (i = 0; res && i < 2 * query->size; i++)
+		for (i = 0; res && i < nkeys; i++)
 			if (check[i] == false)
 				res = false;
 	}
 	else if (strategy == HStoreExistsStrategyNumber)
 	{
 		/* Existence of key is guaranteed */
-		*recheck = false;
 		res = true;
 	}
+	else if (strategy == HStoreExistsAnyStrategyNumber)
+	{
+		/* Existence of key is guaranteed */
+		res = true;
+	}
+	else if (strategy == HStoreExistsAllStrategyNumber)
+	{
+		int			i;
+
+		for (i = 0; res && i < nkeys; ++i)
+			if (!check[i])
+				res = false;
+	}
 	else
 		elog(ERROR, "Unsupported strategy number: %d", strategy);
 
diff --git a/contrib/hstore/hstore_gist.c b/contrib/hstore/hstore_gist.c
index 0f6eac347c..db58fb62dd 100644
--- a/contrib/hstore/hstore_gist.c
+++ b/contrib/hstore/hstore_gist.c
@@ -1,13 +1,14 @@
 /*
- * $PostgreSQL: pgsql/contrib/hstore/hstore_gist.c,v 1.10 2009/06/11 14:48:51 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/hstore/hstore_gist.c,v 1.12 2010/02/26 02:00:32 momjian Exp $
  */
 #include "postgres.h"
 
 #include "access/gist.h"
 #include "access/itup.h"
 #include "access/skey.h"
-#include "crc32.h"
+#include "catalog/pg_type.h"
 
+#include "crc32.h"
 #include "hstore.h"
 
 /* bigint defines */
@@ -114,30 +115,27 @@ ghstore_compress(PG_FUNCTION_ARGS)
 	if (entry->leafkey)
 	{
 		GISTTYPE   *res = (GISTTYPE *) palloc0(CALCGTSIZE(0));
-		HStore	   *toastedval = (HStore *) DatumGetPointer(entry->key);
-		HStore	   *val = (HStore *) DatumGetPointer(PG_DETOAST_DATUM(entry->key));
-		HEntry	   *ptr = ARRPTR(val);
-		char	   *words = STRPTR(val);
+		HStore	   *val = DatumGetHStoreP(entry->key);
+		HEntry	   *hsent = ARRPTR(val);
+		char	   *ptr = STRPTR(val);
+		int			count = HS_COUNT(val);
+		int			i;
 
 		SET_VARSIZE(res, CALCGTSIZE(0));
 
-		while (ptr - ARRPTR(val) < val->size)
+		for (i = 0; i < count; ++i)
 		{
 			int			h;
 
-			h = crc32_sz((char *) (words + ptr->pos), ptr->keylen);
+			h = crc32_sz((char *) HS_KEY(hsent, ptr, i), HS_KEYLEN(hsent, i));
 			HASH(GETSIGN(res), h);
-			if (!ptr->valisnull)
+			if (!HS_VALISNULL(hsent, i))
 			{
-				h = crc32_sz((char *) (words + ptr->pos + ptr->keylen), ptr->vallen);
+				h = crc32_sz((char *) HS_VAL(hsent, ptr, i), HS_VALLEN(hsent, i));
 				HASH(GETSIGN(res), h);
 			}
-			ptr++;
 		}
 
-		if (val != toastedval)
-			pfree(val);
-
 		retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
 		gistentryinit(*retval, PointerGetDatum(res),
 					  entry->rel, entry->page,
@@ -177,7 +175,7 @@ ghstore_decompress(PG_FUNCTION_ARGS)
 	GISTENTRY  *retval;
 	HStore	   *key;
 
-	key = (HStore *) PG_DETOAST_DATUM(entry->key);
+	key = DatumGetHStoreP(entry->key);
 
 	if (key != (HStore *) DatumGetPointer(entry->key))
 	{
@@ -500,7 +498,6 @@ ghstore_picksplit(PG_FUNCTION_ARGS)
 	}
 
 	*right = *left = FirstOffsetNumber;
-	pfree(costvector);
 
 	v->spl_ldatum = PointerGetDatum(datum_l);
 	v->spl_rdatum = PointerGetDatum(datum_r);
@@ -528,37 +525,87 @@ ghstore_consistent(PG_FUNCTION_ARGS)
 
 	sign = GETSIGN(entry);
 
-	if (strategy == HStoreContainsStrategyNumber || strategy == 13 /* hack for old strats */ )
+	if (strategy == HStoreContainsStrategyNumber ||
+		strategy == HStoreOldContainsStrategyNumber)
 	{
 		HStore	   *query = PG_GETARG_HS(1);
 		HEntry	   *qe = ARRPTR(query);
 		char	   *qv = STRPTR(query);
+		int			count = HS_COUNT(query);
+		int			i;
 
-		while (res && qe - ARRPTR(query) < query->size)
+		for (i = 0; res && i < count; ++i)
 		{
-			int			crc = crc32_sz((char *) (qv + qe->pos), qe->keylen);
+			int			crc = crc32_sz((char *) HS_KEY(qe, qv, i), HS_KEYLEN(qe, i));
 
 			if (GETBIT(sign, HASHVAL(crc)))
 			{
-				if (!qe->valisnull)
+				if (!HS_VALISNULL(qe, i))
 				{
-					crc = crc32_sz((char *) (qv + qe->pos + qe->keylen), qe->vallen);
+					crc = crc32_sz((char *) HS_VAL(qe, qv, i), HS_VALLEN(qe, i));
 					if (!GETBIT(sign, HASHVAL(crc)))
 						res = false;
 				}
 			}
 			else
 				res = false;
-			qe++;
 		}
 	}
 	else if (strategy == HStoreExistsStrategyNumber)
 	{
-		text	   *query = PG_GETARG_TEXT_P(1);
-		int			crc = crc32_sz(VARDATA(query), VARSIZE(query) - VARHDRSZ);
+		text	   *query = PG_GETARG_TEXT_PP(1);
+		int			crc = crc32_sz(VARDATA_ANY(query), VARSIZE_ANY_EXHDR(query));
 
 		res = (GETBIT(sign, HASHVAL(crc))) ? true : false;
 	}
+	else if (strategy == HStoreExistsAllStrategyNumber)
+	{
+		ArrayType  *query = PG_GETARG_ARRAYTYPE_P(1);
+		Datum	   *key_datums;
+		bool	   *key_nulls;
+		int			key_count;
+		int			i;
+
+		deconstruct_array(query,
+						  TEXTOID, -1, false, 'i',
+						  &key_datums, &key_nulls, &key_count);
+
+		for (i = 0; res && i < key_count; ++i)
+		{
+			int			crc;
+
+			if (key_nulls[i])
+				continue;
+			crc = crc32_sz(VARDATA(key_datums[i]), VARSIZE(key_datums[i]) - VARHDRSZ);
+			if (!(GETBIT(sign, HASHVAL(crc))))
+				res = FALSE;
+		}
+	}
+	else if (strategy == HStoreExistsAnyStrategyNumber)
+	{
+		ArrayType  *query = PG_GETARG_ARRAYTYPE_P(1);
+		Datum	   *key_datums;
+		bool	   *key_nulls;
+		int			key_count;
+		int			i;
+
+		deconstruct_array(query,
+						  TEXTOID, -1, false, 'i',
+						  &key_datums, &key_nulls, &key_count);
+
+		res = FALSE;
+
+		for (i = 0; !res && i < key_count; ++i)
+		{
+			int			crc;
+
+			if (key_nulls[i])
+				continue;
+			crc = crc32_sz(VARDATA(key_datums[i]), VARSIZE(key_datums[i]) - VARHDRSZ);
+			if (GETBIT(sign, HASHVAL(crc)))
+				res = TRUE;
+		}
+	}
 	else
 		elog(ERROR, "Unsupported strategy number: %d", strategy);
 
diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c
index 3b19702520..fa6da693e9 100644
--- a/contrib/hstore/hstore_io.c
+++ b/contrib/hstore/hstore_io.c
@@ -1,14 +1,26 @@
 /*
- * $PostgreSQL: pgsql/contrib/hstore/hstore_io.c,v 1.11 2009/06/11 14:48:51 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/hstore/hstore_io.c,v 1.13 2010/02/26 02:00:32 momjian Exp $
  */
 #include "postgres.h"
 
 #include <ctype.h>
 
+#include "access/heapam.h"
+#include "access/htup.h"
+#include "catalog/pg_type.h"
+#include "funcapi.h"
+#include "libpq/pqformat.h"
+#include "utils/lsyscache.h"
+#include "utils/typcache.h"
+
 #include "hstore.h"
 
 PG_MODULE_MAGIC;
 
+/* old names for C functions */
+HSTORE_POLLUTE(hstore_from_text, tconvert);
+
+
 typedef struct
 {
 	char	   *begin;
@@ -263,7 +275,7 @@ parse_hstore(HSParser *state)
 	}
 }
 
-int
+static int
 comparePairs(const void *a, const void *b)
 {
 	if (((Pairs *) a)->keylen == ((Pairs *) b)->keylen)
@@ -286,8 +298,14 @@ comparePairs(const void *a, const void *b)
 	return (((Pairs *) a)->keylen > ((Pairs *) b)->keylen) ? 1 : -1;
 }
 
+/*
+ * this code still respects pairs.needfree, even though in general
+ * it should never be called in a context where anything needs freeing.
+ * we keep it because (a) those calls are in a rare code path anyway,
+ * and (b) who knows whether they might be needed by some caller.
+ */
 int
-uniquePairs(Pairs *a, int4 l, int4 *buflen)
+hstoreUniquePairs(Pairs *a, int4 l, int4 *buflen)
 {
 	Pairs	   *ptr,
 			   *res;
@@ -305,7 +323,8 @@ uniquePairs(Pairs *a, int4 l, int4 *buflen)
 	res = a;
 	while (ptr - a < l)
 	{
-		if (ptr->keylen == res->keylen && strncmp(ptr->key, res->key, res->keylen) == 0)
+		if (ptr->keylen == res->keylen &&
+			strncmp(ptr->key, res->key, res->keylen) == 0)
 		{
 			if (ptr->needfree)
 			{
@@ -327,24 +346,6 @@ uniquePairs(Pairs *a, int4 l, int4 *buflen)
 	return res + 1 - a;
 }
 
-static void
-freeHSParse(HSParser *state)
-{
-	int			i;
-
-	if (state->word)
-		pfree(state->word);
-	for (i = 0; i < state->pcur; i++)
-		if (state->pairs[i].needfree)
-		{
-			if (state->pairs[i].key)
-				pfree(state->pairs[i].key);
-			if (state->pairs[i].val)
-				pfree(state->pairs[i].val);
-		}
-	pfree(state->pairs);
-}
-
 size_t
 hstoreCheckKeyLen(size_t len)
 {
@@ -366,65 +367,723 @@ hstoreCheckValLen(size_t len)
 }
 
 
+HStore *
+hstorePairs(Pairs *pairs, int4 pcount, int4 buflen)
+{
+	HStore	   *out;
+	HEntry	   *entry;
+	char	   *ptr;
+	char	   *buf;
+	int4		len;
+	int4		i;
+
+	len = CALCDATASIZE(pcount, buflen);
+	out = palloc(len);
+	SET_VARSIZE(out, len);
+	HS_SETCOUNT(out, pcount);
+
+	if (pcount == 0)
+		return out;
+
+	entry = ARRPTR(out);
+	buf = ptr = STRPTR(out);
+
+	for (i = 0; i < pcount; i++)
+		HS_ADDITEM(entry, buf, ptr, pairs[i]);
+
+	HS_FINALIZE(out, pcount, buf, ptr);
+
+	return out;
+}
+
+
 PG_FUNCTION_INFO_V1(hstore_in);
 Datum		hstore_in(PG_FUNCTION_ARGS);
 Datum
 hstore_in(PG_FUNCTION_ARGS)
 {
 	HSParser	state;
-	int4		len,
-				buflen,
-				i;
+	int4		buflen;
 	HStore	   *out;
-	HEntry	   *entries;
-	char	   *ptr;
 
 	state.begin = PG_GETARG_CSTRING(0);
 
 	parse_hstore(&state);
 
-	if (state.pcur == 0)
+	state.pcur = hstoreUniquePairs(state.pairs, state.pcur, &buflen);
+
+	out = hstorePairs(state.pairs, state.pcur, buflen);
+
+	PG_RETURN_POINTER(out);
+}
+
+
+PG_FUNCTION_INFO_V1(hstore_recv);
+Datum		hstore_recv(PG_FUNCTION_ARGS);
+Datum
+hstore_recv(PG_FUNCTION_ARGS)
+{
+	int4		buflen;
+	HStore	   *out;
+	Pairs	   *pairs;
+	int4		i;
+	int4		pcount;
+	StringInfo	buf = (StringInfo) PG_GETARG_POINTER(0);
+
+	pcount = pq_getmsgint(buf, 4);
+
+	if (pcount == 0)
 	{
-		freeHSParse(&state);
-		len = CALCDATASIZE(0, 0);
-		out = palloc(len);
-		SET_VARSIZE(out, len);
-		out->size = 0;
+		out = hstorePairs(NULL, 0, 0);
 		PG_RETURN_POINTER(out);
 	}
 
-	state.pcur = uniquePairs(state.pairs, state.pcur, &buflen);
+	pairs = palloc(pcount * sizeof(Pairs));
 
-	len = CALCDATASIZE(state.pcur, buflen);
-	out = palloc(len);
-	SET_VARSIZE(out, len);
-	out->size = state.pcur;
+	for (i = 0; i < pcount; ++i)
+	{
+		int			rawlen = pq_getmsgint(buf, 4);
+		int			len;
+
+		if (rawlen < 0)
+			ereport(ERROR,
+					(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
+					 errmsg("null value not allowed for hstore key")));
+
+		pairs[i].key = pq_getmsgtext(buf, rawlen, &len);
+		pairs[i].keylen = hstoreCheckKeyLen(len);
+		pairs[i].needfree = true;
+
+		rawlen = pq_getmsgint(buf, 4);
+		if (rawlen < 0)
+		{
+			pairs[i].val = NULL;
+			pairs[i].vallen = 0;
+			pairs[i].isnull = true;
+		}
+		else
+		{
+			pairs[i].val = pq_getmsgtext(buf, rawlen, &len);
+			pairs[i].vallen = hstoreCheckValLen(len);
+			pairs[i].isnull = false;
+		}
+	}
+
+	pcount = hstoreUniquePairs(pairs, pcount, &buflen);
+
+	out = hstorePairs(pairs, pcount, buflen);
+
+	PG_RETURN_POINTER(out);
+}
+
+
+PG_FUNCTION_INFO_V1(hstore_from_text);
+Datum		hstore_from_text(PG_FUNCTION_ARGS);
+Datum
+hstore_from_text(PG_FUNCTION_ARGS)
+{
+	text	   *key;
+	text	   *val = NULL;
+	Pairs		p;
+	HStore	   *out;
+
+	if (PG_ARGISNULL(0))
+		PG_RETURN_NULL();
+
+	p.needfree = false;
+	key = PG_GETARG_TEXT_PP(0);
+	p.key = VARDATA_ANY(key);
+	p.keylen = hstoreCheckKeyLen(VARSIZE_ANY_EXHDR(key));
+
+	if (PG_ARGISNULL(1))
+	{
+		p.vallen = 0;
+		p.isnull = true;
+	}
+	else
+	{
+		val = PG_GETARG_TEXT_PP(1);
+		p.val = VARDATA_ANY(val);
+		p.vallen = hstoreCheckValLen(VARSIZE_ANY_EXHDR(val));
+		p.isnull = false;
+	}
+
+	out = hstorePairs(&p, 1, p.keylen + p.vallen);
+
+	PG_RETURN_POINTER(out);
+}
+
+
+PG_FUNCTION_INFO_V1(hstore_from_arrays);
+Datum		hstore_from_arrays(PG_FUNCTION_ARGS);
+Datum
+hstore_from_arrays(PG_FUNCTION_ARGS)
+{
+	int4		buflen;
+	HStore	   *out;
+	Pairs	   *pairs;
+	Datum	   *key_datums;
+	bool	   *key_nulls;
+	int			key_count;
+	Datum	   *value_datums;
+	bool	   *value_nulls;
+	int			value_count;
+	ArrayType  *key_array;
+	ArrayType  *value_array;
+	int			i;
+
+	if (PG_ARGISNULL(0))
+		PG_RETURN_NULL();
+
+	key_array = PG_GETARG_ARRAYTYPE_P(0);
+
+	Assert(ARR_ELEMTYPE(key_array) == TEXTOID);
+
+	/*
+	 * must check >1 rather than != 1 because empty arrays have 0 dimensions,
+	 * not 1
+	 */
+
+	if (ARR_NDIM(key_array) > 1)
+		ereport(ERROR,
+				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
+				 errmsg("wrong number of array subscripts")));
+
+	deconstruct_array(key_array,
+					  TEXTOID, -1, false, 'i',
+					  &key_datums, &key_nulls, &key_count);
+
+	/* value_array might be NULL */
+
+	if (PG_ARGISNULL(1))
+	{
+		value_array = NULL;
+		value_count = key_count;
+		value_datums = NULL;
+		value_nulls = NULL;
+	}
+	else
+	{
+		value_array = PG_GETARG_ARRAYTYPE_P(1);
+
+		Assert(ARR_ELEMTYPE(value_array) == TEXTOID);
+
+		if (ARR_NDIM(value_array) > 1)
+			ereport(ERROR,
+					(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
+					 errmsg("wrong number of array subscripts")));
+
+		if ((ARR_NDIM(key_array) > 0 || ARR_NDIM(value_array) > 0) &&
+			(ARR_NDIM(key_array) != ARR_NDIM(value_array) ||
+			 ARR_DIMS(key_array)[0] != ARR_DIMS(value_array)[0] ||
+			 ARR_LBOUND(key_array)[0] != ARR_LBOUND(value_array)[0]))
+			ereport(ERROR,
+					(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
+					 errmsg("arrays must have same bounds")));
+
+		deconstruct_array(value_array,
+						  TEXTOID, -1, false, 'i',
+						  &value_datums, &value_nulls, &value_count);
+
+		Assert(key_count == value_count);
+	}
+
+	pairs = palloc(key_count * sizeof(Pairs));
+
+	for (i = 0; i < key_count; ++i)
+	{
+		if (key_nulls[i])
+			ereport(ERROR,
+					(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
+					 errmsg("null value not allowed for hstore key")));
+
+		if (!value_nulls || value_nulls[i])
+		{
+			pairs[i].key = VARDATA_ANY(key_datums[i]);
+			pairs[i].val = NULL;
+			pairs[i].keylen = hstoreCheckKeyLen(VARSIZE_ANY_EXHDR(key_datums[i]));
+			pairs[i].vallen = 4;
+			pairs[i].isnull = true;
+			pairs[i].needfree = false;
+		}
+		else
+		{
+			pairs[i].key = VARDATA_ANY(key_datums[i]);
+			pairs[i].val = VARDATA_ANY(value_datums[i]);
+			pairs[i].keylen = hstoreCheckKeyLen(VARSIZE_ANY_EXHDR(key_datums[i]));
+			pairs[i].vallen = hstoreCheckValLen(VARSIZE_ANY_EXHDR(value_datums[i]));
+			pairs[i].isnull = false;
+			pairs[i].needfree = false;
+		}
+	}
+
+	key_count = hstoreUniquePairs(pairs, key_count, &buflen);
+
+	out = hstorePairs(pairs, key_count, buflen);
+
+	PG_RETURN_POINTER(out);
+}
+
+
+PG_FUNCTION_INFO_V1(hstore_from_array);
+Datum		hstore_from_array(PG_FUNCTION_ARGS);
+Datum
+hstore_from_array(PG_FUNCTION_ARGS)
+{
+	ArrayType  *in_array = PG_GETARG_ARRAYTYPE_P(0);
+	int			ndims = ARR_NDIM(in_array);
+	int			count;
+	int4		buflen;
+	HStore	   *out;
+	Pairs	   *pairs;
+	Datum	   *in_datums;
+	bool	   *in_nulls;
+	int			in_count;
+	int			i;
 
-	entries = ARRPTR(out);
-	ptr = STRPTR(out);
+	Assert(ARR_ELEMTYPE(in_array) == TEXTOID);
 
-	for (i = 0; i < out->size; i++)
+	switch (ndims)
 	{
-		entries[i].keylen = state.pairs[i].keylen;
-		entries[i].pos = ptr - STRPTR(out);
-		memcpy(ptr, state.pairs[i].key, state.pairs[i].keylen);
-		ptr += entries[i].keylen;
+		case 0:
+			out = hstorePairs(NULL, 0, 0);
+			PG_RETURN_POINTER(out);
 
-		entries[i].valisnull = state.pairs[i].isnull;
-		if (entries[i].valisnull)
-			entries[i].vallen = 4;		/* null */
+		case 1:
+			if ((ARR_DIMS(in_array)[0]) % 2)
+				ereport(ERROR,
+						(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
+						 errmsg("array must have even number of elements")));
+			break;
+
+		case 2:
+			if ((ARR_DIMS(in_array)[1]) != 2)
+				ereport(ERROR,
+						(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
+						 errmsg("array must have two columns")));
+			break;
+
+		default:
+			ereport(ERROR,
+					(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
+					 errmsg("wrong number of array subscripts")));
+	}
+
+	deconstruct_array(in_array,
+					  TEXTOID, -1, false, 'i',
+					  &in_datums, &in_nulls, &in_count);
+
+	count = in_count / 2;
+
+	pairs = palloc(count * sizeof(Pairs));
+
+	for (i = 0; i < count; ++i)
+	{
+		if (in_nulls[i * 2])
+			ereport(ERROR,
+					(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
+					 errmsg("null value not allowed for hstore key")));
+
+		if (in_nulls[i * 2 + 1])
+		{
+			pairs[i].key = VARDATA_ANY(in_datums[i * 2]);
+			pairs[i].val = NULL;
+			pairs[i].keylen = hstoreCheckKeyLen(VARSIZE_ANY_EXHDR(in_datums[i * 2]));
+			pairs[i].vallen = 4;
+			pairs[i].isnull = true;
+			pairs[i].needfree = false;
+		}
 		else
 		{
-			entries[i].vallen = state.pairs[i].vallen;
-			memcpy(ptr, state.pairs[i].val, state.pairs[i].vallen);
-			ptr += entries[i].vallen;
+			pairs[i].key = VARDATA_ANY(in_datums[i * 2]);
+			pairs[i].val = VARDATA_ANY(in_datums[i * 2 + 1]);
+			pairs[i].keylen = hstoreCheckKeyLen(VARSIZE_ANY_EXHDR(in_datums[i * 2]));
+			pairs[i].vallen = hstoreCheckValLen(VARSIZE_ANY_EXHDR(in_datums[i * 2 + 1]));
+			pairs[i].isnull = false;
+			pairs[i].needfree = false;
+		}
+	}
+
+	count = hstoreUniquePairs(pairs, count, &buflen);
+
+	out = hstorePairs(pairs, count, buflen);
+
+	PG_RETURN_POINTER(out);
+}
+
+/* most of hstore_from_record is shamelessly swiped from record_out */
+
+/*
+ * structure to cache metadata needed for record I/O
+ */
+typedef struct ColumnIOData
+{
+	Oid			column_type;
+	Oid			typiofunc;
+	Oid			typioparam;
+	FmgrInfo	proc;
+} ColumnIOData;
+
+typedef struct RecordIOData
+{
+	Oid			record_type;
+	int32		record_typmod;
+	int			ncolumns;
+	ColumnIOData columns[1];	/* VARIABLE LENGTH ARRAY */
+} RecordIOData;
+
+PG_FUNCTION_INFO_V1(hstore_from_record);
+Datum		hstore_from_record(PG_FUNCTION_ARGS);
+Datum
+hstore_from_record(PG_FUNCTION_ARGS)
+{
+	HeapTupleHeader rec;
+	int4		buflen;
+	HStore	   *out;
+	Pairs	   *pairs;
+	Oid			tupType;
+	int32		tupTypmod;
+	TupleDesc	tupdesc;
+	HeapTupleData tuple;
+	RecordIOData *my_extra;
+	int			ncolumns;
+	int			i,
+				j;
+	Datum	   *values;
+	bool	   *nulls;
+
+	if (PG_ARGISNULL(0))
+	{
+		Oid			argtype = get_fn_expr_argtype(fcinfo->flinfo, 0);
+
+		/*
+		 * have no tuple to look at, so the only source of type info is the
+		 * argtype. The lookup_rowtype_tupdesc call below will error out if we
+		 * don't have a known composite type oid here.
+		 */
+		tupType = argtype;
+		tupTypmod = -1;
+
+		rec = NULL;
+	}
+	else
+	{
+		rec = PG_GETARG_HEAPTUPLEHEADER(0);
+
+		/* Extract type info from the tuple itself */
+		tupType = HeapTupleHeaderGetTypeId(rec);
+		tupTypmod = HeapTupleHeaderGetTypMod(rec);
+	}
+
+	tupdesc = lookup_rowtype_tupdesc(tupType, tupTypmod);
+	ncolumns = tupdesc->natts;
+
+	/*
+	 * We arrange to look up the needed I/O info just once per series of
+	 * calls, assuming the record type doesn't change underneath us.
+	 */
+	my_extra = (RecordIOData *) fcinfo->flinfo->fn_extra;
+	if (my_extra == NULL ||
+		my_extra->ncolumns != ncolumns)
+	{
+		fcinfo->flinfo->fn_extra =
+			MemoryContextAlloc(fcinfo->flinfo->fn_mcxt,
+							   sizeof(RecordIOData) - sizeof(ColumnIOData)
+							   + ncolumns * sizeof(ColumnIOData));
+		my_extra = (RecordIOData *) fcinfo->flinfo->fn_extra;
+		my_extra->record_type = InvalidOid;
+		my_extra->record_typmod = 0;
+	}
+
+	if (my_extra->record_type != tupType ||
+		my_extra->record_typmod != tupTypmod)
+	{
+		MemSet(my_extra, 0,
+			   sizeof(RecordIOData) - sizeof(ColumnIOData)
+			   + ncolumns * sizeof(ColumnIOData));
+		my_extra->record_type = tupType;
+		my_extra->record_typmod = tupTypmod;
+		my_extra->ncolumns = ncolumns;
+	}
+
+	pairs = palloc(ncolumns * sizeof(Pairs));
+
+	if (rec)
+	{
+		/* Build a temporary HeapTuple control structure */
+		tuple.t_len = HeapTupleHeaderGetDatumLength(rec);
+		ItemPointerSetInvalid(&(tuple.t_self));
+		tuple.t_tableOid = InvalidOid;
+		tuple.t_data = rec;
+
+		values = (Datum *) palloc(ncolumns * sizeof(Datum));
+		nulls = (bool *) palloc(ncolumns * sizeof(bool));
+
+		/* Break down the tuple into fields */
+		heap_deform_tuple(&tuple, tupdesc, values, nulls);
+	}
+	else
+	{
+		values = NULL;
+		nulls = NULL;
+	}
+
+	for (i = 0, j = 0; i < ncolumns; ++i)
+	{
+		ColumnIOData *column_info = &my_extra->columns[i];
+		Oid			column_type = tupdesc->attrs[i]->atttypid;
+		char	   *value;
+
+		/* Ignore dropped columns in datatype */
+		if (tupdesc->attrs[i]->attisdropped)
+			continue;
+
+		pairs[j].key = NameStr(tupdesc->attrs[i]->attname);
+		pairs[j].keylen = hstoreCheckKeyLen(strlen(NameStr(tupdesc->attrs[i]->attname)));
+
+		if (!nulls || nulls[i])
+		{
+			pairs[j].val = NULL;
+			pairs[j].vallen = 4;
+			pairs[j].isnull = true;
+			pairs[j].needfree = false;
+			++j;
+			continue;
+		}
+
+		/*
+		 * Convert the column value to text
+		 */
+		if (column_info->column_type != column_type)
+		{
+			bool		typIsVarlena;
+
+			getTypeOutputInfo(column_type,
+							  &column_info->typiofunc,
+							  &typIsVarlena);
+			fmgr_info_cxt(column_info->typiofunc, &column_info->proc,
+						  fcinfo->flinfo->fn_mcxt);
+			column_info->column_type = column_type;
 		}
+
+		value = OutputFunctionCall(&column_info->proc, values[i]);
+
+		pairs[j].val = value;
+		pairs[j].vallen = hstoreCheckValLen(strlen(value));
+		pairs[j].isnull = false;
+		pairs[j].needfree = false;
+		++j;
 	}
 
-	freeHSParse(&state);
+	ncolumns = hstoreUniquePairs(pairs, j, &buflen);
+
+	out = hstorePairs(pairs, ncolumns, buflen);
+
+	ReleaseTupleDesc(tupdesc);
+
 	PG_RETURN_POINTER(out);
 }
 
+
+PG_FUNCTION_INFO_V1(hstore_populate_record);
+Datum		hstore_populate_record(PG_FUNCTION_ARGS);
+Datum
+hstore_populate_record(PG_FUNCTION_ARGS)
+{
+	Oid			argtype = get_fn_expr_argtype(fcinfo->flinfo, 0);
+	HStore	   *hs;
+	HEntry	   *entries;
+	char	   *ptr;
+	HeapTupleHeader rec;
+	Oid			tupType;
+	int32		tupTypmod;
+	TupleDesc	tupdesc;
+	HeapTupleData tuple;
+	HeapTuple	rettuple;
+	RecordIOData *my_extra;
+	int			ncolumns;
+	int			i;
+	Datum	   *values;
+	bool	   *nulls;
+
+	if (!type_is_rowtype(argtype))
+		ereport(ERROR,
+				(errcode(ERRCODE_DATATYPE_MISMATCH),
+				 errmsg("first argument must be a rowtype")));
+
+	if (PG_ARGISNULL(0))
+	{
+		if (PG_ARGISNULL(1))
+			PG_RETURN_NULL();
+
+		rec = NULL;
+
+		/*
+		 * have no tuple to look at, so the only source of type info is the
+		 * argtype. The lookup_rowtype_tupdesc call below will error out if we
+		 * don't have a known composite type oid here.
+		 */
+		tupType = argtype;
+		tupTypmod = -1;
+	}
+	else
+	{
+		rec = PG_GETARG_HEAPTUPLEHEADER(0);
+
+		if (PG_ARGISNULL(1))
+			PG_RETURN_POINTER(rec);
+
+		/* Extract type info from the tuple itself */
+		tupType = HeapTupleHeaderGetTypeId(rec);
+		tupTypmod = HeapTupleHeaderGetTypMod(rec);
+	}
+
+	hs = PG_GETARG_HS(1);
+	entries = ARRPTR(hs);
+	ptr = STRPTR(hs);
+
+	/*
+	 * if the input hstore is empty, we can only skip the rest if we were
+	 * passed in a non-null record, since otherwise there may be issues with
+	 * domain nulls.
+	 */
+
+	if (HS_COUNT(hs) == 0 && rec)
+		PG_RETURN_POINTER(rec);
+
+	tupdesc = lookup_rowtype_tupdesc(tupType, tupTypmod);
+	ncolumns = tupdesc->natts;
+
+	if (rec)
+	{
+		/* Build a temporary HeapTuple control structure */
+		tuple.t_len = HeapTupleHeaderGetDatumLength(rec);
+		ItemPointerSetInvalid(&(tuple.t_self));
+		tuple.t_tableOid = InvalidOid;
+		tuple.t_data = rec;
+	}
+
+	/*
+	 * We arrange to look up the needed I/O info just once per series of
+	 * calls, assuming the record type doesn't change underneath us.
+	 */
+	my_extra = (RecordIOData *) fcinfo->flinfo->fn_extra;
+	if (my_extra == NULL ||
+		my_extra->ncolumns != ncolumns)
+	{
+		fcinfo->flinfo->fn_extra =
+			MemoryContextAlloc(fcinfo->flinfo->fn_mcxt,
+							   sizeof(RecordIOData) - sizeof(ColumnIOData)
+							   + ncolumns * sizeof(ColumnIOData));
+		my_extra = (RecordIOData *) fcinfo->flinfo->fn_extra;
+		my_extra->record_type = InvalidOid;
+		my_extra->record_typmod = 0;
+	}
+
+	if (my_extra->record_type != tupType ||
+		my_extra->record_typmod != tupTypmod)
+	{
+		MemSet(my_extra, 0,
+			   sizeof(RecordIOData) - sizeof(ColumnIOData)
+			   + ncolumns * sizeof(ColumnIOData));
+		my_extra->record_type = tupType;
+		my_extra->record_typmod = tupTypmod;
+		my_extra->ncolumns = ncolumns;
+	}
+
+	values = (Datum *) palloc(ncolumns * sizeof(Datum));
+	nulls = (bool *) palloc(ncolumns * sizeof(bool));
+
+	if (rec)
+	{
+		/* Break down the tuple into fields */
+		heap_deform_tuple(&tuple, tupdesc, values, nulls);
+	}
+	else
+	{
+		for (i = 0; i < ncolumns; ++i)
+		{
+			values[i] = (Datum) 0;
+			nulls[i] = true;
+		}
+	}
+
+	for (i = 0; i < ncolumns; ++i)
+	{
+		ColumnIOData *column_info = &my_extra->columns[i];
+		Oid			column_type = tupdesc->attrs[i]->atttypid;
+		char	   *value;
+		int			idx;
+		int			vallen;
+
+		/* Ignore dropped columns in datatype */
+		if (tupdesc->attrs[i]->attisdropped)
+		{
+			nulls[i] = true;
+			continue;
+		}
+
+		idx = hstoreFindKey(hs, 0,
+							NameStr(tupdesc->attrs[i]->attname),
+							strlen(NameStr(tupdesc->attrs[i]->attname)));
+
+		/*
+		 * we can't just skip here if the key wasn't found since we might have
+		 * a domain to deal with. If we were passed in a non-null record
+		 * datum, we assume that the existing values are valid (if they're
+		 * not, then it's not our fault), but if we were passed in a null,
+		 * then every field which we don't populate needs to be run through
+		 * the input function just in case it's a domain type.
+		 */
+		if (idx < 0 && rec)
+			continue;
+
+		/*
+		 * Prepare to convert the column value from text
+		 */
+		if (column_info->column_type != column_type)
+		{
+			getTypeInputInfo(column_type,
+							 &column_info->typiofunc,
+							 &column_info->typioparam);
+			fmgr_info_cxt(column_info->typiofunc, &column_info->proc,
+						  fcinfo->flinfo->fn_mcxt);
+			column_info->column_type = column_type;
+		}
+
+		if (idx < 0 || HS_VALISNULL(entries, idx))
+		{
+			/*
+			 * need InputFunctionCall to happen even for nulls, so that domain
+			 * checks are done
+			 */
+			values[i] = InputFunctionCall(&column_info->proc, NULL,
+										  column_info->typioparam,
+										  tupdesc->attrs[i]->atttypmod);
+			nulls[i] = true;
+		}
+		else
+		{
+			vallen = HS_VALLEN(entries, idx);
+			value = palloc(1 + vallen);
+			memcpy(value, HS_VAL(entries, ptr, idx), vallen);
+			value[vallen] = 0;
+
+			values[i] = InputFunctionCall(&column_info->proc, value,
+										  column_info->typioparam,
+										  tupdesc->attrs[i]->atttypmod);
+			nulls[i] = false;
+		}
+	}
+
+	rettuple = heap_form_tuple(tupdesc, values, nulls);
+
+	ReleaseTupleDesc(tupdesc);
+
+	PG_RETURN_DATUM(HeapTupleGetDatum(rettuple));
+}
+
+
 static char *
 cpw(char *dst, char *src, int len)
 {
@@ -446,40 +1105,50 @@ hstore_out(PG_FUNCTION_ARGS)
 {
 	HStore	   *in = PG_GETARG_HS(0);
 	int			buflen,
-				i,
-				nnulls = 0;
+				i;
+	int			count = HS_COUNT(in);
 	char	   *out,
 			   *ptr;
 	char	   *base = STRPTR(in);
 	HEntry	   *entries = ARRPTR(in);
 
-	if (in->size == 0)
+	if (count == 0)
 	{
 		out = palloc(1);
 		*out = '\0';
-		PG_FREE_IF_COPY(in, 0);
 		PG_RETURN_CSTRING(out);
 	}
 
-	for (i = 0; i < in->size; i++)
-		if (entries[i].valisnull)
-			nnulls++;
+	buflen = 0;
 
-	buflen = (4 /* " */ + 2 /* => */ ) * (in->size - nnulls) +
-		(2 /* " */ + 2 /* => */ + 4 /* NULL */ ) * nnulls +
-		2 /* ,	*/ * (in->size - 1) +
-		2 /* esc */ * (VARSIZE(in) - CALCDATASIZE(in->size, 0)) +
-		1 /* \0 */ ;
+	/*
+	 * this loop overestimates due to pessimistic assumptions about escaping,
+	 * so very large hstore values can't be output. this could be fixed, but
+	 * many other data types probably have the same issue. This replaced code
+	 * that used the original varlena size for calculations, which was wrong
+	 * in some subtle ways.
+	 */
+
+	for (i = 0; i < count; i++)
+	{
+		/* include "" and => and comma-space */
+		buflen += 6 + 2 * HS_KEYLEN(entries, i);
+		/* include "" only if nonnull */
+		buflen += 2 + (HS_VALISNULL(entries, i)
+					   ? 2
+					   : 2 * HS_VALLEN(entries, i));
+	}
 
 	out = ptr = palloc(buflen);
-	for (i = 0; i < in->size; i++)
+
+	for (i = 0; i < count; i++)
 	{
 		*ptr++ = '"';
-		ptr = cpw(ptr, base + entries[i].pos, entries[i].keylen);
+		ptr = cpw(ptr, HS_KEY(entries, base, i), HS_KEYLEN(entries, i));
 		*ptr++ = '"';
 		*ptr++ = '=';
 		*ptr++ = '>';
-		if (entries[i].valisnull)
+		if (HS_VALISNULL(entries, i))
 		{
 			*ptr++ = 'N';
 			*ptr++ = 'U';
@@ -489,11 +1158,11 @@ hstore_out(PG_FUNCTION_ARGS)
 		else
 		{
 			*ptr++ = '"';
-			ptr = cpw(ptr, base + entries[i].pos + entries[i].keylen, entries[i].vallen);
+			ptr = cpw(ptr, HS_VAL(entries, base, i), HS_VALLEN(entries, i));
 			*ptr++ = '"';
 		}
 
-		if (i + 1 != in->size)
+		if (i + 1 != count)
 		{
 			*ptr++ = ',';
 			*ptr++ = ' ';
@@ -501,6 +1170,44 @@ hstore_out(PG_FUNCTION_ARGS)
 	}
 	*ptr = '\0';
 
-	PG_FREE_IF_COPY(in, 0);
 	PG_RETURN_CSTRING(out);
 }
+
+
+PG_FUNCTION_INFO_V1(hstore_send);
+Datum		hstore_send(PG_FUNCTION_ARGS);
+Datum
+hstore_send(PG_FUNCTION_ARGS)
+{
+	HStore	   *in = PG_GETARG_HS(0);
+	int			i;
+	int			count = HS_COUNT(in);
+	char	   *base = STRPTR(in);
+	HEntry	   *entries = ARRPTR(in);
+	StringInfoData buf;
+
+	pq_begintypsend(&buf);
+
+	pq_sendint(&buf, count, 4);
+
+	for (i = 0; i < count; i++)
+	{
+		int32		keylen = HS_KEYLEN(entries, i);
+
+		pq_sendint(&buf, keylen, 4);
+		pq_sendtext(&buf, HS_KEY(entries, base, i), keylen);
+		if (HS_VALISNULL(entries, i))
+		{
+			pq_sendint(&buf, -1, 4);
+		}
+		else
+		{
+			int32		vallen = HS_VALLEN(entries, i);
+
+			pq_sendint(&buf, vallen, 4);
+			pq_sendtext(&buf, HS_VAL(entries, base, i), vallen);
+		}
+	}
+
+	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
+}
diff --git a/contrib/hstore/hstore_op.c b/contrib/hstore/hstore_op.c
index 8d471e30f1..ebee60a1db 100644
--- a/contrib/hstore/hstore_op.c
+++ b/contrib/hstore/hstore_op.c
@@ -1,498 +1,945 @@
 /*
- * $PostgreSQL
+ * $PostgreSQL: pgsql/contrib/hstore/hstore_op.c,v 1.16 2010/02/26 02:00:32 momjian Exp $
  */
 #include "postgres.h"
 
+#include "access/hash.h"
+#include "access/heapam.h"
+#include "access/htup.h"
 #include "catalog/pg_type.h"
 #include "funcapi.h"
-#include "utils/array.h"
 #include "utils/builtins.h"
 
 #include "hstore.h"
 
+/* old names for C functions */
+HSTORE_POLLUTE(hstore_fetchval, fetchval);
+HSTORE_POLLUTE(hstore_exists, exists);
+HSTORE_POLLUTE(hstore_defined, defined);
+HSTORE_POLLUTE(hstore_delete, delete);
+HSTORE_POLLUTE(hstore_concat, hs_concat);
+HSTORE_POLLUTE(hstore_contains, hs_contains);
+HSTORE_POLLUTE(hstore_contained, hs_contained);
+HSTORE_POLLUTE(hstore_akeys, akeys);
+HSTORE_POLLUTE(hstore_avals, avals);
+HSTORE_POLLUTE(hstore_skeys, skeys);
+HSTORE_POLLUTE(hstore_svals, svals);
+HSTORE_POLLUTE(hstore_each, each);
 
-static HEntry *
-findkey(HStore *hs, char *key, int keylen)
+
+/*
+ * We're often finding a sequence of keys in ascending order. The
+ * "lowbound" parameter is used to cache lower bounds of searches
+ * between calls, based on this assumption. Pass NULL for it for
+ * one-off or unordered searches.
+ */
+int
+hstoreFindKey(HStore *hs, int *lowbound, char *key, int keylen)
 {
-	HEntry	   *StopLow = ARRPTR(hs);
-	HEntry	   *StopHigh = StopLow + hs->size;
-	HEntry	   *StopMiddle;
-	int			difference;
+	HEntry	   *entries = ARRPTR(hs);
+	int			stopLow = lowbound ? *lowbound : 0;
+	int			stopHigh = HS_COUNT(hs);
+	int			stopMiddle;
 	char	   *base = STRPTR(hs);
 
-	while (StopLow < StopHigh)
+	while (stopLow < stopHigh)
 	{
-		StopMiddle = StopLow + (StopHigh - StopLow) / 2;
+		int			difference;
+
+		stopMiddle = stopLow + (stopHigh - stopLow) / 2;
 
-		if (StopMiddle->keylen == keylen)
-			difference = strncmp(base + StopMiddle->pos, key, StopMiddle->keylen);
+		if (HS_KEYLEN(entries, stopMiddle) == keylen)
+			difference = strncmp(HS_KEY(entries, base, stopMiddle), key, keylen);
 		else
-			difference = (StopMiddle->keylen > keylen) ? 1 : -1;
+			difference = (HS_KEYLEN(entries, stopMiddle) > keylen) ? 1 : -1;
 
 		if (difference == 0)
-			return StopMiddle;
+		{
+			if (lowbound)
+				*lowbound = stopMiddle + 1;
+			return stopMiddle;
+		}
 		else if (difference < 0)
-			StopLow = StopMiddle + 1;
+			stopLow = stopMiddle + 1;
 		else
-			StopHigh = StopMiddle;
+			stopHigh = stopMiddle;
 	}
 
-	return NULL;
+	if (lowbound)
+		*lowbound = stopLow;
+	return -1;
 }
 
-PG_FUNCTION_INFO_V1(fetchval);
-Datum		fetchval(PG_FUNCTION_ARGS);
+Pairs *
+hstoreArrayToPairs(ArrayType *a, int *npairs)
+{
+	Datum	   *key_datums;
+	bool	   *key_nulls;
+	int			key_count;
+	Pairs	   *key_pairs;
+	int			bufsiz;
+	int			i,
+				j;
+
+	deconstruct_array(a,
+					  TEXTOID, -1, false, 'i',
+					  &key_datums, &key_nulls, &key_count);
+
+	if (key_count == 0)
+	{
+		*npairs = 0;
+		return NULL;
+	}
+
+	key_pairs = palloc(sizeof(Pairs) * key_count);
+
+	for (i = 0, j = 0; i < key_count; i++)
+	{
+		if (!key_nulls[i])
+		{
+			key_pairs[j].key = VARDATA(key_datums[i]);
+			key_pairs[j].keylen = VARSIZE(key_datums[i]) - VARHDRSZ;
+			key_pairs[j].val = NULL;
+			key_pairs[j].vallen = 0;
+			key_pairs[j].needfree = 0;
+			key_pairs[j].isnull = 1;
+			j++;
+		}
+	}
+
+	*npairs = hstoreUniquePairs(key_pairs, j, &bufsiz);
+
+	return key_pairs;
+}
+
+
+PG_FUNCTION_INFO_V1(hstore_fetchval);
+Datum		hstore_fetchval(PG_FUNCTION_ARGS);
 Datum
-fetchval(PG_FUNCTION_ARGS)
+hstore_fetchval(PG_FUNCTION_ARGS)
 {
 	HStore	   *hs = PG_GETARG_HS(0);
-	text	   *key = PG_GETARG_TEXT_P(1);
-	HEntry	   *entry;
+	text	   *key = PG_GETARG_TEXT_PP(1);
+	HEntry	   *entries = ARRPTR(hs);
 	text	   *out;
+	int			idx = hstoreFindKey(hs, NULL,
+									VARDATA_ANY(key), VARSIZE_ANY_EXHDR(key));
 
-	if ((entry = findkey(hs, VARDATA(key), VARSIZE(key) - VARHDRSZ)) == NULL || entry->valisnull)
-	{
-		PG_FREE_IF_COPY(hs, 0);
-		PG_FREE_IF_COPY(key, 1);
+	if (idx < 0 || HS_VALISNULL(entries, idx))
 		PG_RETURN_NULL();
-	}
 
-	out = cstring_to_text_with_len(STRPTR(hs) + entry->pos + entry->keylen,
-								   entry->vallen);
+	out = cstring_to_text_with_len(HS_VAL(entries, STRPTR(hs), idx),
+								   HS_VALLEN(entries, idx));
 
-	PG_FREE_IF_COPY(hs, 0);
-	PG_FREE_IF_COPY(key, 1);
 	PG_RETURN_TEXT_P(out);
 }
 
-PG_FUNCTION_INFO_V1(exists);
-Datum		exists(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(hstore_exists);
+Datum		hstore_exists(PG_FUNCTION_ARGS);
 Datum
-exists(PG_FUNCTION_ARGS)
+hstore_exists(PG_FUNCTION_ARGS)
 {
 	HStore	   *hs = PG_GETARG_HS(0);
-	text	   *key = PG_GETARG_TEXT_P(1);
-	HEntry	   *entry;
+	text	   *key = PG_GETARG_TEXT_PP(1);
+	int			idx = hstoreFindKey(hs, NULL,
+									VARDATA_ANY(key), VARSIZE_ANY_EXHDR(key));
 
-	entry = findkey(hs, VARDATA(key), VARSIZE(key) - VARHDRSZ);
+	PG_RETURN_BOOL(idx >= 0);
+}
 
-	PG_FREE_IF_COPY(hs, 0);
-	PG_FREE_IF_COPY(key, 1);
 
-	PG_RETURN_BOOL(entry);
+PG_FUNCTION_INFO_V1(hstore_exists_any);
+Datum		hstore_exists_any(PG_FUNCTION_ARGS);
+Datum
+hstore_exists_any(PG_FUNCTION_ARGS)
+{
+	HStore	   *hs = PG_GETARG_HS(0);
+	ArrayType  *keys = PG_GETARG_ARRAYTYPE_P(1);
+	int			nkeys;
+	Pairs	   *key_pairs = hstoreArrayToPairs(keys, &nkeys);
+	int			i;
+	int			lowbound = 0;
+	bool		res = false;
+
+	/*
+	 * we exploit the fact that the pairs list is already sorted into strictly
+	 * increasing order to narrow the hstoreFindKey search; each search can
+	 * start one entry past the previous "found" entry, or at the lower bound
+	 * of the last search.
+	 */
+
+	for (i = 0; !res && i < nkeys; ++i)
+	{
+		int			idx = hstoreFindKey(hs, &lowbound,
+									  key_pairs[i].key, key_pairs[i].keylen);
+
+		if (idx >= 0)
+			res = true;
+	}
+
+	PG_RETURN_BOOL(res);
 }
 
-PG_FUNCTION_INFO_V1(defined);
-Datum		defined(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(hstore_exists_all);
+Datum		hstore_exists_all(PG_FUNCTION_ARGS);
 Datum
-defined(PG_FUNCTION_ARGS)
+hstore_exists_all(PG_FUNCTION_ARGS)
 {
 	HStore	   *hs = PG_GETARG_HS(0);
-	text	   *key = PG_GETARG_TEXT_P(1);
-	HEntry	   *entry;
-	bool		res;
+	ArrayType  *keys = PG_GETARG_ARRAYTYPE_P(1);
+	int			nkeys;
+	Pairs	   *key_pairs = hstoreArrayToPairs(keys, &nkeys);
+	int			i;
+	int			lowbound = 0;
+	bool		res = nkeys ? true : false;
 
-	entry = findkey(hs, VARDATA(key), VARSIZE(key) - VARHDRSZ);
+	/*
+	 * we exploit the fact that the pairs list is already sorted into strictly
+	 * increasing order to narrow the hstoreFindKey search; each search can
+	 * start one entry past the previous "found" entry, or at the lower bound
+	 * of the last search.
+	 */
 
-	res = (entry && !entry->valisnull) ? true : false;
+	for (i = 0; res && i < nkeys; ++i)
+	{
+		int			idx = hstoreFindKey(hs, &lowbound,
+									  key_pairs[i].key, key_pairs[i].keylen);
 
-	PG_FREE_IF_COPY(hs, 0);
-	PG_FREE_IF_COPY(key, 1);
+		if (idx < 0)
+			res = false;
+	}
 
 	PG_RETURN_BOOL(res);
 }
 
-PG_FUNCTION_INFO_V1(delete);
-Datum		delete(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(hstore_defined);
+Datum		hstore_defined(PG_FUNCTION_ARGS);
+Datum
+hstore_defined(PG_FUNCTION_ARGS)
+{
+	HStore	   *hs = PG_GETARG_HS(0);
+	text	   *key = PG_GETARG_TEXT_PP(1);
+	HEntry	   *entries = ARRPTR(hs);
+	int			idx = hstoreFindKey(hs, NULL,
+									VARDATA_ANY(key), VARSIZE_ANY_EXHDR(key));
+	bool		res = (idx >= 0 && !HS_VALISNULL(entries, idx));
+
+	PG_RETURN_BOOL(res);
+}
+
+
+PG_FUNCTION_INFO_V1(hstore_delete);
+Datum		hstore_delete(PG_FUNCTION_ARGS);
 Datum
-delete(PG_FUNCTION_ARGS)
+hstore_delete(PG_FUNCTION_ARGS)
 {
 	HStore	   *hs = PG_GETARG_HS(0);
-	text	   *key = PG_GETARG_TEXT_P(1);
+	text	   *key = PG_GETARG_TEXT_PP(1);
+	char	   *keyptr = VARDATA_ANY(key);
+	int			keylen = VARSIZE_ANY_EXHDR(key);
 	HStore	   *out = palloc(VARSIZE(hs));
-	char	   *ptrs,
+	char	   *bufs,
+			   *bufd,
 			   *ptrd;
 	HEntry	   *es,
 			   *ed;
+	int			i;
+	int			count = HS_COUNT(hs);
+	int			outcount = 0;
 
 	SET_VARSIZE(out, VARSIZE(hs));
-	out->size = hs->size;		/* temporary! */
+	HS_SETCOUNT(out, count);	/* temporary! */
 
-	ptrs = STRPTR(hs);
+	bufs = STRPTR(hs);
 	es = ARRPTR(hs);
-	ptrd = STRPTR(out);
+	bufd = ptrd = STRPTR(out);
 	ed = ARRPTR(out);
 
-	while (es - ARRPTR(hs) < hs->size)
+	for (i = 0; i < count; ++i)
 	{
-		if (!(es->keylen == VARSIZE(key) - VARHDRSZ && strncmp(ptrs, VARDATA(key), es->keylen) == 0))
+		int			len = HS_KEYLEN(es, i);
+		char	   *ptrs = HS_KEY(es, bufs, i);
+
+		if (!(len == keylen && strncmp(ptrs, keyptr, keylen) == 0))
 		{
-			memcpy(ed, es, sizeof(HEntry));
-			memcpy(ptrd, ptrs, es->keylen + ((es->valisnull) ? 0 : es->vallen));
-			ed->pos = ptrd - STRPTR(out);
-			ptrd += es->keylen + ((es->valisnull) ? 0 : es->vallen);
-			ed++;
+			int			vallen = HS_VALLEN(es, i);
+
+			HS_COPYITEM(ed, bufd, ptrd, ptrs, len, vallen, HS_VALISNULL(es, i));
+			++outcount;
 		}
-		ptrs += es->keylen + ((es->valisnull) ? 0 : es->vallen);
-		es++;
 	}
 
-	if (ed - ARRPTR(out) != out->size)
+	HS_FINALIZE(out, outcount, bufd, ptrd);
+
+	PG_RETURN_POINTER(out);
+}
+
+
+PG_FUNCTION_INFO_V1(hstore_delete_array);
+Datum		hstore_delete_array(PG_FUNCTION_ARGS);
+Datum
+hstore_delete_array(PG_FUNCTION_ARGS)
+{
+	HStore	   *hs = PG_GETARG_HS(0);
+	HStore	   *out = palloc(VARSIZE(hs));
+	int			hs_count = HS_COUNT(hs);
+	char	   *ps,
+			   *bufd,
+			   *pd;
+	HEntry	   *es,
+			   *ed;
+	int			i,
+				j;
+	int			outcount = 0;
+	ArrayType  *key_array = PG_GETARG_ARRAYTYPE_P(1);
+	int			nkeys;
+	Pairs	   *key_pairs = hstoreArrayToPairs(key_array, &nkeys);
+
+	SET_VARSIZE(out, VARSIZE(hs));
+	HS_SETCOUNT(out, hs_count); /* temporary! */
+
+	ps = STRPTR(hs);
+	es = ARRPTR(hs);
+	bufd = pd = STRPTR(out);
+	ed = ARRPTR(out);
+
+	if (nkeys == 0)
+	{
+		/* return a copy of the input, unchanged */
+		memcpy(out, hs, VARSIZE(hs));
+		HS_FIXSIZE(out, hs_count);
+		HS_SETCOUNT(out, hs_count);
+		PG_RETURN_POINTER(out);
+	}
+
+	/*
+	 * this is in effect a merge between hs and key_pairs, both of which are
+	 * already sorted by (keylen,key); we take keys from hs only
+	 */
+
+	for (i = j = 0; i < hs_count;)
 	{
-		int			buflen = ptrd - STRPTR(out);
+		int			difference;
+
+		if (j >= nkeys)
+			difference = -1;
+		else
+		{
+			int			skeylen = HS_KEYLEN(es, i);
+
+			if (skeylen == key_pairs[j].keylen)
+				difference = strncmp(HS_KEY(es, ps, i),
+									 key_pairs[j].key,
+									 key_pairs[j].keylen);
+			else
+				difference = (skeylen > key_pairs[j].keylen) ? 1 : -1;
+		}
 
-		ptrd = STRPTR(out);
+		if (difference > 0)
+			++j;
+		else if (difference == 0)
+			++i, ++j;
+		else
+		{
+			HS_COPYITEM(ed, bufd, pd,
+						HS_KEY(es, ps, i), HS_KEYLEN(es, i),
+						HS_VALLEN(es, i), HS_VALISNULL(es, i));
+			++outcount;
+			++i;
+		}
+	}
+
+	HS_FINALIZE(out, outcount, bufd, pd);
+
+	PG_RETURN_POINTER(out);
+}
+
+
+PG_FUNCTION_INFO_V1(hstore_delete_hstore);
+Datum		hstore_delete_hstore(PG_FUNCTION_ARGS);
+Datum
+hstore_delete_hstore(PG_FUNCTION_ARGS)
+{
+	HStore	   *hs = PG_GETARG_HS(0);
+	HStore	   *hs2 = PG_GETARG_HS(1);
+	HStore	   *out = palloc(VARSIZE(hs));
+	int			hs_count = HS_COUNT(hs);
+	int			hs2_count = HS_COUNT(hs2);
+	char	   *ps,
+			   *ps2,
+			   *bufd,
+			   *pd;
+	HEntry	   *es,
+			   *es2,
+			   *ed;
+	int			i,
+				j;
+	int			outcount = 0;
+
+	SET_VARSIZE(out, VARSIZE(hs));
+	HS_SETCOUNT(out, hs_count); /* temporary! */
 
-		out->size = ed - ARRPTR(out);
+	ps = STRPTR(hs);
+	es = ARRPTR(hs);
+	ps2 = STRPTR(hs2);
+	es2 = ARRPTR(hs2);
+	bufd = pd = STRPTR(out);
+	ed = ARRPTR(out);
 
-		memmove(STRPTR(out), ptrd, buflen);
-		SET_VARSIZE(out, CALCDATASIZE(out->size, buflen));
+	if (hs2_count == 0)
+	{
+		/* return a copy of the input, unchanged */
+		memcpy(out, hs, VARSIZE(hs));
+		HS_FIXSIZE(out, hs_count);
+		HS_SETCOUNT(out, hs_count);
+		PG_RETURN_POINTER(out);
 	}
 
+	/*
+	 * this is in effect a merge between hs and hs2, both of which are already
+	 * sorted by (keylen,key); we take keys from hs only; for equal keys, we
+	 * take the value from hs unless the values are equal
+	 */
 
-	PG_FREE_IF_COPY(hs, 0);
-	PG_FREE_IF_COPY(key, 1);
+	for (i = j = 0; i < hs_count;)
+	{
+		int			difference;
+
+		if (j >= hs2_count)
+			difference = -1;
+		else
+		{
+			int			skeylen = HS_KEYLEN(es, i);
+			int			s2keylen = HS_KEYLEN(es2, j);
+
+			if (skeylen == s2keylen)
+				difference = strncmp(HS_KEY(es, ps, i),
+									 HS_KEY(es2, ps2, j),
+									 skeylen);
+			else
+				difference = (skeylen > s2keylen) ? 1 : -1;
+		}
+
+		if (difference > 0)
+			++j;
+		else if (difference == 0)
+		{
+			int			svallen = HS_VALLEN(es, i);
+			int			snullval = HS_VALISNULL(es, i);
+
+			if (snullval != HS_VALISNULL(es2, j)
+				|| (!snullval
+					&& (svallen != HS_VALLEN(es2, j)
+						|| strncmp(HS_VAL(es, ps, i), HS_VAL(es2, ps2, j), svallen) != 0)))
+			{
+				HS_COPYITEM(ed, bufd, pd,
+							HS_KEY(es, ps, i), HS_KEYLEN(es, i),
+							svallen, snullval);
+				++outcount;
+			}
+			++i, ++j;
+		}
+		else
+		{
+			HS_COPYITEM(ed, bufd, pd,
+						HS_KEY(es, ps, i), HS_KEYLEN(es, i),
+						HS_VALLEN(es, i), HS_VALISNULL(es, i));
+			++outcount;
+			++i;
+		}
+	}
+
+	HS_FINALIZE(out, outcount, bufd, pd);
 
 	PG_RETURN_POINTER(out);
 }
 
-PG_FUNCTION_INFO_V1(hs_concat);
-Datum		hs_concat(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(hstore_concat);
+Datum		hstore_concat(PG_FUNCTION_ARGS);
 Datum
-hs_concat(PG_FUNCTION_ARGS)
+hstore_concat(PG_FUNCTION_ARGS)
 {
 	HStore	   *s1 = PG_GETARG_HS(0);
 	HStore	   *s2 = PG_GETARG_HS(1);
 	HStore	   *out = palloc(VARSIZE(s1) + VARSIZE(s2));
 	char	   *ps1,
 			   *ps2,
+			   *bufd,
 			   *pd;
 	HEntry	   *es1,
 			   *es2,
 			   *ed;
+	int			s1idx;
+	int			s2idx;
+	int			s1count = HS_COUNT(s1);
+	int			s2count = HS_COUNT(s2);
+	int			outcount = 0;
+
+	SET_VARSIZE(out, VARSIZE(s1) + VARSIZE(s2) - HSHRDSIZE);
+	HS_SETCOUNT(out, s1count + s2count);
 
-	SET_VARSIZE(out, VARSIZE(s1) + VARSIZE(s2));
-	out->size = s1->size + s2->size;
+	if (s1count == 0)
+	{
+		/* return a copy of the input, unchanged */
+		memcpy(out, s2, VARSIZE(s2));
+		HS_FIXSIZE(out, s2count);
+		HS_SETCOUNT(out, s2count);
+		PG_RETURN_POINTER(out);
+	}
+
+	if (s2count == 0)
+	{
+		/* return a copy of the input, unchanged */
+		memcpy(out, s1, VARSIZE(s1));
+		HS_FIXSIZE(out, s1count);
+		HS_SETCOUNT(out, s1count);
+		PG_RETURN_POINTER(out);
+	}
 
 	ps1 = STRPTR(s1);
 	ps2 = STRPTR(s2);
-	pd = STRPTR(out);
+	bufd = pd = STRPTR(out);
 	es1 = ARRPTR(s1);
 	es2 = ARRPTR(s2);
 	ed = ARRPTR(out);
 
-	while (es1 - ARRPTR(s1) < s1->size && es2 - ARRPTR(s2) < s2->size)
+	/*
+	 * this is in effect a merge between s1 and s2, both of which are already
+	 * sorted by (keylen,key); we take s2 for equal keys
+	 */
+
+	for (s1idx = s2idx = 0; s1idx < s1count || s2idx < s2count; ++outcount)
 	{
 		int			difference;
 
-		if (es1->keylen == es2->keylen)
-			difference = strncmp(ps1, ps2, es1->keylen);
+		if (s1idx >= s1count)
+			difference = 1;
+		else if (s2idx >= s2count)
+			difference = -1;
 		else
-			difference = (es1->keylen > es2->keylen) ? 1 : -1;
-
-		if (difference == 0)
 		{
-			memcpy(ed, es2, sizeof(HEntry));
-			memcpy(pd, ps2, es2->keylen + ((es2->valisnull) ? 0 : es2->vallen));
-			ed->pos = pd - STRPTR(out);
-			pd += es2->keylen + ((es2->valisnull) ? 0 : es2->vallen);
-			ed++;
-
-			ps1 += es1->keylen + ((es1->valisnull) ? 0 : es1->vallen);
-			es1++;
-			ps2 += es2->keylen + ((es2->valisnull) ? 0 : es2->vallen);
-			es2++;
+			int			s1keylen = HS_KEYLEN(es1, s1idx);
+			int			s2keylen = HS_KEYLEN(es2, s2idx);
+
+			if (s1keylen == s2keylen)
+				difference = strncmp(HS_KEY(es1, ps1, s1idx),
+									 HS_KEY(es2, ps2, s2idx),
+									 s1keylen);
+			else
+				difference = (s1keylen > s2keylen) ? 1 : -1;
 		}
-		else if (difference > 0)
+
+		if (difference >= 0)
 		{
-			memcpy(ed, es2, sizeof(HEntry));
-			memcpy(pd, ps2, es2->keylen + ((es2->valisnull) ? 0 : es2->vallen));
-			ed->pos = pd - STRPTR(out);
-			pd += es2->keylen + ((es2->valisnull) ? 0 : es2->vallen);
-			ed++;
-
-			ps2 += es2->keylen + ((es2->valisnull) ? 0 : es2->vallen);
-			es2++;
+			HS_COPYITEM(ed, bufd, pd,
+						HS_KEY(es2, ps2, s2idx), HS_KEYLEN(es2, s2idx),
+						HS_VALLEN(es2, s2idx), HS_VALISNULL(es2, s2idx));
+			++s2idx;
+			if (difference == 0)
+				++s1idx;
 		}
 		else
 		{
-			memcpy(ed, es1, sizeof(HEntry));
-			memcpy(pd, ps1, es1->keylen + ((es1->valisnull) ? 0 : es1->vallen));
-			ed->pos = pd - STRPTR(out);
-			pd += es1->keylen + ((es1->valisnull) ? 0 : es1->vallen);
-			ed++;
-
-			ps1 += es1->keylen + ((es1->valisnull) ? 0 : es1->vallen);
-			es1++;
+			HS_COPYITEM(ed, bufd, pd,
+						HS_KEY(es1, ps1, s1idx), HS_KEYLEN(es1, s1idx),
+						HS_VALLEN(es1, s1idx), HS_VALISNULL(es1, s1idx));
+			++s1idx;
 		}
 	}
 
-	while (es1 - ARRPTR(s1) < s1->size)
-	{
-		memcpy(ed, es1, sizeof(HEntry));
-		memcpy(pd, ps1, es1->keylen + ((es1->valisnull) ? 0 : es1->vallen));
-		ed->pos = pd - STRPTR(out);
-		pd += es1->keylen + ((es1->valisnull) ? 0 : es1->vallen);
-		ed++;
+	HS_FINALIZE(out, outcount, bufd, pd);
 
-		ps1 += es1->keylen + ((es1->valisnull) ? 0 : es1->vallen);
-		es1++;
-	}
+	PG_RETURN_POINTER(out);
+}
 
-	while (es2 - ARRPTR(s2) < s2->size)
-	{
-		memcpy(ed, es2, sizeof(HEntry));
-		memcpy(pd, ps2, es2->keylen + ((es2->valisnull) ? 0 : es2->vallen));
-		ed->pos = pd - STRPTR(out);
-		pd += es2->keylen + ((es2->valisnull) ? 0 : es2->vallen);
-		ed++;
 
-		ps2 += es2->keylen + ((es2->valisnull) ? 0 : es2->vallen);
-		es2++;
-	}
+PG_FUNCTION_INFO_V1(hstore_slice_to_array);
+Datum		hstore_slice_to_array(PG_FUNCTION_ARGS);
+Datum
+hstore_slice_to_array(PG_FUNCTION_ARGS)
+{
+	HStore	   *hs = PG_GETARG_HS(0);
+	HEntry	   *entries = ARRPTR(hs);
+	char	   *ptr = STRPTR(hs);
+	ArrayType  *key_array = PG_GETARG_ARRAYTYPE_P(1);
+	ArrayType  *aout;
+	Datum	   *key_datums;
+	bool	   *key_nulls;
+	Datum	   *out_datums;
+	bool	   *out_nulls;
+	int			key_count;
+	int			i;
 
-	if (ed - ARRPTR(out) != out->size)
+	deconstruct_array(key_array,
+					  TEXTOID, -1, false, 'i',
+					  &key_datums, &key_nulls, &key_count);
+
+	if (key_count == 0)
 	{
-		int			buflen = pd - STRPTR(out);
+		aout = construct_empty_array(TEXTOID);
+		PG_RETURN_POINTER(aout);
+	}
 
-		pd = STRPTR(out);
+	out_datums = palloc(sizeof(Datum) * key_count);
+	out_nulls = palloc(sizeof(bool) * key_count);
 
-		out->size = ed - ARRPTR(out);
+	for (i = 0; i < key_count; ++i)
+	{
+		text	   *key = (text *) DatumGetPointer(key_datums[i]);
+		int			idx;
+
+		if (key_nulls[i])
+			idx = -1;
+		else
+			idx = hstoreFindKey(hs, NULL, VARDATA(key), VARSIZE(key) - VARHDRSZ);
 
-		memmove(STRPTR(out), pd, buflen);
-		SET_VARSIZE(out, CALCDATASIZE(out->size, buflen));
+		if (idx < 0 || HS_VALISNULL(entries, idx))
+		{
+			out_nulls[i] = true;
+			out_datums[i] = (Datum) 0;
+		}
+		else
+		{
+			out_datums[i] = PointerGetDatum(
+						  cstring_to_text_with_len(HS_VAL(entries, ptr, idx),
+												   HS_VALLEN(entries, idx)));
+			out_nulls[i] = false;
+		}
 	}
 
-	PG_FREE_IF_COPY(s1, 0);
-	PG_FREE_IF_COPY(s2, 1);
+	aout = construct_md_array(out_datums, out_nulls,
+							  ARR_NDIM(key_array),
+							  ARR_DIMS(key_array),
+							  ARR_LBOUND(key_array),
+							  TEXTOID, -1, false, 'i');
 
-	PG_RETURN_POINTER(out);
+	PG_RETURN_POINTER(aout);
 }
 
-PG_FUNCTION_INFO_V1(tconvert);
-Datum		tconvert(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(hstore_slice_to_hstore);
+Datum		hstore_slice_to_hstore(PG_FUNCTION_ARGS);
 Datum
-tconvert(PG_FUNCTION_ARGS)
+hstore_slice_to_hstore(PG_FUNCTION_ARGS)
 {
-	text	   *key;
-	text	   *val = NULL;
-	int			len;
+	HStore	   *hs = PG_GETARG_HS(0);
+	HEntry	   *entries = ARRPTR(hs);
+	char	   *ptr = STRPTR(hs);
+	ArrayType  *key_array = PG_GETARG_ARRAYTYPE_P(1);
 	HStore	   *out;
+	int			nkeys;
+	Pairs	   *key_pairs = hstoreArrayToPairs(key_array, &nkeys);
+	Pairs	   *out_pairs;
+	int			bufsiz;
+	int			lastidx = 0;
+	int			i;
+	int			out_count = 0;
 
-	if (PG_ARGISNULL(0))
-		PG_RETURN_NULL();
-
-	key = PG_GETARG_TEXT_P(0);
-
-	if (PG_ARGISNULL(1))
-		len = CALCDATASIZE(1, VARSIZE(key));
-	else
+	if (nkeys == 0)
 	{
-		val = PG_GETARG_TEXT_P(1);
-		len = CALCDATASIZE(1, VARSIZE(key) + VARSIZE(val) - 2 * VARHDRSZ);
+		out = hstorePairs(NULL, 0, 0);
+		PG_RETURN_POINTER(out);
 	}
-	out = palloc(len);
-	SET_VARSIZE(out, len);
-	out->size = 1;
 
-	ARRPTR(out)->keylen = hstoreCheckKeyLen(VARSIZE(key) - VARHDRSZ);
-	if (PG_ARGISNULL(1))
-	{
-		ARRPTR(out)->vallen = 0;
-		ARRPTR(out)->valisnull = true;
-	}
-	else
-	{
-		ARRPTR(out)->vallen = hstoreCheckValLen(VARSIZE(val) - VARHDRSZ);
-		ARRPTR(out)->valisnull = false;
-	}
-	ARRPTR(out)->pos = 0;
+	out_pairs = palloc(sizeof(Pairs) * nkeys);
+	bufsiz = 0;
 
-	memcpy(STRPTR(out), VARDATA(key), ARRPTR(out)->keylen);
-	if (!PG_ARGISNULL(1))
+	/*
+	 * we exploit the fact that the pairs list is already sorted into strictly
+	 * increasing order to narrow the hstoreFindKey search; each search can
+	 * start one entry past the previous "found" entry, or at the lower bound
+	 * of the last search.
+	 */
+
+	for (i = 0; i < nkeys; ++i)
 	{
-		memcpy(STRPTR(out) + ARRPTR(out)->keylen, VARDATA(val), ARRPTR(out)->vallen);
-		PG_FREE_IF_COPY(val, 1);
+		int			idx = hstoreFindKey(hs, &lastidx,
+									  key_pairs[i].key, key_pairs[i].keylen);
+
+		if (idx >= 0)
+		{
+			out_pairs[out_count].key = key_pairs[i].key;
+			bufsiz += (out_pairs[out_count].keylen = key_pairs[i].keylen);
+			out_pairs[out_count].val = HS_VAL(entries, ptr, idx);
+			bufsiz += (out_pairs[out_count].vallen = HS_VALLEN(entries, idx));
+			out_pairs[out_count].isnull = HS_VALISNULL(entries, idx);
+			out_pairs[out_count].needfree = false;
+			++out_count;
+		}
 	}
 
-	PG_FREE_IF_COPY(key, 0);
+	/*
+	 * we don't use uniquePairs here because we know that the pairs list is
+	 * already sorted and uniq'ed.
+	 */
+
+	out = hstorePairs(out_pairs, out_count, bufsiz);
 
 	PG_RETURN_POINTER(out);
 }
 
-PG_FUNCTION_INFO_V1(akeys);
-Datum		akeys(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(hstore_akeys);
+Datum		hstore_akeys(PG_FUNCTION_ARGS);
 Datum
-akeys(PG_FUNCTION_ARGS)
+hstore_akeys(PG_FUNCTION_ARGS)
 {
 	HStore	   *hs = PG_GETARG_HS(0);
 	Datum	   *d;
 	ArrayType  *a;
-	HEntry	   *ptr = ARRPTR(hs);
+	HEntry	   *entries = ARRPTR(hs);
 	char	   *base = STRPTR(hs);
+	int			count = HS_COUNT(hs);
+	int			i;
 
-	d = (Datum *) palloc(sizeof(Datum) * (hs->size + 1));
-	while (ptr - ARRPTR(hs) < hs->size)
+	if (count == 0)
 	{
-		text	   *item;
-
-		item = cstring_to_text_with_len(base + ptr->pos, ptr->keylen);
-		d[ptr - ARRPTR(hs)] = PointerGetDatum(item);
-		ptr++;
+		a = construct_empty_array(TEXTOID);
+		PG_RETURN_POINTER(a);
 	}
 
-	a = construct_array(d,
-						hs->size,
-						TEXTOID,
-						-1,
-						false,
-						'i');
+	d = (Datum *) palloc(sizeof(Datum) * count);
 
-	ptr = ARRPTR(hs);
-	while (ptr - ARRPTR(hs) < hs->size)
+	for (i = 0; i < count; ++i)
 	{
-		pfree(DatumGetPointer(d[ptr - ARRPTR(hs)]));
-		ptr++;
+		text	   *item = cstring_to_text_with_len(HS_KEY(entries, base, i),
+													HS_KEYLEN(entries, i));
+
+		d[i] = PointerGetDatum(item);
 	}
 
-	pfree(d);
-	PG_FREE_IF_COPY(hs, 0);
+	a = construct_array(d, count,
+						TEXTOID, -1, false, 'i');
 
 	PG_RETURN_POINTER(a);
 }
 
-PG_FUNCTION_INFO_V1(avals);
-Datum		avals(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(hstore_avals);
+Datum		hstore_avals(PG_FUNCTION_ARGS);
 Datum
-avals(PG_FUNCTION_ARGS)
+hstore_avals(PG_FUNCTION_ARGS)
 {
 	HStore	   *hs = PG_GETARG_HS(0);
 	Datum	   *d;
+	bool	   *nulls;
 	ArrayType  *a;
-	HEntry	   *ptr = ARRPTR(hs);
+	HEntry	   *entries = ARRPTR(hs);
 	char	   *base = STRPTR(hs);
+	int			count = HS_COUNT(hs);
+	int			lb = 1;
+	int			i;
 
-	d = (Datum *) palloc(sizeof(Datum) * (hs->size + 1));
-	while (ptr - ARRPTR(hs) < hs->size)
+	if (count == 0)
 	{
-		text	   *item;
-
-		item = cstring_to_text_with_len(base + ptr->pos + ptr->keylen,
-										(ptr->valisnull) ? 0 : ptr->vallen);
-		d[ptr - ARRPTR(hs)] = PointerGetDatum(item);
-		ptr++;
+		a = construct_empty_array(TEXTOID);
+		PG_RETURN_POINTER(a);
 	}
 
-	a = construct_array(d,
-						hs->size,
-						TEXTOID,
-						-1,
-						false,
-						'i');
+	d = (Datum *) palloc(sizeof(Datum) * count);
+	nulls = (bool *) palloc(sizeof(bool) * count);
 
-	ptr = ARRPTR(hs);
-	while (ptr - ARRPTR(hs) < hs->size)
+	for (i = 0; i < count; ++i)
 	{
-		pfree(DatumGetPointer(d[ptr - ARRPTR(hs)]));
-		ptr++;
+		if (HS_VALISNULL(entries, i))
+		{
+			d[i] = (Datum) 0;
+			nulls[i] = true;
+		}
+		else
+		{
+			text	   *item = cstring_to_text_with_len(HS_VAL(entries, base, i),
+													  HS_VALLEN(entries, i));
+
+			d[i] = PointerGetDatum(item);
+			nulls[i] = false;
+		}
 	}
 
-	pfree(d);
-	PG_FREE_IF_COPY(hs, 0);
+	a = construct_md_array(d, nulls, 1, &count, &lb,
+						   TEXTOID, -1, false, 'i');
 
 	PG_RETURN_POINTER(a);
 }
 
-typedef struct
+
+static ArrayType *
+hstore_to_array_internal(HStore *hs, int ndims)
 {
-	HStore	   *hs;
+	HEntry	   *entries = ARRPTR(hs);
+	char	   *base = STRPTR(hs);
+	int			count = HS_COUNT(hs);
+	int			out_size[2] = {0, 2};
+	int			lb[2] = {1, 1};
+	Datum	   *out_datums;
+	bool	   *out_nulls;
 	int			i;
-} AKStore;
+
+	Assert(ndims < 3);
+
+	if (count == 0 || ndims == 0)
+		return construct_empty_array(TEXTOID);
+
+	out_size[0] = count * 2 / ndims;
+	out_datums = palloc(sizeof(Datum) * count * 2);
+	out_nulls = palloc(sizeof(bool) * count * 2);
+
+	for (i = 0; i < count; ++i)
+	{
+		text	   *key = cstring_to_text_with_len(HS_KEY(entries, base, i),
+												   HS_KEYLEN(entries, i));
+
+		out_datums[i * 2] = PointerGetDatum(key);
+		out_nulls[i * 2] = false;
+
+		if (HS_VALISNULL(entries, i))
+		{
+			out_datums[i * 2 + 1] = (Datum) 0;
+			out_nulls[i * 2 + 1] = true;
+		}
+		else
+		{
+			text	   *item = cstring_to_text_with_len(HS_VAL(entries, base, i),
+													  HS_VALLEN(entries, i));
+
+			out_datums[i * 2 + 1] = PointerGetDatum(item);
+			out_nulls[i * 2 + 1] = false;
+		}
+	}
+
+	return construct_md_array(out_datums, out_nulls,
+							  ndims, out_size, lb,
+							  TEXTOID, -1, false, 'i');
+}
+
+PG_FUNCTION_INFO_V1(hstore_to_array);
+Datum		hstore_to_array(PG_FUNCTION_ARGS);
+Datum
+hstore_to_array(PG_FUNCTION_ARGS)
+{
+	HStore	   *hs = PG_GETARG_HS(0);
+	ArrayType  *out = hstore_to_array_internal(hs, 1);
+
+	PG_RETURN_POINTER(out);
+}
+
+PG_FUNCTION_INFO_V1(hstore_to_matrix);
+Datum		hstore_to_matrix(PG_FUNCTION_ARGS);
+Datum
+hstore_to_matrix(PG_FUNCTION_ARGS)
+{
+	HStore	   *hs = PG_GETARG_HS(0);
+	ArrayType  *out = hstore_to_array_internal(hs, 2);
+
+	PG_RETURN_POINTER(out);
+}
+
+/*
+ * Common initialization function for the various set-returning
+ * funcs. fcinfo is only passed if the function is to return a
+ * composite; it will be used to look up the return tupledesc.
+ * we stash a copy of the hstore in the multi-call context in
+ * case it was originally toasted. (At least I assume that's why;
+ * there was no explanatory comment in the original code. --AG)
+ */
 
 static void
-setup_firstcall(FuncCallContext *funcctx, HStore *hs)
+setup_firstcall(FuncCallContext *funcctx, HStore *hs,
+				FunctionCallInfoData *fcinfo)
 {
 	MemoryContext oldcontext;
-	AKStore    *st;
+	HStore	   *st;
 
 	oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
 
-	st = (AKStore *) palloc(sizeof(AKStore));
-	st->i = 0;
-	st->hs = (HStore *) palloc(VARSIZE(hs));
-	memcpy(st->hs, hs, VARSIZE(hs));
+	st = (HStore *) palloc(VARSIZE(hs));
+	memcpy(st, hs, VARSIZE(hs));
 
 	funcctx->user_fctx = (void *) st;
+
+	if (fcinfo)
+	{
+		TupleDesc	tupdesc;
+
+		/* Build a tuple descriptor for our result type */
+		if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
+			elog(ERROR, "return type must be a row type");
+
+		funcctx->tuple_desc = BlessTupleDesc(tupdesc);
+	}
+
 	MemoryContextSwitchTo(oldcontext);
 }
 
-PG_FUNCTION_INFO_V1(skeys);
-Datum		skeys(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(hstore_skeys);
+Datum		hstore_skeys(PG_FUNCTION_ARGS);
 Datum
-skeys(PG_FUNCTION_ARGS)
+hstore_skeys(PG_FUNCTION_ARGS)
 {
 	FuncCallContext *funcctx;
-	AKStore    *st;
+	HStore	   *hs;
+	int			i;
 
 	if (SRF_IS_FIRSTCALL())
 	{
-		HStore	   *hs = PG_GETARG_HS(0);
-
+		hs = PG_GETARG_HS(0);
 		funcctx = SRF_FIRSTCALL_INIT();
-		setup_firstcall(funcctx, hs);
-		PG_FREE_IF_COPY(hs, 0);
+		setup_firstcall(funcctx, hs, NULL);
 	}
 
 	funcctx = SRF_PERCALL_SETUP();
-	st = (AKStore *) funcctx->user_fctx;
+	hs = (HStore *) funcctx->user_fctx;
+	i = funcctx->call_cntr;
 
-	if (st->i < st->hs->size)
+	if (i < HS_COUNT(hs))
 	{
-		HEntry	   *ptr = &(ARRPTR(st->hs)[st->i]);
+		HEntry	   *entries = ARRPTR(hs);
 		text	   *item;
 
-		item = cstring_to_text_with_len(STRPTR(st->hs) + ptr->pos,
-										ptr->keylen);
-		st->i++;
+		item = cstring_to_text_with_len(HS_KEY(entries, STRPTR(hs), i),
+										HS_KEYLEN(entries, i));
 
 		SRF_RETURN_NEXT(funcctx, PointerGetDatum(item));
 	}
 
-	pfree(st->hs);
-	pfree(st);
-
 	SRF_RETURN_DONE(funcctx);
 }
 
-PG_FUNCTION_INFO_V1(svals);
-Datum		svals(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(hstore_svals);
+Datum		hstore_svals(PG_FUNCTION_ARGS);
 Datum
-svals(PG_FUNCTION_ARGS)
+hstore_svals(PG_FUNCTION_ARGS)
 {
 	FuncCallContext *funcctx;
-	AKStore    *st;
+	HStore	   *hs;
+	int			i;
 
 	if (SRF_IS_FIRSTCALL())
 	{
-		HStore	   *hs = PG_GETARG_HS(0);
-
+		hs = PG_GETARG_HS(0);
 		funcctx = SRF_FIRSTCALL_INIT();
-		setup_firstcall(funcctx, hs);
-		PG_FREE_IF_COPY(hs, 0);
+		setup_firstcall(funcctx, hs, NULL);
 	}
 
 	funcctx = SRF_PERCALL_SETUP();
-	st = (AKStore *) funcctx->user_fctx;
+	hs = (HStore *) funcctx->user_fctx;
+	i = funcctx->call_cntr;
 
-	if (st->i < st->hs->size)
+	if (i < HS_COUNT(hs))
 	{
-		HEntry	   *ptr = &(ARRPTR(st->hs)[st->i]);
+		HEntry	   *entries = ARRPTR(hs);
 
-		if (ptr->valisnull)
+		if (HS_VALISNULL(entries, i))
 		{
 			ReturnSetInfo *rsi;
 
-			st->i++;
+			/* ugly ugly ugly. why no macro for this? */
 			(funcctx)->call_cntr++;
 			rsi = (ReturnSetInfo *) fcinfo->resultinfo;
 			rsi->isDone = ExprMultipleResult;
@@ -502,144 +949,313 @@ svals(PG_FUNCTION_ARGS)
 		{
 			text	   *item;
 
-			item = cstring_to_text_with_len(STRPTR(st->hs) + ptr->pos + ptr->keylen,
-											ptr->vallen);
-			st->i++;
+			item = cstring_to_text_with_len(HS_VAL(entries, STRPTR(hs), i),
+											HS_VALLEN(entries, i));
 
 			SRF_RETURN_NEXT(funcctx, PointerGetDatum(item));
 		}
 	}
 
-	pfree(st->hs);
-	pfree(st);
-
 	SRF_RETURN_DONE(funcctx);
 }
 
-PG_FUNCTION_INFO_V1(hs_contains);
-Datum		hs_contains(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(hstore_contains);
+Datum		hstore_contains(PG_FUNCTION_ARGS);
 Datum
-hs_contains(PG_FUNCTION_ARGS)
+hstore_contains(PG_FUNCTION_ARGS)
 {
 	HStore	   *val = PG_GETARG_HS(0);
 	HStore	   *tmpl = PG_GETARG_HS(1);
 	bool		res = true;
 	HEntry	   *te = ARRPTR(tmpl);
-	char	   *vv = STRPTR(val);
-	char	   *tv = STRPTR(tmpl);
+	char	   *tstr = STRPTR(tmpl);
+	HEntry	   *ve = ARRPTR(val);
+	char	   *vstr = STRPTR(val);
+	int			tcount = HS_COUNT(tmpl);
+	int			lastidx = 0;
+	int			i;
 
-	while (res && te - ARRPTR(tmpl) < tmpl->size)
+	/*
+	 * we exploit the fact that keys in "tmpl" are in strictly increasing
+	 * order to narrow the hstoreFindKey search; each search can start one
+	 * entry past the previous "found" entry, or at the lower bound of the
+	 * search
+	 */
+
+	for (i = 0; res && i < tcount; ++i)
 	{
-		HEntry	   *entry = findkey(val, tv + te->pos, te->keylen);
+		int			idx = hstoreFindKey(val, &lastidx,
+									  HS_KEY(te, tstr, i), HS_KEYLEN(te, i));
 
-		if (entry)
+		if (idx >= 0)
 		{
-			if (te->valisnull || entry->valisnull)
-			{
-				if (!(te->valisnull && entry->valisnull))
-					res = false;
-			}
-			else if (te->vallen != entry->vallen ||
-					 strncmp(vv + entry->pos + entry->keylen,
-							 tv + te->pos + te->keylen,
-							 te->vallen))
+			bool		nullval = HS_VALISNULL(te, i);
+			int			vallen = HS_VALLEN(te, i);
+
+			if (nullval != HS_VALISNULL(ve, idx)
+				|| (!nullval
+					&& (vallen != HS_VALLEN(ve, idx)
+			|| strncmp(HS_VAL(te, tstr, i), HS_VAL(ve, vstr, idx), vallen))))
 				res = false;
 		}
 		else
 			res = false;
-		te++;
 	}
 
-	PG_FREE_IF_COPY(val, 0);
-	PG_FREE_IF_COPY(tmpl, 1);
-
 	PG_RETURN_BOOL(res);
 }
 
-PG_FUNCTION_INFO_V1(hs_contained);
-Datum		hs_contained(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(hstore_contained);
+Datum		hstore_contained(PG_FUNCTION_ARGS);
 Datum
-hs_contained(PG_FUNCTION_ARGS)
+hstore_contained(PG_FUNCTION_ARGS)
 {
-	PG_RETURN_DATUM(DirectFunctionCall2(
-										hs_contains,
+	PG_RETURN_DATUM(DirectFunctionCall2(hstore_contains,
 										PG_GETARG_DATUM(1),
 										PG_GETARG_DATUM(0)
 										));
 }
 
-PG_FUNCTION_INFO_V1(each);
-Datum		each(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(hstore_each);
+Datum		hstore_each(PG_FUNCTION_ARGS);
 Datum
-each(PG_FUNCTION_ARGS)
+hstore_each(PG_FUNCTION_ARGS)
 {
 	FuncCallContext *funcctx;
-	AKStore    *st;
+	HStore	   *hs;
+	int			i;
 
 	if (SRF_IS_FIRSTCALL())
 	{
-		TupleDesc	tupdesc;
-		MemoryContext oldcontext;
-		HStore	   *hs = PG_GETARG_HS(0);
-
+		hs = PG_GETARG_HS(0);
 		funcctx = SRF_FIRSTCALL_INIT();
-		oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
-		st = (AKStore *) palloc(sizeof(AKStore));
-		st->i = 0;
-		st->hs = (HStore *) palloc(VARSIZE(hs));
-		memcpy(st->hs, hs, VARSIZE(hs));
-		funcctx->user_fctx = (void *) st;
-
-		/* Build a tuple descriptor for our result type */
-		if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
-			elog(ERROR, "return type must be a row type");
-
-		funcctx->attinmeta = TupleDescGetAttInMetadata(tupdesc);
-
-		MemoryContextSwitchTo(oldcontext);
-		PG_FREE_IF_COPY(hs, 0);
+		setup_firstcall(funcctx, hs, fcinfo);
 	}
 
 	funcctx = SRF_PERCALL_SETUP();
-	st = (AKStore *) funcctx->user_fctx;
+	hs = (HStore *) funcctx->user_fctx;
+	i = funcctx->call_cntr;
 
-	if (st->i < st->hs->size)
+	if (i < HS_COUNT(hs))
 	{
-		HEntry	   *ptr = &(ARRPTR(st->hs)[st->i]);
+		HEntry	   *entries = ARRPTR(hs);
+		char	   *ptr = STRPTR(hs);
 		Datum		res,
 					dvalues[2];
 		bool		nulls[2] = {false, false};
 		text	   *item;
 		HeapTuple	tuple;
 
-		item = cstring_to_text_with_len(STRPTR(st->hs) + ptr->pos, ptr->keylen);
+		item = cstring_to_text_with_len(HS_KEY(entries, ptr, i),
+										HS_KEYLEN(entries, i));
 		dvalues[0] = PointerGetDatum(item);
 
-		if (ptr->valisnull)
+		if (HS_VALISNULL(entries, i))
 		{
 			dvalues[1] = (Datum) 0;
 			nulls[1] = true;
 		}
 		else
 		{
-			item = cstring_to_text_with_len(STRPTR(st->hs) + ptr->pos + ptr->keylen,
-											ptr->vallen);
+			item = cstring_to_text_with_len(HS_VAL(entries, ptr, i),
+											HS_VALLEN(entries, i));
 			dvalues[1] = PointerGetDatum(item);
 		}
-		st->i++;
 
-		tuple = heap_form_tuple(funcctx->attinmeta->tupdesc, dvalues, nulls);
+		tuple = heap_form_tuple(funcctx->tuple_desc, dvalues, nulls);
 		res = HeapTupleGetDatum(tuple);
 
-		pfree(DatumGetPointer(dvalues[0]));
-		if (!nulls[1])
-			pfree(DatumGetPointer(dvalues[1]));
-
 		SRF_RETURN_NEXT(funcctx, PointerGetDatum(res));
 	}
 
-	pfree(st->hs);
-	pfree(st);
-
 	SRF_RETURN_DONE(funcctx);
 }
+
+
+/*
+ * btree sort order for hstores isn't intended to be useful; we really only
+ * care about equality versus non-equality.  we compare the entire string
+ * buffer first, then the entry pos array.
+ */
+
+PG_FUNCTION_INFO_V1(hstore_cmp);
+Datum		hstore_cmp(PG_FUNCTION_ARGS);
+Datum
+hstore_cmp(PG_FUNCTION_ARGS)
+{
+	HStore	   *hs1 = PG_GETARG_HS(0);
+	HStore	   *hs2 = PG_GETARG_HS(1);
+	int			hcount1 = HS_COUNT(hs1);
+	int			hcount2 = HS_COUNT(hs2);
+	int			res = 0;
+
+	if (hcount1 == 0 || hcount2 == 0)
+	{
+		/*
+		 * if either operand is empty, and the other is nonempty, the nonempty
+		 * one is larger. If both are empty they are equal.
+		 */
+		if (hcount1 > 0)
+			res = 1;
+		else if (hcount2 > 0)
+			res = -1;
+	}
+	else
+	{
+		/* here we know both operands are nonempty */
+		char	   *str1 = STRPTR(hs1);
+		char	   *str2 = STRPTR(hs2);
+		HEntry	   *ent1 = ARRPTR(hs1);
+		HEntry	   *ent2 = ARRPTR(hs2);
+		size_t		len1 = HSE_ENDPOS(ent1[2 * hcount1 - 1]);
+		size_t		len2 = HSE_ENDPOS(ent2[2 * hcount2 - 1]);
+
+		res = memcmp(str1, str2, Min(len1, len2));
+
+		if (res == 0)
+		{
+			if (len1 > len2)
+				res = 1;
+			else if (len1 < len2)
+				res = -1;
+			else if (hcount1 > hcount2)
+				res = 1;
+			else if (hcount2 > hcount1)
+				res = -1;
+			else
+			{
+				int			count = hcount1 * 2;
+				int			i;
+
+				for (i = 0; i < count; ++i)
+					if (HSE_ENDPOS(ent1[i]) != HSE_ENDPOS(ent2[i]) ||
+						HSE_ISNULL(ent1[i]) != HSE_ISNULL(ent2[i]))
+						break;
+				if (i < count)
+				{
+					if (HSE_ENDPOS(ent1[i]) < HSE_ENDPOS(ent2[i]))
+						res = -1;
+					else if (HSE_ENDPOS(ent1[i]) > HSE_ENDPOS(ent2[i]))
+						res = 1;
+					else if (HSE_ISNULL(ent1[i]))
+						res = 1;
+					else if (HSE_ISNULL(ent2[i]))
+						res = -1;
+				}
+			}
+		}
+		else
+		{
+			res = (res > 0) ? 1 : -1;
+		}
+	}
+
+	/*
+	 * this is a btree support function; this is one of the few places where
+	 * memory needs to be explicitly freed.
+	 */
+	PG_FREE_IF_COPY(hs1, 0);
+	PG_FREE_IF_COPY(hs2, 1);
+	PG_RETURN_INT32(res);
+}
+
+
+PG_FUNCTION_INFO_V1(hstore_eq);
+Datum		hstore_eq(PG_FUNCTION_ARGS);
+Datum
+hstore_eq(PG_FUNCTION_ARGS)
+{
+	int			res = DatumGetInt32(DirectFunctionCall2(hstore_cmp,
+														PG_GETARG_DATUM(0),
+														PG_GETARG_DATUM(1)));
+
+	PG_RETURN_BOOL(res == 0);
+}
+
+PG_FUNCTION_INFO_V1(hstore_ne);
+Datum		hstore_ne(PG_FUNCTION_ARGS);
+Datum
+hstore_ne(PG_FUNCTION_ARGS)
+{
+	int			res = DatumGetInt32(DirectFunctionCall2(hstore_cmp,
+														PG_GETARG_DATUM(0),
+														PG_GETARG_DATUM(1)));
+
+	PG_RETURN_BOOL(res != 0);
+}
+
+PG_FUNCTION_INFO_V1(hstore_gt);
+Datum		hstore_gt(PG_FUNCTION_ARGS);
+Datum
+hstore_gt(PG_FUNCTION_ARGS)
+{
+	int			res = DatumGetInt32(DirectFunctionCall2(hstore_cmp,
+														PG_GETARG_DATUM(0),
+														PG_GETARG_DATUM(1)));
+
+	PG_RETURN_BOOL(res > 0);
+}
+
+PG_FUNCTION_INFO_V1(hstore_ge);
+Datum		hstore_ge(PG_FUNCTION_ARGS);
+Datum
+hstore_ge(PG_FUNCTION_ARGS)
+{
+	int			res = DatumGetInt32(DirectFunctionCall2(hstore_cmp,
+														PG_GETARG_DATUM(0),
+														PG_GETARG_DATUM(1)));
+
+	PG_RETURN_BOOL(res >= 0);
+}
+
+PG_FUNCTION_INFO_V1(hstore_lt);
+Datum		hstore_lt(PG_FUNCTION_ARGS);
+Datum
+hstore_lt(PG_FUNCTION_ARGS)
+{
+	int			res = DatumGetInt32(DirectFunctionCall2(hstore_cmp,
+														PG_GETARG_DATUM(0),
+														PG_GETARG_DATUM(1)));
+
+	PG_RETURN_BOOL(res < 0);
+}
+
+PG_FUNCTION_INFO_V1(hstore_le);
+Datum		hstore_le(PG_FUNCTION_ARGS);
+Datum
+hstore_le(PG_FUNCTION_ARGS)
+{
+	int			res = DatumGetInt32(DirectFunctionCall2(hstore_cmp,
+														PG_GETARG_DATUM(0),
+														PG_GETARG_DATUM(1)));
+
+	PG_RETURN_BOOL(res <= 0);
+}
+
+
+PG_FUNCTION_INFO_V1(hstore_hash);
+Datum		hstore_hash(PG_FUNCTION_ARGS);
+Datum
+hstore_hash(PG_FUNCTION_ARGS)
+{
+	HStore	   *hs = PG_GETARG_HS(0);
+	Datum		hval = hash_any((unsigned char *) VARDATA(hs),
+								VARSIZE(hs) - VARHDRSZ);
+
+	/*
+	 * this is the only place in the code that cares whether the overall
+	 * varlena size exactly matches the true data size; this assertion should
+	 * be maintained by all the other code, but we make it explicit here.
+	 */
+	Assert(VARSIZE(hs) ==
+		   (HS_COUNT(hs) != 0 ?
+			CALCDATASIZE(HS_COUNT(hs),
+						 HSE_ENDPOS(ARRPTR(hs)[2 * HS_COUNT(hs) - 1])) :
+			HSHRDSIZE));
+
+	PG_FREE_IF_COPY(hs, 0);
+	PG_RETURN_DATUM(hval);
+}
diff --git a/contrib/hstore/sql/hstore.sql b/contrib/hstore/sql/hstore.sql
index 9da6cd13df..8fefcbba93 100644
--- a/contrib/hstore/sql/hstore.sql
+++ b/contrib/hstore/sql/hstore.sql
@@ -65,6 +65,13 @@ select ('aa=>b, c=>d , b=>16'::hstore->'gg') is null;
 select ('aa=>NULL, c=>d , b=>16'::hstore->'aa') is null;
 select ('aa=>"NULL", c=>d , b=>16'::hstore->'aa') is null;
 
+-- -> array operator
+
+select 'aa=>"NULL", c=>d , b=>16'::hstore -> ARRAY['aa','c'];
+select 'aa=>"NULL", c=>d , b=>16'::hstore -> ARRAY['c','aa'];
+select 'aa=>NULL, c=>d , b=>16'::hstore -> ARRAY['aa','c',null];
+select 'aa=>1, c=>3, b=>2, d=>4'::hstore -> ARRAY[['b','d'],['aa','c']];
+
 -- exists/defined
 
 select exist('a=>NULL, b=>qq', 'a');
@@ -75,6 +82,20 @@ select defined('a=>NULL, b=>qq', 'a');
 select defined('a=>NULL, b=>qq', 'b');
 select defined('a=>NULL, b=>qq', 'c');
 select defined('a=>"NULL", b=>qq', 'a');
+select hstore 'a=>NULL, b=>qq' ? 'a';
+select hstore 'a=>NULL, b=>qq' ? 'b';
+select hstore 'a=>NULL, b=>qq' ? 'c';
+select hstore 'a=>"NULL", b=>qq' ? 'a';
+select hstore 'a=>NULL, b=>qq' ?| ARRAY['a','b'];
+select hstore 'a=>NULL, b=>qq' ?| ARRAY['b','a'];
+select hstore 'a=>NULL, b=>qq' ?| ARRAY['c','a'];
+select hstore 'a=>NULL, b=>qq' ?| ARRAY['c','d'];
+select hstore 'a=>NULL, b=>qq' ?| '{}'::text[];
+select hstore 'a=>NULL, b=>qq' ?& ARRAY['a','b'];
+select hstore 'a=>NULL, b=>qq' ?& ARRAY['b','a'];
+select hstore 'a=>NULL, b=>qq' ?& ARRAY['c','a'];
+select hstore 'a=>NULL, b=>qq' ?& ARRAY['c','d'];
+select hstore 'a=>NULL, b=>qq' ?& '{}'::text[];
 
 -- delete 
 
@@ -83,6 +104,47 @@ select delete('a=>null , b=>2, c=>3'::hstore, 'a');
 select delete('a=>1 , b=>2, c=>3'::hstore, 'b');
 select delete('a=>1 , b=>2, c=>3'::hstore, 'c');
 select delete('a=>1 , b=>2, c=>3'::hstore, 'd');
+select 'a=>1 , b=>2, c=>3'::hstore - 'a'::text;
+select 'a=>null , b=>2, c=>3'::hstore - 'a'::text;
+select 'a=>1 , b=>2, c=>3'::hstore - 'b'::text;
+select 'a=>1 , b=>2, c=>3'::hstore - 'c'::text;
+select 'a=>1 , b=>2, c=>3'::hstore - 'd'::text;
+select pg_column_size('a=>1 , b=>2, c=>3'::hstore - 'b'::text)
+         = pg_column_size('a=>1, b=>2'::hstore);
+
+-- delete (array)
+
+select delete('a=>1 , b=>2, c=>3'::hstore, ARRAY['d','e']);
+select delete('a=>1 , b=>2, c=>3'::hstore, ARRAY['d','b']);
+select delete('a=>1 , b=>2, c=>3'::hstore, ARRAY['a','c']);
+select delete('a=>1 , b=>2, c=>3'::hstore, ARRAY[['b'],['c'],['a']]);
+select delete('a=>1 , b=>2, c=>3'::hstore, '{}'::text[]);
+select 'a=>1 , b=>2, c=>3'::hstore - ARRAY['d','e'];
+select 'a=>1 , b=>2, c=>3'::hstore - ARRAY['d','b'];
+select 'a=>1 , b=>2, c=>3'::hstore - ARRAY['a','c'];
+select 'a=>1 , b=>2, c=>3'::hstore - ARRAY[['b'],['c'],['a']];
+select 'a=>1 , b=>2, c=>3'::hstore - '{}'::text[];
+select pg_column_size('a=>1 , b=>2, c=>3'::hstore - ARRAY['a','c'])
+         = pg_column_size('b=>2'::hstore);
+select pg_column_size('a=>1 , b=>2, c=>3'::hstore - '{}'::text[])
+         = pg_column_size('a=>1, b=>2, c=>3'::hstore);
+
+-- delete (hstore)
+
+select delete('aa=>1 , b=>2, c=>3'::hstore, 'aa=>4, b=>2'::hstore);
+select delete('aa=>1 , b=>2, c=>3'::hstore, 'aa=>NULL, c=>3'::hstore);
+select delete('aa=>1 , b=>2, c=>3'::hstore, 'aa=>1, b=>2, c=>3'::hstore);
+select delete('aa=>1 , b=>2, c=>3'::hstore, 'b=>2'::hstore);
+select delete('aa=>1 , b=>2, c=>3'::hstore, ''::hstore);
+select 'aa=>1 , b=>2, c=>3'::hstore - 'aa=>4, b=>2'::hstore;
+select 'aa=>1 , b=>2, c=>3'::hstore - 'aa=>NULL, c=>3'::hstore;
+select 'aa=>1 , b=>2, c=>3'::hstore - 'aa=>1, b=>2, c=>3'::hstore;
+select 'aa=>1 , b=>2, c=>3'::hstore - 'b=>2'::hstore;
+select 'aa=>1 , b=>2, c=>3'::hstore - ''::hstore;
+select pg_column_size('a=>1 , b=>2, c=>3'::hstore - 'b=>2'::hstore)
+         = pg_column_size('a=>1, c=>3'::hstore);
+select pg_column_size('a=>1 , b=>2, c=>3'::hstore - ''::hstore)
+         = pg_column_size('a=>1, b=>2, c=>3'::hstore);
 
 -- ||
 select 'aa=>1 , b=>2, cq=>3'::hstore || 'cq=>l, b=>g, fg=>f';
@@ -90,12 +152,106 @@ select 'aa=>1 , b=>2, cq=>3'::hstore || 'aq=>l';
 select 'aa=>1 , b=>2, cq=>3'::hstore || 'aa=>l';
 select 'aa=>1 , b=>2, cq=>3'::hstore || '';
 select ''::hstore || 'cq=>l, b=>g, fg=>f';
+select pg_column_size(''::hstore || ''::hstore) = pg_column_size(''::hstore);
+select pg_column_size('aa=>1'::hstore || 'b=>2'::hstore)
+         = pg_column_size('aa=>1, b=>2'::hstore);
+select pg_column_size('aa=>1, b=>2'::hstore || ''::hstore)
+         = pg_column_size('aa=>1, b=>2'::hstore);
+select pg_column_size(''::hstore || 'aa=>1, b=>2'::hstore)
+         = pg_column_size('aa=>1, b=>2'::hstore);
 
 -- =>
 select 'a=>g, b=>c'::hstore || ( 'asd'=>'gf' );
 select 'a=>g, b=>c'::hstore || ( 'b'=>'gf' );
 select 'a=>g, b=>c'::hstore || ( 'b'=>'NULL' );
 select 'a=>g, b=>c'::hstore || ( 'b'=>NULL );
+select ('a=>g, b=>c'::hstore || ( NULL=>'b' )) is null;
+select pg_column_size(('b'=>'gf'))
+         = pg_column_size('b=>gf'::hstore);
+select pg_column_size('a=>g, b=>c'::hstore || ('b'=>'gf'))
+         = pg_column_size('a=>g, b=>gf'::hstore);
+
+-- slice()
+select slice(hstore 'aa=>1, b=>2, c=>3', ARRAY['g','h','i']);
+select slice(hstore 'aa=>1, b=>2, c=>3', ARRAY['c','b']);
+select slice(hstore 'aa=>1, b=>2, c=>3', ARRAY['aa','b']);
+select slice(hstore 'aa=>1, b=>2, c=>3', ARRAY['c','b','aa']);
+select pg_column_size(slice(hstore 'aa=>1, b=>2, c=>3', ARRAY['c','b']))
+         = pg_column_size('b=>2, c=>3'::hstore);
+select pg_column_size(slice(hstore 'aa=>1, b=>2, c=>3', ARRAY['c','b','aa']))
+         = pg_column_size('aa=>1, b=>2, c=>3'::hstore);
+
+-- array input
+select '{}'::text[]::hstore;
+select ARRAY['a','g','b','h','asd']::hstore;
+select ARRAY['a','g','b','h','asd','i']::hstore;
+select ARRAY[['a','g'],['b','h'],['asd','i']]::hstore;
+select ARRAY[['a','g','b'],['h','asd','i']]::hstore;
+select ARRAY[[['a','g'],['b','h'],['asd','i']]]::hstore;
+select hstore('{}'::text[]);
+select hstore(ARRAY['a','g','b','h','asd']);
+select hstore(ARRAY['a','g','b','h','asd','i']);
+select hstore(ARRAY[['a','g'],['b','h'],['asd','i']]);
+select hstore(ARRAY[['a','g','b'],['h','asd','i']]);
+select hstore(ARRAY[[['a','g'],['b','h'],['asd','i']]]);
+select hstore('[0:5]={a,g,b,h,asd,i}'::text[]);
+select hstore('[0:2][1:2]={{a,g},{b,h},{asd,i}}'::text[]);
+
+-- pairs of arrays
+select hstore(ARRAY['a','b','asd'], ARRAY['g','h','i']);
+select hstore(ARRAY['a','b','asd'], ARRAY['g','h',NULL]);
+select hstore(ARRAY['z','y','x'], ARRAY['1','2','3']);
+select hstore(ARRAY['aaa','bb','c','d'], ARRAY[null::text,null,null,null]);
+select hstore(ARRAY['aaa','bb','c','d'], null);
+select quote_literal(hstore('{}'::text[], '{}'::text[]));
+select quote_literal(hstore('{}'::text[], null));
+select hstore(ARRAY['a'], '{}'::text[]);  -- error
+select hstore('{}'::text[], ARRAY['a']);  -- error
+select pg_column_size(hstore(ARRAY['a','b','asd'], ARRAY['g','h','i']))
+         = pg_column_size('a=>g, b=>h, asd=>i'::hstore);
+
+-- records
+select hstore(v) from (values (1, 'foo', 1.2, 3::float8)) v(a,b,c,d);
+create domain hstestdom1 as integer not null default 0;
+create table testhstore0 (a integer, b text, c numeric, d float8);
+create table testhstore1 (a integer, b text, c numeric, d float8, e hstestdom1);
+insert into testhstore0 values (1, 'foo', 1.2, 3::float8);
+insert into testhstore1 values (1, 'foo', 1.2, 3::float8);
+select hstore(v) from testhstore1 v;
+select hstore(null::testhstore0);
+select hstore(null::testhstore1);
+select pg_column_size(hstore(v))
+         = pg_column_size('a=>1, b=>"foo", c=>"1.2", d=>"3", e=>"0"'::hstore)
+  from testhstore1 v;
+select populate_record(v, ('c' => '3.45')) from testhstore1 v;
+select populate_record(v, ('d' => '3.45')) from testhstore1 v;
+select populate_record(v, ('e' => '123')) from testhstore1 v;
+select populate_record(v, ('e' => null)) from testhstore1 v;
+select populate_record(v, ('c' => null)) from testhstore1 v;
+select populate_record(v, ('b' => 'foo') || ('a' => '123')) from testhstore1 v;
+select populate_record(v, ('b' => 'foo') || ('e' => null)) from testhstore0 v;
+select populate_record(v, ('b' => 'foo') || ('e' => null)) from testhstore1 v;
+select populate_record(v, '') from testhstore0 v;
+select populate_record(v, '') from testhstore1 v;
+select populate_record(null::testhstore1, ('c' => '3.45') || ('a' => '123'));
+select populate_record(null::testhstore1, ('c' => '3.45') || ('e' => '123'));
+select populate_record(null::testhstore0, '');
+select populate_record(null::testhstore1, '');
+select v #= ('c' => '3.45') from testhstore1 v;
+select v #= ('d' => '3.45') from testhstore1 v;
+select v #= ('e' => '123') from testhstore1 v;
+select v #= ('c' => null) from testhstore1 v;
+select v #= ('e' => null) from testhstore0 v;
+select v #= ('e' => null) from testhstore1 v;
+select v #= (('b' => 'foo') || ('a' => '123')) from testhstore1 v;
+select v #= (('b' => 'foo') || ('e' => '123')) from testhstore1 v;
+select v #= hstore '' from testhstore0 v;
+select v #= hstore '' from testhstore1 v;
+select null::testhstore1 #= (('c' => '3.45') || ('a' => '123'));
+select null::testhstore1 #= (('c' => '3.45') || ('e' => '123'));
+select null::testhstore0 #= hstore '';
+select null::testhstore1 #= hstore '';
+select v #= h from testhstore1 v, (values (hstore 'a=>123',1),('b=>foo,c=>3.21',2),('a=>null',3),('e=>123',4),('f=>blah',5)) x(h,i) order by i;
 
 -- keys/values
 select akeys('aa=>1 , b=>2, cq=>3'::hstore || 'cq=>l, b=>g, fg=>f');
@@ -106,6 +262,12 @@ select avals('aa=>1 , b=>2, cq=>3'::hstore || 'cq=>l, b=>g, fg=>NULL');
 select avals('""=>1');
 select avals('');
 
+select hstore_to_array('aa=>1, cq=>l, b=>g, fg=>NULL'::hstore);
+select %% 'aa=>1, cq=>l, b=>g, fg=>NULL';
+
+select hstore_to_matrix('aa=>1, cq=>l, b=>g, fg=>NULL'::hstore);
+select %# 'aa=>1, cq=>l, b=>g, fg=>NULL';
+
 select * from skeys('aa=>1 , b=>2, cq=>3'::hstore || 'cq=>l, b=>g, fg=>f');
 select * from skeys('""=>1');
 select * from skeys('');
@@ -132,6 +294,8 @@ select count(*) from testhstore where h @> 'wait=>NULL';
 select count(*) from testhstore where h @> 'wait=>CC';
 select count(*) from testhstore where h @> 'wait=>CC, public=>t';
 select count(*) from testhstore where h ? 'public';
+select count(*) from testhstore where h ?| ARRAY['public','disabled'];
+select count(*) from testhstore where h ?& ARRAY['public','disabled'];
 
 create index hidx on testhstore using gist(h);
 set enable_seqscan=off;
@@ -140,6 +304,8 @@ select count(*) from testhstore where h @> 'wait=>NULL';
 select count(*) from testhstore where h @> 'wait=>CC';
 select count(*) from testhstore where h @> 'wait=>CC, public=>t';
 select count(*) from testhstore where h ? 'public';
+select count(*) from testhstore where h ?| ARRAY['public','disabled'];
+select count(*) from testhstore where h ?& ARRAY['public','disabled'];
 
 drop index hidx;
 create index hidx on testhstore using gin (h);
@@ -149,6 +315,26 @@ select count(*) from testhstore where h @> 'wait=>NULL';
 select count(*) from testhstore where h @> 'wait=>CC';
 select count(*) from testhstore where h @> 'wait=>CC, public=>t';
 select count(*) from testhstore where h ? 'public';
+select count(*) from testhstore where h ?| ARRAY['public','disabled'];
+select count(*) from testhstore where h ?& ARRAY['public','disabled'];
 
 select count(*) from (select (each(h)).key from testhstore) as wow ;
 select key, count(*) from (select (each(h)).key from testhstore) as wow group by key order by count desc, key;
+
+-- sort/hash
+select count(distinct h) from testhstore;
+set enable_hashagg = false;
+select count(*) from (select h from (select * from testhstore union all select * from testhstore) hs group by h) hs2;
+set enable_hashagg = true;
+set enable_sort = false;
+select count(*) from (select h from (select * from testhstore union all select * from testhstore) hs group by h) hs2;
+select distinct * from (values (hstore '' || ''),('')) v(h);
+set enable_sort = true;
+
+-- btree
+drop index hidx;
+create index hidx on testhstore using btree (h);
+set enable_seqscan=off;
+
+select count(*) from testhstore where h #># 'p=>1';
+select count(*) from testhstore where h = 'pos=>98, line=>371, node=>CBA, indexed=>t';
diff --git a/contrib/hstore/uninstall_hstore.sql b/contrib/hstore/uninstall_hstore.sql
index 17782d5c05..ca2b05aa83 100644
--- a/contrib/hstore/uninstall_hstore.sql
+++ b/contrib/hstore/uninstall_hstore.sql
@@ -1,36 +1,75 @@
-/* $PostgreSQL: pgsql/contrib/hstore/uninstall_hstore.sql,v 1.8 2009/03/25 22:19:01 tgl Exp $ */
+/* $PostgreSQL: pgsql/contrib/hstore/uninstall_hstore.sql,v 1.11 2010/07/02 20:36:48 rhaas Exp $ */
 
 -- Adjust this setting to control where the objects get dropped.
 SET search_path = public;
 
 DROP OPERATOR CLASS gist_hstore_ops USING gist CASCADE;
 DROP OPERATOR CLASS gin_hstore_ops USING gin CASCADE;
+DROP OPERATOR CLASS hash_hstore_ops USING hash CASCADE;
+DROP OPERATOR CLASS btree_hstore_ops USING btree CASCADE;
 
-DROP OPERATOR ? ( hstore, text );
-DROP OPERATOR ->( hstore, text );
-DROP OPERATOR ||( hstore, hstore );
-DROP OPERATOR @>( hstore, hstore );
-DROP OPERATOR <@( hstore, hstore );
-DROP OPERATOR @( hstore, hstore );
-DROP OPERATOR ~( hstore, hstore );
-DROP OPERATOR =>( text, text );
+DROP OPERATOR -  ( hstore, text );
+DROP OPERATOR -  ( hstore, text[] );
+DROP OPERATOR -  ( hstore, hstore );
+DROP OPERATOR ?  ( hstore, text );
+DROP OPERATOR ?& ( hstore, text[] );
+DROP OPERATOR ?| ( hstore, text[] );
+DROP OPERATOR -> ( hstore, text );
+DROP OPERATOR -> ( hstore, text[] );
+DROP OPERATOR || ( hstore, hstore );
+DROP OPERATOR @> ( hstore, hstore );
+DROP OPERATOR <@ ( hstore, hstore );
+DROP OPERATOR @  ( hstore, hstore );
+DROP OPERATOR ~  ( hstore, hstore );
+DROP OPERATOR => ( text, text );
+DROP OPERATOR #= ( anyelement, hstore );
+DROP OPERATOR %% ( NONE, hstore );
+DROP OPERATOR %# ( NONE, hstore );
+DROP OPERATOR =  ( hstore, hstore );
+DROP OPERATOR <> ( hstore, hstore );
+DROP OPERATOR #<#  ( hstore, hstore );
+DROP OPERATOR #<=# ( hstore, hstore );
+DROP OPERATOR #>#  ( hstore, hstore );
+DROP OPERATOR #>=# ( hstore, hstore );
 
+DROP CAST (text[] AS hstore);
 
+DROP FUNCTION hstore_eq(hstore,hstore);
+DROP FUNCTION hstore_ne(hstore,hstore);
+DROP FUNCTION hstore_gt(hstore,hstore);
+DROP FUNCTION hstore_ge(hstore,hstore);
+DROP FUNCTION hstore_lt(hstore,hstore);
+DROP FUNCTION hstore_le(hstore,hstore);
+DROP FUNCTION hstore_cmp(hstore,hstore);
+DROP FUNCTION hstore_hash(hstore);
+DROP FUNCTION slice_array(hstore,text[]);
+DROP FUNCTION slice(hstore,text[]);
 DROP FUNCTION fetchval(hstore,text);
 DROP FUNCTION isexists(hstore,text);
 DROP FUNCTION exist(hstore,text);
+DROP FUNCTION exists_any(hstore,text[]);
+DROP FUNCTION exists_all(hstore,text[]);
 DROP FUNCTION isdefined(hstore,text);
 DROP FUNCTION defined(hstore,text);
 DROP FUNCTION delete(hstore,text);
+DROP FUNCTION delete(hstore,text[]);
+DROP FUNCTION delete(hstore,hstore);
 DROP FUNCTION hs_concat(hstore,hstore);
 DROP FUNCTION hs_contains(hstore,hstore);
 DROP FUNCTION hs_contained(hstore,hstore);
 DROP FUNCTION tconvert(text,text);
+DROP FUNCTION hstore(text,text);
+DROP FUNCTION hstore(text[],text[]);
+DROP FUNCTION hstore_to_array(hstore);
+DROP FUNCTION hstore_to_matrix(hstore);
+DROP FUNCTION hstore(record);
+DROP FUNCTION hstore(text[]);
 DROP FUNCTION akeys(hstore);
 DROP FUNCTION avals(hstore);
 DROP FUNCTION skeys(hstore);
 DROP FUNCTION svals(hstore);
 DROP FUNCTION each(hstore);
+DROP FUNCTION populate_record(anyelement,hstore);
 DROP FUNCTION ghstore_compress(internal);
 DROP FUNCTION ghstore_decompress(internal);
 DROP FUNCTION ghstore_penalty(internal,internal,internal);
@@ -41,6 +80,7 @@ DROP FUNCTION ghstore_consistent(internal,internal,int,oid,internal);
 DROP FUNCTION gin_consistent_hstore(internal, int2, internal, int4, internal, internal);
 DROP FUNCTION gin_extract_hstore(internal, internal);
 DROP FUNCTION gin_extract_hstore_query(internal, internal, smallint, internal, internal);
+DROP FUNCTION hstore_version_diag(hstore);
 
 DROP TYPE hstore CASCADE;
 DROP TYPE ghstore CASCADE;
diff --git a/contrib/intagg/Makefile b/contrib/intagg/Makefile
index d100ec91af..73ce7e4173 100644
--- a/contrib/intagg/Makefile
+++ b/contrib/intagg/Makefile
@@ -1,8 +1,4 @@
-#############################################
-# Makefile for integer aggregator
-# Copyright (C) 2001 Digital Music Network.
-# by Mark L. Woodward
-# $PostgreSQL: pgsql/contrib/intagg/Makefile,v 1.10 2008/11/14 19:58:45 tgl Exp $
+# $PostgreSQL: pgsql/contrib/intagg/Makefile,v 1.11 2010/02/05 03:06:30 momjian Exp $
 
 DATA = int_aggregate.sql uninstall_int_aggregate.sql
 
diff --git a/contrib/intarray/_int_gin.c b/contrib/intarray/_int_gin.c
index 2bf8fc54bb..375ff3ae25 100644
--- a/contrib/intarray/_int_gin.c
+++ b/contrib/intarray/_int_gin.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/intarray/_int_gin.c,v 1.10 2009/06/11 14:48:51 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/intarray/_int_gin.c,v 1.11 2010/03/25 15:50:10 tgl Exp $
  */
 #include "postgres.h"
 
@@ -65,7 +65,7 @@ ginint4_queryextract(PG_FUNCTION_ARGS)
 		}
 	}
 
-	if (nentries == 0)
+	if (*nentries == 0)
 	{
 		switch (strategy)
 		{
diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c
index 449f70b811..dac760b111 100644
--- a/contrib/isn/isn.c
+++ b/contrib/isn/isn.c
@@ -3,11 +3,11 @@
  * isn.c
  *	  PostgreSQL type definitions for ISNs (ISBN, ISMN, ISSN, EAN13, UPC)
  *
- * Copyright (c) 2004-2006, Germ�n M�ndez Bravo (Kronuz)
- * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
+ * Author:	German Mendez Bravo (Kronuz)
+ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/contrib/isn/isn.c,v 1.11 2009/06/11 14:48:51 momjian Exp $
+ *	  $PostgreSQL: pgsql/contrib/isn/isn.c,v 1.14 2010/02/26 02:00:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/contrib/isn/isn.h b/contrib/isn/isn.h
index ebdf0b6481..fdc72d9b53 100644
--- a/contrib/isn/isn.h
+++ b/contrib/isn/isn.h
@@ -3,11 +3,11 @@
  * isn.h
  *	  PostgreSQL type definitions for ISNs (ISBN, ISMN, ISSN, EAN13, UPC)
  *
- * Copyright (c) 2004-2006, Germ�n M�ndez Bravo (Kronuz)
- * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
+ * Author:	German Mendez Bravo (Kronuz)
+ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/contrib/isn/isn.h,v 1.7 2009/01/01 17:23:32 momjian Exp $
+ *	  $PostgreSQL: pgsql/contrib/isn/isn.h,v 1.10 2010/02/26 02:00:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/contrib/lo/lo_test.sql b/contrib/lo/lo_test.sql
index e22a8889b3..73022b2535 100644
--- a/contrib/lo/lo_test.sql
+++ b/contrib/lo/lo_test.sql
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/contrib/lo/lo_test.sql,v 1.5 2007/11/13 04:24:28 momjian Exp $ */
+/* $PostgreSQL: pgsql/contrib/lo/lo_test.sql,v 1.6 2009/12/14 00:39:10 itagaki Exp $ */
 
 -- Adjust this setting to control where the objects get created.
 SET search_path = public;
@@ -12,7 +12,7 @@ SET search_path = public;
 --
 
 -- Check what is in pg_largeobject
-SELECT count(DISTINCT loid) FROM pg_largeobject;
+SELECT count(oid) FROM pg_largeobject_metadata;
 
 -- ignore any errors here - simply drop the table if it already exists
 DROP TABLE a;
@@ -74,6 +74,6 @@ DELETE FROM a;
 DROP TABLE a;
 
 -- Check what is in pg_largeobject ... if different from original, trouble
-SELECT count(DISTINCT loid) FROM pg_largeobject;
+SELECT count(oid) FROM pg_largeobject_metadata;
 
 -- end of tests
diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c
index 15c4cc022d..4c0e7c25c0 100644
--- a/contrib/ltree/_ltree_gist.c
+++ b/contrib/ltree/_ltree_gist.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/ltree/_ltree_gist.c,v 1.26 2009/06/11 14:48:51 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/ltree/_ltree_gist.c,v 1.27 2010/02/24 18:02:24 tgl Exp $
  *
  *
  * GiST support for ltree[]
@@ -88,7 +88,7 @@ _ltree_compress(PG_FUNCTION_ARGS)
 		int			num = ArrayGetNItems(ARR_NDIM(val), ARR_DIMS(val));
 		ltree	   *item = (ltree *) ARR_DATA_PTR(val);
 
-		if (ARR_NDIM(val) != 1)
+		if (ARR_NDIM(val) > 1)
 			ereport(ERROR,
 					(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
 					 errmsg("array must be one-dimensional")));
@@ -534,7 +534,7 @@ _arrq_cons(ltree_gist *key, ArrayType *_query)
 	lquery	   *query = (lquery *) ARR_DATA_PTR(_query);
 	int			num = ArrayGetNItems(ARR_NDIM(_query), ARR_DIMS(_query));
 
-	if (ARR_NDIM(_query) != 1)
+	if (ARR_NDIM(_query) > 1)
 		ereport(ERROR,
 				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
 				 errmsg("array must be one-dimensional")));
diff --git a/contrib/ltree/_ltree_op.c b/contrib/ltree/_ltree_op.c
index f9e90e978d..02c96c05d4 100644
--- a/contrib/ltree/_ltree_op.c
+++ b/contrib/ltree/_ltree_op.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/ltree/_ltree_op.c,v 1.13 2009/06/11 14:48:51 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/ltree/_ltree_op.c,v 1.14 2010/02/24 18:02:24 tgl Exp $
  *
  *
  * op function for ltree[]
@@ -48,7 +48,7 @@ array_iterator(ArrayType *la, PGCALL2 callback, void *param, ltree **found)
 	int			num = ArrayGetNItems(ARR_NDIM(la), ARR_DIMS(la));
 	ltree	   *item = (ltree *) ARR_DATA_PTR(la);
 
-	if (ARR_NDIM(la) != 1)
+	if (ARR_NDIM(la) > 1)
 		ereport(ERROR,
 				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
 				 errmsg("array must be one-dimensional")));
@@ -148,7 +148,7 @@ _lt_q_regex(PG_FUNCTION_ARGS)
 	bool		res = false;
 	int			num = ArrayGetNItems(ARR_NDIM(_query), ARR_DIMS(_query));
 
-	if (ARR_NDIM(_query) != 1)
+	if (ARR_NDIM(_query) > 1)
 		ereport(ERROR,
 				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
 				 errmsg("array must be one-dimensional")));
@@ -306,7 +306,7 @@ _lca(PG_FUNCTION_ARGS)
 	ltree	  **a,
 			   *res;
 
-	if (ARR_NDIM(la) != 1)
+	if (ARR_NDIM(la) > 1)
 		ereport(ERROR,
 				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
 				 errmsg("array must be one-dimensional")));
diff --git a/contrib/ltree/lquery_op.c b/contrib/ltree/lquery_op.c
index df4f0794f2..1059417e77 100644
--- a/contrib/ltree/lquery_op.c
+++ b/contrib/ltree/lquery_op.c
@@ -1,7 +1,7 @@
 /*
  * op function for ltree and lquery
  * Teodor Sigaev <[email protected]>
- * $PostgreSQL: pgsql/contrib/ltree/lquery_op.c,v 1.14 2009/06/11 14:48:51 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/ltree/lquery_op.c,v 1.15 2010/02/24 18:02:24 tgl Exp $
  */
 #include "postgres.h"
 
@@ -344,7 +344,7 @@ lt_q_regex(PG_FUNCTION_ARGS)
 	bool		res = false;
 	int			num = ArrayGetNItems(ARR_NDIM(_query), ARR_DIMS(_query));
 
-	if (ARR_NDIM(_query) != 1)
+	if (ARR_NDIM(_query) > 1)
 		ereport(ERROR,
 				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
 				 errmsg("array must be one-dimensional")));
diff --git a/contrib/ltree/ltree_gist.c b/contrib/ltree/ltree_gist.c
index d48ca8e1d4..46fccb1ee1 100644
--- a/contrib/ltree/ltree_gist.c
+++ b/contrib/ltree/ltree_gist.c
@@ -1,7 +1,7 @@
 /*
  * GiST support for ltree
  * Teodor Sigaev <[email protected]>
- * $PostgreSQL: pgsql/contrib/ltree/ltree_gist.c,v 1.25 2009/06/11 14:48:51 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/ltree/ltree_gist.c,v 1.26 2010/02/24 18:02:24 tgl Exp $
  */
 #include "postgres.h"
 
@@ -602,7 +602,7 @@ arrq_cons(ltree_gist *key, ArrayType *_query)
 	lquery	   *query = (lquery *) ARR_DATA_PTR(_query);
 	int			num = ArrayGetNItems(ARR_NDIM(_query), ARR_DIMS(_query));
 
-	if (ARR_NDIM(_query) != 1)
+	if (ARR_NDIM(_query) > 1)
 		ereport(ERROR,
 				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
 				 errmsg("array must be one-dimensional")));
diff --git a/contrib/oid2name/Makefile b/contrib/oid2name/Makefile
index d5dd1be030..ce043550af 100644
--- a/contrib/oid2name/Makefile
+++ b/contrib/oid2name/Makefile
@@ -1,4 +1,7 @@
-# $PostgreSQL: pgsql/contrib/oid2name/Makefile,v 1.10 2007/11/10 23:59:51 momjian Exp $
+# $PostgreSQL: pgsql/contrib/oid2name/Makefile,v 1.11 2010/05/12 11:33:07 momjian Exp $
+
+PGFILEDESC = "oid2name - examine the file structure"
+PGAPPICON=win32
 
 PROGRAM = oid2name
 OBJS	= oid2name.o
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
index 9d896b84f5..ff824278aa 100644
--- a/contrib/oid2name/oid2name.c
+++ b/contrib/oid2name/oid2name.c
@@ -5,7 +5,7 @@
  * Originally by
  * B. Palmer, [email protected] 1-17-2001
  *
- * $PostgreSQL: pgsql/contrib/oid2name/oid2name.c,v 1.36 2009/06/11 14:48:51 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/oid2name/oid2name.c,v 1.38 2010/02/26 02:00:32 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -440,7 +440,7 @@ sql_exec_dumpalldbs(PGconn *conn, struct options * opts)
 	/* get the oid and database name from the system pg_database table */
 	snprintf(todo, sizeof(todo),
 			 "SELECT d.oid AS \"Oid\", datname AS \"Database Name\", "
-	  "spcname AS \"Tablespace\" FROM pg_database d JOIN pg_tablespace t ON "
+			 "spcname AS \"Tablespace\" FROM pg_catalog.pg_database d JOIN pg_catalog.pg_tablespace t ON "
 			 "(dattablespace = t.oid) ORDER BY 2");
 
 	sql_exec(conn, todo, opts->quiet);
@@ -456,10 +456,10 @@ sql_exec_dumpalltables(PGconn *conn, struct options * opts)
 	char	   *addfields = ",c.oid AS \"Oid\", nspname AS \"Schema\", spcname as \"Tablespace\" ";
 
 	snprintf(todo, sizeof(todo),
-		  "SELECT relfilenode as \"Filenode\", relname as \"Table Name\" %s "
+			 "SELECT pg_catalog.pg_relation_filenode(c.oid) as \"Filenode\", relname as \"Table Name\" %s "
 			 "FROM pg_class c "
 		   "	LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace "
-	"	LEFT JOIN pg_catalog.pg_database d ON d.datname = current_database(),"
+			 "	LEFT JOIN pg_catalog.pg_database d ON d.datname = pg_catalog.current_database(),"
 			 "	pg_catalog.pg_tablespace t "
 			 "WHERE relkind IN ('r'%s%s) AND "
 			 "	%s"
@@ -477,7 +477,7 @@ sql_exec_dumpalltables(PGconn *conn, struct options * opts)
 }
 
 /*
- * Show oid, relfilenode, name, schema and tablespace for each of the
+ * Show oid, filenode, name, schema and tablespace for each of the
  * given objects in the current database.
  */
 void
@@ -492,7 +492,7 @@ sql_exec_searchtables(PGconn *conn, struct options * opts)
 	bool		written = false;
 	char	   *addfields = ",c.oid AS \"Oid\", nspname AS \"Schema\", spcname as \"Tablespace\" ";
 
-	/* get tables qualifiers, whether names, relfilenodes, or OIDs */
+	/* get tables qualifiers, whether names, filenodes, or OIDs */
 	comma_oids = get_comma_elts(opts->oids);
 	comma_tables = get_comma_elts(opts->tables);
 	comma_filenodes = get_comma_elts(opts->filenodes);
@@ -511,7 +511,7 @@ sql_exec_searchtables(PGconn *conn, struct options * opts)
 	{
 		if (written)
 			ptr += sprintf(ptr, " OR ");
-		ptr += sprintf(ptr, "c.relfilenode IN (%s)", comma_filenodes);
+		ptr += sprintf(ptr, "pg_catalog.pg_relation_filenode(c.oid) IN (%s)", comma_filenodes);
 		written = true;
 	}
 	if (opts->tables->num > 0)
@@ -527,10 +527,10 @@ sql_exec_searchtables(PGconn *conn, struct options * opts)
 	/* now build the query */
 	todo = (char *) myalloc(650 + strlen(qualifiers));
 	snprintf(todo, 650 + strlen(qualifiers),
-		 "SELECT relfilenode as \"Filenode\", relname as \"Table Name\" %s\n"
-			 "FROM pg_class c \n"
+			 "SELECT pg_catalog.pg_relation_filenode(c.oid) as \"Filenode\", relname as \"Table Name\" %s\n"
+			 "FROM pg_catalog.pg_class c \n"
 		 "	LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace \n"
-			 "	LEFT JOIN pg_catalog.pg_database d ON d.datname = current_database(),\n"
+			 "	LEFT JOIN pg_catalog.pg_database d ON d.datname = pg_catalog.current_database(),\n"
 			 "	pg_catalog.pg_tablespace t \n"
 			 "WHERE relkind IN ('r', 'i', 'S', 't') AND \n"
 			 "		t.oid = CASE\n"
@@ -554,7 +554,7 @@ sql_exec_dumpalltbspc(PGconn *conn, struct options * opts)
 
 	snprintf(todo, sizeof(todo),
 			 "SELECT oid AS \"Oid\", spcname as \"Tablespace Name\"\n"
-			 "FROM pg_tablespace");
+			 "FROM pg_catalog.pg_tablespace");
 
 	sql_exec(conn, todo, opts->quiet);
 }
diff --git a/contrib/pageinspect/fsmfuncs.c b/contrib/pageinspect/fsmfuncs.c
index 7f87726651..5fbf93ba2f 100644
--- a/contrib/pageinspect/fsmfuncs.c
+++ b/contrib/pageinspect/fsmfuncs.c
@@ -9,10 +9,10 @@
  * there's hardly any use case for using these without superuser-rights
  * anyway.
  *
- * Copyright (c) 2007-2009, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2010, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/contrib/pageinspect/fsmfuncs.c,v 1.3 2009/06/11 14:48:51 momjian Exp $
+ *	  $PostgreSQL: pgsql/contrib/pageinspect/fsmfuncs.c,v 1.4 2010/01/02 16:57:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c
index bdd742db5d..143a47cb80 100644
--- a/contrib/pageinspect/heapfuncs.c
+++ b/contrib/pageinspect/heapfuncs.c
@@ -7,18 +7,18 @@
  * might cause crashes, but at the same time we try to print out as much
  * information as possible, even if it's nonsense. That's because if a
  * page is corrupt, we don't know why and how exactly it is corrupt, so we
- * let the user to judge it.
+ * let the user judge it.
  *
  * These functions are restricted to superusers for the fear of introducing
- * security holes if the input checking isn't as water-tight as it should.
+ * security holes if the input checking isn't as water-tight as it should be.
  * You'd need to be superuser to obtain a raw page image anyway, so
  * there's hardly any use case for using these without superuser-rights
  * anyway.
  *
- * Copyright (c) 2007-2009, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2010, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/contrib/pageinspect/heapfuncs.c,v 1.7 2009/06/11 14:48:51 momjian Exp $
+ *	  $PostgreSQL: pgsql/contrib/pageinspect/heapfuncs.c,v 1.9 2010/04/02 15:19:22 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/contrib/pageinspect/rawpage.c b/contrib/pageinspect/rawpage.c
index 9430e855bf..9043fa37bd 100644
--- a/contrib/pageinspect/rawpage.c
+++ b/contrib/pageinspect/rawpage.c
@@ -5,10 +5,10 @@
  *
  * Access-method specific inspection functions are in separate files.
  *
- * Copyright (c) 2007-2009, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2010, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/contrib/pageinspect/rawpage.c,v 1.13 2009/06/11 14:48:51 momjian Exp $
+ *	  $PostgreSQL: pgsql/contrib/pageinspect/rawpage.c,v 1.14 2010/01/02 16:57:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/contrib/passwordcheck/Makefile b/contrib/passwordcheck/Makefile
new file mode 100644
index 0000000000..1d2c8b1c34
--- /dev/null
+++ b/contrib/passwordcheck/Makefile
@@ -0,0 +1,19 @@
+# $PostgreSQL: pgsql/contrib/passwordcheck/Makefile,v 1.1 2009/11/18 21:57:56 tgl Exp $
+
+MODULE_big = passwordcheck
+OBJS = passwordcheck.o
+
+# uncomment the following two lines to enable cracklib support
+# PG_CPPFLAGS = -DUSE_CRACKLIB '-DCRACKLIB_DICTPATH="/usr/lib/cracklib_dict"'
+# SHLIB_LINK = -lcrack
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/passwordcheck
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
diff --git a/contrib/passwordcheck/passwordcheck.c b/contrib/passwordcheck/passwordcheck.c
new file mode 100644
index 0000000000..adf417769e
--- /dev/null
+++ b/contrib/passwordcheck/passwordcheck.c
@@ -0,0 +1,148 @@
+/*-------------------------------------------------------------------------
+ *
+ * passwordcheck.c
+ *
+ *
+ * Copyright (c) 2009-2010, PostgreSQL Global Development Group
+ *
+ * Author: Laurenz Albe <[email protected]>
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/contrib/passwordcheck/passwordcheck.c,v 1.3 2010/02/26 02:00:32 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include <ctype.h>
+
+#ifdef USE_CRACKLIB
+#include <crack.h>
+#endif
+
+#include "commands/user.h"
+#include "fmgr.h"
+#include "libpq/md5.h"
+
+
+PG_MODULE_MAGIC;
+
+/* passwords shorter than this will be rejected */
+#define MIN_PWD_LENGTH 8
+
+extern void _PG_init(void);
+
+/*
+ * check_password
+ *
+ * performs checks on an encrypted or unencrypted password
+ * ereport's if not acceptable
+ *
+ * username: name of role being created or changed
+ * password: new password (possibly already encrypted)
+ * password_type: PASSWORD_TYPE_PLAINTEXT or PASSWORD_TYPE_MD5 (there
+ *			could be other encryption schemes in future)
+ * validuntil_time: password expiration time, as a timestamptz Datum
+ * validuntil_null: true if password expiration time is NULL
+ *
+ * This sample implementation doesn't pay any attention to the password
+ * expiration time, but you might wish to insist that it be non-null and
+ * not too far in the future.
+ */
+static void
+check_password(const char *username,
+			   const char *password,
+			   int password_type,
+			   Datum validuntil_time,
+			   bool validuntil_null)
+{
+	int			namelen = strlen(username);
+	int			pwdlen = strlen(password);
+	char		encrypted[MD5_PASSWD_LEN + 1];
+	int			i;
+	bool		pwd_has_letter,
+				pwd_has_nonletter;
+
+	switch (password_type)
+	{
+		case PASSWORD_TYPE_MD5:
+
+			/*
+			 * Unfortunately we cannot perform exhaustive checks on encrypted
+			 * passwords - we are restricted to guessing. (Alternatively, we
+			 * could insist on the password being presented non-encrypted, but
+			 * that has its own security disadvantages.)
+			 *
+			 * We only check for username = password.
+			 */
+			if (!pg_md5_encrypt(username, username, namelen, encrypted))
+				elog(ERROR, "password encryption failed");
+			if (strcmp(password, encrypted) == 0)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("password must not contain user name")));
+			break;
+
+		case PASSWORD_TYPE_PLAINTEXT:
+
+			/*
+			 * For unencrypted passwords we can perform better checks
+			 */
+
+			/* enforce minimum length */
+			if (pwdlen < MIN_PWD_LENGTH)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("password is too short")));
+
+			/* check if the password contains the username */
+			if (strstr(password, username))
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("password must not contain user name")));
+
+			/* check if the password contains both letters and non-letters */
+			pwd_has_letter = false;
+			pwd_has_nonletter = false;
+			for (i = 0; i < pwdlen; i++)
+			{
+				/*
+				 * isalpha() does not work for multibyte encodings but let's
+				 * consider non-ASCII characters non-letters
+				 */
+				if (isalpha((unsigned char) password[i]))
+					pwd_has_letter = true;
+				else
+					pwd_has_nonletter = true;
+			}
+			if (!pwd_has_letter || !pwd_has_nonletter)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				errmsg("password must contain both letters and nonletters")));
+
+#ifdef USE_CRACKLIB
+			/* call cracklib to check password */
+			if (FascistCheck(password, CRACKLIB_DICTPATH))
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("password is easily cracked")));
+#endif
+			break;
+
+		default:
+			elog(ERROR, "unrecognized password type: %d", password_type);
+			break;
+	}
+
+	/* all checks passed, password is ok */
+}
+
+/*
+ * Module initialization function
+ */
+void
+_PG_init(void)
+{
+	/* activate password checks when the module is loaded */
+	check_password_hook = check_password;
+}
diff --git a/contrib/pg_archivecleanup/Makefile b/contrib/pg_archivecleanup/Makefile
new file mode 100644
index 0000000000..d858b5bcd3
--- /dev/null
+++ b/contrib/pg_archivecleanup/Makefile
@@ -0,0 +1,18 @@
+# $PostgreSQL: pgsql/contrib/pg_archivecleanup/Makefile,v 1.1 2010/06/14 16:19:24 sriggs Exp $
+
+PGFILEDESC = "pg_archivecleanup - cleans archive when used with streaming replication"
+PGAPPICON=win32
+
+PROGRAM = pg_archivecleanup
+OBJS	= pg_archivecleanup.o
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/pg_archivecleanup
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
diff --git a/contrib/pg_archivecleanup/pg_archivecleanup.c b/contrib/pg_archivecleanup/pg_archivecleanup.c
new file mode 100644
index 0000000000..0f53b4d439
--- /dev/null
+++ b/contrib/pg_archivecleanup/pg_archivecleanup.c
@@ -0,0 +1,320 @@
+/*
+ * $PostgreSQL: pgsql/contrib/pg_archivecleanup/pg_archivecleanup.c,v 1.3 2010/07/06 19:18:55 momjian Exp $
+ *
+ * pg_archivecleanup.c
+ *
+ * Production-ready example of an archive_cleanup_command
+ * used to clean an archive when using standby_mode = on in 9.0
+ * or for standalone use for any version of PostgreSQL 8.0+.
+ *
+ * Original author:		Simon Riggs  [email protected]
+ * Current maintainer:	Simon Riggs
+ */
+#include "postgres_fe.h"
+
+#include <ctype.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <signal.h>
+
+#ifdef WIN32
+int			getopt(int argc, char *const argv[], const char *optstring);
+#else
+#include <sys/time.h>
+#include <unistd.h>
+
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+#endif   /* ! WIN32 */
+
+extern char *optarg;
+extern int	optind;
+
+const char *progname;
+
+/* Options and defaults */
+bool		debug = false;		/* are we debugging? */
+
+char	   *archiveLocation;	/* where to find the archive? */
+char	   *restartWALFileName; /* the file from which we can restart restore */
+char		WALFilePath[MAXPGPATH];		/* the file path including archive */
+char		exclusiveCleanupFileName[MAXPGPATH];		/* the oldest file we
+														 * want to remain in
+														 * archive */
+
+
+/* =====================================================================
+ *
+ *		  Customizable section
+ *
+ * =====================================================================
+ *
+ *	Currently, this section assumes that the Archive is a locally
+ *	accessible directory. If you want to make other assumptions,
+ *	such as using a vendor-specific archive and access API, these
+ *	routines are the ones you'll need to change. You're
+ *	enouraged to submit any changes to [email protected]
+ *	or personally to the current maintainer. Those changes may be
+ *	folded in to later versions of this program.
+ */
+
+#define XLOG_DATA_FNAME_LEN		24
+/* Reworked from access/xlog_internal.h */
+#define XLogFileName(fname, tli, log, seg)	\
+	snprintf(fname, XLOG_DATA_FNAME_LEN + 1, "%08X%08X%08X", tli, log, seg)
+#define XLOG_BACKUP_FNAME_LEN	40
+
+/*
+ *	Initialize allows customized commands into the archive cleanup program.
+ *
+ *	You may wish to add code to check for tape libraries, etc..
+ */
+static void
+Initialize(void)
+{
+	/*
+	 * This code assumes that archiveLocation is a directory, so we use stat
+	 * to test if it's accessible.
+	 */
+	struct stat stat_buf;
+
+	if (stat(archiveLocation, &stat_buf) != 0 ||
+		!S_ISDIR(stat_buf.st_mode))
+	{
+		fprintf(stderr, "%s: archiveLocation \"%s\" does not exist\n",
+				progname, archiveLocation);
+		exit(2);
+	}
+}
+
+static void
+CleanupPriorWALFiles(void)
+{
+	int			rc;
+	DIR		   *xldir;
+	struct dirent *xlde;
+
+	if ((xldir = opendir(archiveLocation)) != NULL)
+	{
+		while ((xlde = readdir(xldir)) != NULL)
+		{
+			/*
+			 * We ignore the timeline part of the XLOG segment identifiers in
+			 * deciding whether a segment is still needed.	This ensures that
+			 * we won't prematurely remove a segment from a parent timeline.
+			 * We could probably be a little more proactive about removing
+			 * segments of non-parent timelines, but that would be a whole lot
+			 * more complicated.
+			 *
+			 * We use the alphanumeric sorting property of the filenames to
+			 * decide which ones are earlier than the exclusiveCleanupFileName
+			 * file. Note that this means files are not removed in the order
+			 * they were originally written, in case this worries you.
+			 */
+			if (strlen(xlde->d_name) == XLOG_DATA_FNAME_LEN &&
+			strspn(xlde->d_name, "0123456789ABCDEF") == XLOG_DATA_FNAME_LEN &&
+				strcmp(xlde->d_name + 8, exclusiveCleanupFileName + 8) < 0)
+			{
+#ifdef WIN32
+				snprintf(WALFilePath, MAXPGPATH, "%s\\%s", archiveLocation, xlde->d_name);
+#else
+				snprintf(WALFilePath, MAXPGPATH, "%s/%s", archiveLocation, xlde->d_name);
+#endif
+
+				if (debug)
+					fprintf(stderr, "%s: removing file \"%s\"\n",
+							progname, WALFilePath);
+
+				rc = unlink(WALFilePath);
+				if (rc != 0)
+				{
+					fprintf(stderr, "%s: ERROR: could not remove file \"%s\": %s\n",
+							progname, WALFilePath, strerror(errno));
+					break;
+				}
+			}
+		}
+		closedir(xldir);
+	}
+	else
+		fprintf(stderr, "%s: could not open archiveLocation \"%s\": %s\n",
+				progname, archiveLocation, strerror(errno));
+}
+
+/*
+ * SetWALFileNameForCleanup()
+ *
+ *	  Set the earliest WAL filename that we want to keep on the archive
+ *	  and decide whether we need_cleanup
+ */
+static void
+SetWALFileNameForCleanup(void)
+{
+	bool		fnameOK = false;
+
+	/*
+	 * If restartWALFileName is a WAL file name then just use it directly. If
+	 * restartWALFileName is a .backup filename, make sure we use the prefix
+	 * of the filename, otherwise we will remove wrong files since
+	 * 000000010000000000000010.00000020.backup is after
+	 * 000000010000000000000010.
+	 */
+	if (strlen(restartWALFileName) == XLOG_DATA_FNAME_LEN &&
+		strspn(restartWALFileName, "0123456789ABCDEF") == XLOG_DATA_FNAME_LEN)
+	{
+		strcpy(exclusiveCleanupFileName, restartWALFileName);
+		fnameOK = true;
+	}
+	else if (strlen(restartWALFileName) == XLOG_BACKUP_FNAME_LEN)
+	{
+		int			args;
+		uint32		tli = 1,
+					log = 0,
+					seg = 0,
+					offset = 0;
+
+		args = sscanf(restartWALFileName, "%08X%08X%08X.%08X.backup", &tli, &log, &seg, &offset);
+		if (args == 4)
+		{
+			fnameOK = true;
+
+			/*
+			 * Use just the prefix of the filename, ignore everything after
+			 * first period
+			 */
+			XLogFileName(exclusiveCleanupFileName, tli, log, seg);
+		}
+	}
+
+	if (!fnameOK)
+	{
+		fprintf(stderr, "%s: invalid filename input\n", progname);
+		fprintf(stderr, "Try \"%s --help\" for more information.\n", progname);
+		exit(2);
+	}
+}
+
+/* =====================================================================
+ *		  End of Customizable section
+ * =====================================================================
+ */
+
+static void
+usage(void)
+{
+	printf("%s removes older WAL files from PostgreSQL archives.\n\n", progname);
+	printf("Usage:\n");
+	printf("  %s [OPTION]... ARCHIVELOCATION OLDESTKEPTWALFILE\n", progname);
+	printf("\n"
+		   "for use as an archive_cleanup_command in the recovery.conf when standby_mode = on:\n"
+		   "  archive_cleanup_command = 'pg_archivecleanup [OPTION]... ARCHIVELOCATION %%r'\n"
+		   "e.g.\n"
+		   "  archive_cleanup_command = 'pg_archivecleanup /mnt/server/archiverdir %%r'\n");
+	printf("\n"
+		   "or for use as a standalone archive cleaner:\n"
+		   "e.g.\n"
+		   "  pg_archivecleanup /mnt/server/archiverdir 000000010000000000000010.00000020.backup\n");
+	printf("\nOptions:\n");
+	printf("  -d                 generates debug output (verbose mode)\n");
+	printf("  --help             show this help, then exit\n");
+	printf("  --version          output version information, then exit\n");
+	printf("\nReport bugs to <[email protected]>.\n");
+}
+
+/*------------ MAIN ----------------------------------------*/
+int
+main(int argc, char **argv)
+{
+	int			c;
+
+	progname = get_progname(argv[0]);
+
+	if (argc > 1)
+	{
+		if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0)
+		{
+			usage();
+			exit(0);
+		}
+		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
+		{
+			puts("pg_archivecleanup (PostgreSQL) " PG_VERSION);
+			exit(0);
+		}
+	}
+
+	while ((c = getopt(argc, argv, "d")) != -1)
+	{
+		switch (c)
+		{
+			case 'd':			/* Debug mode */
+				debug = true;
+				break;
+			default:
+				fprintf(stderr, "Try \"%s --help\" for more information.\n", progname);
+				exit(2);
+				break;
+		}
+	}
+
+	/*
+	 * We will go to the archiveLocation to check restartWALFileName.
+	 * restartWALFileName may not exist anymore, which would not be an error,
+	 * so we separate the archiveLocation and restartWALFileName so we can
+	 * check separately whether archiveLocation exists, if not that is an
+	 * error
+	 */
+	if (optind < argc)
+	{
+		archiveLocation = argv[optind];
+		optind++;
+	}
+	else
+	{
+		fprintf(stderr, "%s: must specify archive location\n", progname);
+		fprintf(stderr, "Try \"%s --help\" for more information.\n", progname);
+		exit(2);
+	}
+
+	if (optind < argc)
+	{
+		restartWALFileName = argv[optind];
+		optind++;
+	}
+	else
+	{
+		fprintf(stderr, "%s: must specify restartfilename\n", progname);
+		fprintf(stderr, "Try \"%s --help\" for more information.\n", progname);
+		exit(2);
+	}
+
+	if (optind < argc)
+	{
+		fprintf(stderr, "%s: too many parameters\n", progname);
+		fprintf(stderr, "Try \"%s --help\" for more information.\n", progname);
+		exit(2);
+	}
+
+	/*
+	 * Check archive exists and other initialization if required.
+	 */
+	Initialize();
+
+	/*
+	 * Check filename is a valid name, then process to find cut-off
+	 */
+	SetWALFileNameForCleanup();
+
+	if (debug)
+		fprintf(stderr, "%s: keep WAL file \"%s\" and later\n",
+				progname, exclusiveCleanupFileName);
+
+	/*
+	 * Remove WAL files older than cut-off
+	 */
+	CleanupPriorWALFiles();
+
+	exit(0);
+}
diff --git a/contrib/pg_standby/Makefile b/contrib/pg_standby/Makefile
index 3e0ccb00fa..5e6bbd9145 100644
--- a/contrib/pg_standby/Makefile
+++ b/contrib/pg_standby/Makefile
@@ -1,11 +1,11 @@
-# $PostgreSQL: pgsql/contrib/pg_standby/Makefile,v 1.4 2007/11/10 23:59:51 momjian Exp $
+# $PostgreSQL: pgsql/contrib/pg_standby/Makefile,v 1.6 2010/05/12 11:33:07 momjian Exp $
+
+PGFILEDESC = "pg_standby - supports creation of a warm standby"
+PGAPPICON=win32
 
 PROGRAM = pg_standby
 OBJS	= pg_standby.o
 
-PG_CPPFLAGS = -I$(libpq_srcdir)
-PG_LIBS = $(libpq_pgport)
-
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
index eb22f73e8e..70680e762d 100644
--- a/contrib/pg_standby/pg_standby.c
+++ b/contrib/pg_standby/pg_standby.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.26 2009/06/25 19:33:25 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.29 2010/05/15 09:31:57 heikki Exp $
  *
  *
  * pg_standby.c
@@ -56,7 +56,9 @@ bool		debug = false;		/* are we debugging? */
 bool		need_cleanup = false;		/* do we need to remove files from
 										 * archive? */
 
+#ifndef WIN32
 static volatile sig_atomic_t signaled = false;
+#endif
 
 char	   *archiveLocation;	/* where to find the archive? */
 char	   *triggerPath;		/* where to find the trigger file? */
@@ -167,7 +169,7 @@ CustomizableInitialize(void)
 	/*
 	 * This code assumes that archiveLocation is a directory You may wish to
 	 * add code to check for tape libraries, etc.. So, since it is a
-	 * directory, we use stat to test if its accessible
+	 * directory, we use stat to test if it's accessible
 	 */
 	if (stat(archiveLocation, &stat_buf) != 0)
 	{
@@ -188,8 +190,8 @@ CustomizableNextWALFileReady()
 	if (stat(WALFilePath, &stat_buf) == 0)
 	{
 		/*
-		 * If its a backup file, return immediately If its a regular file
-		 * return only if its the right size already
+		 * If it's a backup file, return immediately. If it's a regular file
+		 * return only if it's the right size already.
 		 */
 		if (strlen(nextWALFileName) > 24 &&
 			strspn(nextWALFileName, "0123456789ABCDEF") == 24 &&
@@ -248,7 +250,7 @@ CustomizableCleanupPriorWALFiles(void)
 		struct dirent *xlde;
 
 		/*
-		 * Assume its OK to keep failing. The failure situation may change
+		 * Assume it's OK to keep failing. The failure situation may change
 		 * over time, so we'd rather keep going on the main processing than
 		 * fail because we couldnt clean up yet.
 		 */
@@ -535,13 +537,13 @@ usage(void)
 	printf("\nReport bugs to <[email protected]>.\n");
 }
 
+#ifndef WIN32
 static void
 sighandler(int sig)
 {
 	signaled = true;
 }
 
-#ifndef WIN32
 /* We don't want SIGQUIT to core dump */
 static void
 sigquit_handler(int sig)
@@ -573,6 +575,8 @@ main(int argc, char **argv)
 		}
 	}
 
+#ifndef WIN32
+
 	/*
 	 * You can send SIGUSR1 to trigger failover.
 	 *
@@ -584,10 +588,11 @@ main(int argc, char **argv)
 	 * out to be a bad idea because postmaster uses SIGQUIT to request
 	 * immediate shutdown. We still trap SIGINT, but that may change in a
 	 * future release.
+	 *
+	 * There's no way to trigger failover via signal on Windows.
 	 */
 	(void) signal(SIGUSR1, sighandler);
 	(void) signal(SIGINT, sighandler);	/* deprecated, use SIGUSR1 */
-#ifndef WIN32
 	(void) signal(SIGQUIT, sigquit_handler);
 #endif
 
@@ -610,9 +615,10 @@ main(int argc, char **argv)
 				}
 				break;
 			case 'l':			/* Use link */
+
 				/*
-				 * Link feature disabled, possibly permanently. Linking
-				 * causes a problem after recovery ends that is not currently
+				 * Link feature disabled, possibly permanently. Linking causes
+				 * a problem after recovery ends that is not currently
 				 * resolved by PostgreSQL. 25 Jun 2009
 				 */
 #ifdef NOT_USED
@@ -763,6 +769,7 @@ main(int argc, char **argv)
 	{
 		/* Check for trigger file or signal first */
 		CheckForExternalTrigger();
+#ifndef WIN32
 		if (signaled)
 		{
 			Failover = FastFailover;
@@ -772,6 +779,7 @@ main(int argc, char **argv)
 				fflush(stderr);
 			}
 		}
+#endif
 
 		/*
 		 * Check for fast failover immediately, before checking if the
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c
index 5a818ba042..eb89aeca80 100644
--- a/contrib/pg_stat_statements/pg_stat_statements.c
+++ b/contrib/pg_stat_statements/pg_stat_statements.c
@@ -11,10 +11,10 @@
  * disappear!) and also take the entry's mutex spinlock.
  *
  *
- * Copyright (c) 2008-2009, PostgreSQL Global Development Group
+ * Copyright (c) 2008-2010, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/contrib/pg_stat_statements/pg_stat_statements.c,v 1.3 2009/06/11 14:48:51 momjian Exp $
+ *	  $PostgreSQL: pgsql/contrib/pg_stat_statements/pg_stat_statements.c,v 1.14 2010/04/28 16:54:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,12 +26,14 @@
 #include "catalog/pg_type.h"
 #include "executor/executor.h"
 #include "executor/instrument.h"
+#include "funcapi.h"
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
 #include "pgstat.h"
 #include "storage/fd.h"
 #include "storage/ipc.h"
 #include "storage/spin.h"
+#include "tcop/utility.h"
 #include "utils/builtins.h"
 #include "utils/hsearch.h"
 #include "utils/guc.h"
@@ -43,7 +45,7 @@ PG_MODULE_MAGIC;
 #define PGSS_DUMP_FILE	"global/pg_stat_statements.stat"
 
 /* This constant defines the magic number in the stats file header */
-static const uint32 PGSS_FILE_HEADER = 0x20081202;
+static const uint32 PGSS_FILE_HEADER = 0x20100108;
 
 /* XXX: Should USAGE_EXEC reflect execution time and/or buffer usage? */
 #define USAGE_EXEC(duration)	(1.0)
@@ -77,6 +79,14 @@ typedef struct Counters
 	int64		calls;			/* # of times executed */
 	double		total_time;		/* total execution time in seconds */
 	int64		rows;			/* total # of retrieved or affected rows */
+	int64		shared_blks_hit;	/* # of shared buffer hits */
+	int64		shared_blks_read;		/* # of shared disk blocks read */
+	int64		shared_blks_written;	/* # of shared disk blocks written */
+	int64		local_blks_hit; /* # of local buffer hits */
+	int64		local_blks_read;	/* # of local disk blocks read */
+	int64		local_blks_written;		/* # of local disk blocks written */
+	int64		temp_blks_read; /* # of temp blocks read */
+	int64		temp_blks_written;		/* # of temp blocks written */
 	double		usage;			/* usage factor */
 } Counters;
 
@@ -113,6 +123,7 @@ static shmem_startup_hook_type prev_shmem_startup_hook = NULL;
 static ExecutorStart_hook_type prev_ExecutorStart = NULL;
 static ExecutorRun_hook_type prev_ExecutorRun = NULL;
 static ExecutorEnd_hook_type prev_ExecutorEnd = NULL;
+static ProcessUtility_hook_type prev_ProcessUtility = NULL;
 
 /* Links to shared memory state */
 static pgssSharedState *pgss = NULL;
@@ -124,10 +135,11 @@ typedef enum
 {
 	PGSS_TRACK_NONE,			/* track no statements */
 	PGSS_TRACK_TOP,				/* only top level statements */
-	PGSS_TRACK_ALL,				/* all statements, including nested ones */
+	PGSS_TRACK_ALL				/* all statements, including nested ones */
 } PGSSTrackLevel;
 
-static const struct config_enum_entry track_options[] = {
+static const struct config_enum_entry track_options[] =
+{
 	{"none", PGSS_TRACK_NONE, false},
 	{"top", PGSS_TRACK_TOP, false},
 	{"all", PGSS_TRACK_ALL, false},
@@ -136,6 +148,7 @@ static const struct config_enum_entry track_options[] = {
 
 static int	pgss_max;			/* max # statements to track */
 static int	pgss_track;			/* tracking level */
+static bool pgss_track_utility; /* whether to track utility commands */
 static bool pgss_save;			/* whether to save stats across shutdown */
 
 
@@ -161,10 +174,13 @@ static void pgss_ExecutorRun(QueryDesc *queryDesc,
 				 ScanDirection direction,
 				 long count);
 static void pgss_ExecutorEnd(QueryDesc *queryDesc);
+static void pgss_ProcessUtility(Node *parsetree,
+			  const char *queryString, ParamListInfo params, bool isTopLevel,
+					DestReceiver *dest, char *completionTag);
 static uint32 pgss_hash_fn(const void *key, Size keysize);
 static int	pgss_match_fn(const void *key1, const void *key2, Size keysize);
-static void pgss_store(const char *query,
-		   const Instrumentation *instr, uint32 rows);
+static void pgss_store(const char *query, double total_time, uint64 rows,
+		   const BufferUsage *bufusage);
 static Size pgss_memsize(void);
 static pgssEntry *entry_alloc(pgssHashKey *key);
 static void entry_dealloc(void);
@@ -214,6 +230,16 @@ _PG_init(void)
 							 NULL,
 							 NULL);
 
+	DefineCustomBoolVariable("pg_stat_statements.track_utility",
+	   "Selects whether utility commands are tracked by pg_stat_statements.",
+							 NULL,
+							 &pgss_track_utility,
+							 true,
+							 PGC_SUSET,
+							 0,
+							 NULL,
+							 NULL);
+
 	DefineCustomBoolVariable("pg_stat_statements.save",
 			   "Save pg_stat_statements statistics across server shutdowns.",
 							 NULL,
@@ -245,6 +271,8 @@ _PG_init(void)
 	ExecutorRun_hook = pgss_ExecutorRun;
 	prev_ExecutorEnd = ExecutorEnd_hook;
 	ExecutorEnd_hook = pgss_ExecutorEnd;
+	prev_ProcessUtility = ProcessUtility_hook;
+	ProcessUtility_hook = pgss_ProcessUtility;
 }
 
 /*
@@ -254,10 +282,11 @@ void
 _PG_fini(void)
 {
 	/* Uninstall hooks. */
+	shmem_startup_hook = prev_shmem_startup_hook;
 	ExecutorStart_hook = prev_ExecutorStart;
 	ExecutorRun_hook = prev_ExecutorRun;
 	ExecutorEnd_hook = prev_ExecutorEnd;
-	shmem_startup_hook = prev_shmem_startup_hook;
+	ProcessUtility_hook = prev_ProcessUtility;
 }
 
 /*
@@ -292,8 +321,6 @@ pgss_shmem_startup(void)
 	pgss = ShmemInitStruct("pg_stat_statements",
 						   sizeof(pgssSharedState),
 						   &found);
-	if (!pgss)
-		elog(ERROR, "out of shared memory");
 
 	if (!found)
 	{
@@ -314,8 +341,6 @@ pgss_shmem_startup(void)
 							  pgss_max, pgss_max,
 							  &info,
 							  HASH_ELEM | HASH_FUNCTION | HASH_COMPARE);
-	if (!pgss_hash)
-		elog(ERROR, "out of shared memory");
 
 	LWLockRelease(AddinShmemInitLock);
 
@@ -327,14 +352,16 @@ pgss_shmem_startup(void)
 		on_shmem_exit(pgss_shmem_shutdown, (Datum) 0);
 
 	/*
-	 * Attempt to load old statistics from the dump file.
-	 *
-	 * Note: we don't bother with locks here, because there should be no other
-	 * processes running when this is called.
+	 * Attempt to load old statistics from the dump file, if this is the first
+	 * time through and we weren't told not to.
 	 */
-	if (!pgss_save)
+	if (found || !pgss_save)
 		return;
 
+	/*
+	 * Note: we don't bother with locks here, because there should be no other
+	 * processes running when this code is reached.
+	 */
 	file = AllocateFile(PGSS_DUMP_FILE, PG_BINARY_R);
 	if (file == NULL)
 	{
@@ -493,7 +520,7 @@ pgss_ExecutorStart(QueryDesc *queryDesc, int eflags)
 			MemoryContext oldcxt;
 
 			oldcxt = MemoryContextSwitchTo(queryDesc->estate->es_query_cxt);
-			queryDesc->totaltime = InstrAlloc(1);
+			queryDesc->totaltime = InstrAlloc(1, INSTRUMENT_ALL);
 			MemoryContextSwitchTo(oldcxt);
 		}
 	}
@@ -537,8 +564,9 @@ pgss_ExecutorEnd(QueryDesc *queryDesc)
 		InstrEndLoop(queryDesc->totaltime);
 
 		pgss_store(queryDesc->sourceText,
-				   queryDesc->totaltime,
-				   queryDesc->estate->es_processed);
+				   queryDesc->totaltime->total,
+				   queryDesc->estate->es_processed,
+				   &queryDesc->totaltime->bufusage);
 	}
 
 	if (prev_ExecutorEnd)
@@ -548,6 +576,82 @@ pgss_ExecutorEnd(QueryDesc *queryDesc)
 }
 
 /*
+ * ProcessUtility hook
+ */
+static void
+pgss_ProcessUtility(Node *parsetree, const char *queryString,
+					ParamListInfo params, bool isTopLevel,
+					DestReceiver *dest, char *completionTag)
+{
+	if (pgss_track_utility && pgss_enabled())
+	{
+		instr_time	start;
+		instr_time	duration;
+		uint64		rows = 0;
+		BufferUsage bufusage;
+
+		bufusage = pgBufferUsage;
+		INSTR_TIME_SET_CURRENT(start);
+
+		nested_level++;
+		PG_TRY();
+		{
+			if (prev_ProcessUtility)
+				prev_ProcessUtility(parsetree, queryString, params,
+									isTopLevel, dest, completionTag);
+			else
+				standard_ProcessUtility(parsetree, queryString, params,
+										isTopLevel, dest, completionTag);
+			nested_level--;
+		}
+		PG_CATCH();
+		{
+			nested_level--;
+			PG_RE_THROW();
+		}
+		PG_END_TRY();
+
+		INSTR_TIME_SET_CURRENT(duration);
+		INSTR_TIME_SUBTRACT(duration, start);
+
+		/* parse command tag to retrieve the number of affected rows. */
+		if (completionTag &&
+			sscanf(completionTag, "COPY " UINT64_FORMAT, &rows) != 1)
+			rows = 0;
+
+		/* calc differences of buffer counters. */
+		bufusage.shared_blks_hit =
+			pgBufferUsage.shared_blks_hit - bufusage.shared_blks_hit;
+		bufusage.shared_blks_read =
+			pgBufferUsage.shared_blks_read - bufusage.shared_blks_read;
+		bufusage.shared_blks_written =
+			pgBufferUsage.shared_blks_written - bufusage.shared_blks_written;
+		bufusage.local_blks_hit =
+			pgBufferUsage.local_blks_hit - bufusage.local_blks_hit;
+		bufusage.local_blks_read =
+			pgBufferUsage.local_blks_read - bufusage.local_blks_read;
+		bufusage.local_blks_written =
+			pgBufferUsage.local_blks_written - bufusage.local_blks_written;
+		bufusage.temp_blks_read =
+			pgBufferUsage.temp_blks_read - bufusage.temp_blks_read;
+		bufusage.temp_blks_written =
+			pgBufferUsage.temp_blks_written - bufusage.temp_blks_written;
+
+		pgss_store(queryString, INSTR_TIME_GET_DOUBLE(duration), rows,
+				   &bufusage);
+	}
+	else
+	{
+		if (prev_ProcessUtility)
+			prev_ProcessUtility(parsetree, queryString, params,
+								isTopLevel, dest, completionTag);
+		else
+			standard_ProcessUtility(parsetree, queryString, params,
+									isTopLevel, dest, completionTag);
+	}
+}
+
+/*
  * Calculate hash value for a key
  */
 static uint32
@@ -585,7 +689,8 @@ pgss_match_fn(const void *key1, const void *key2, Size keysize)
  * Store some statistics for a statement.
  */
 static void
-pgss_store(const char *query, const Instrumentation *instr, uint32 rows)
+pgss_store(const char *query, double total_time, uint64 rows,
+		   const BufferUsage *bufusage)
 {
 	pgssHashKey key;
 	double		usage;
@@ -629,8 +734,16 @@ pgss_store(const char *query, const Instrumentation *instr, uint32 rows)
 
 		SpinLockAcquire(&e->mutex);
 		e->counters.calls += 1;
-		e->counters.total_time += instr->total;
+		e->counters.total_time += total_time;
 		e->counters.rows += rows;
+		e->counters.shared_blks_hit += bufusage->shared_blks_hit;
+		e->counters.shared_blks_read += bufusage->shared_blks_read;
+		e->counters.shared_blks_written += bufusage->shared_blks_written;
+		e->counters.local_blks_hit += bufusage->local_blks_hit;
+		e->counters.local_blks_read += bufusage->local_blks_read;
+		e->counters.local_blks_written += bufusage->local_blks_written;
+		e->counters.temp_blks_read += bufusage->temp_blks_read;
+		e->counters.temp_blks_written += bufusage->temp_blks_written;
 		e->counters.usage += usage;
 		SpinLockRelease(&e->mutex);
 	}
@@ -652,7 +765,7 @@ pg_stat_statements_reset(PG_FUNCTION_ARGS)
 	PG_RETURN_VOID();
 }
 
-#define PG_STAT_STATEMENTS_COLS		6
+#define PG_STAT_STATEMENTS_COLS		14
 
 /*
  * Retrieve statement statistics.
@@ -686,28 +799,20 @@ pg_stat_statements(PG_FUNCTION_ARGS)
 				 errmsg("materialize mode required, but it is not " \
 						"allowed in this context")));
 
+	/* Build a tuple descriptor for our result type */
+	if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
+		elog(ERROR, "return type must be a row type");
+
 	per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
 	oldcontext = MemoryContextSwitchTo(per_query_ctx);
 
-	tupdesc = CreateTemplateTupleDesc(PG_STAT_STATEMENTS_COLS, false);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "userid",
-					   OIDOID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "dbid",
-					   OIDOID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "query",
-					   TEXTOID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 4, "calls",
-					   INT8OID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 5, "total_time",
-					   FLOAT8OID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 6, "rows",
-					   INT8OID, -1, 0);
-
 	tupstore = tuplestore_begin_heap(true, false, work_mem);
 	rsinfo->returnMode = SFRM_Materialize;
 	rsinfo->setResult = tupstore;
 	rsinfo->setDesc = tupdesc;
 
+	MemoryContextSwitchTo(oldcontext);
+
 	LWLockAcquire(pgss->lock, LW_SHARED);
 
 	hash_seq_init(&hash_seq, pgss_hash);
@@ -718,9 +823,6 @@ pg_stat_statements(PG_FUNCTION_ARGS)
 		int			i = 0;
 		Counters	tmp;
 
-		/* generate junk in short-term context */
-		MemoryContextSwitchTo(oldcontext);
-
 		memset(values, 0, sizeof(values));
 		memset(nulls, 0, sizeof(nulls));
 
@@ -755,11 +857,17 @@ pg_stat_statements(PG_FUNCTION_ARGS)
 		values[i++] = Int64GetDatumFast(tmp.calls);
 		values[i++] = Float8GetDatumFast(tmp.total_time);
 		values[i++] = Int64GetDatumFast(tmp.rows);
+		values[i++] = Int64GetDatumFast(tmp.shared_blks_hit);
+		values[i++] = Int64GetDatumFast(tmp.shared_blks_read);
+		values[i++] = Int64GetDatumFast(tmp.shared_blks_written);
+		values[i++] = Int64GetDatumFast(tmp.local_blks_hit);
+		values[i++] = Int64GetDatumFast(tmp.local_blks_read);
+		values[i++] = Int64GetDatumFast(tmp.local_blks_written);
+		values[i++] = Int64GetDatumFast(tmp.temp_blks_read);
+		values[i++] = Int64GetDatumFast(tmp.temp_blks_written);
 
 		Assert(i == PG_STAT_STATEMENTS_COLS);
 
-		/* switch to appropriate context while storing the tuple */
-		MemoryContextSwitchTo(per_query_ctx);
 		tuplestore_putvalues(tupstore, tupdesc, values, nulls);
 	}
 
@@ -768,8 +876,6 @@ pg_stat_statements(PG_FUNCTION_ARGS)
 	/* clean up and return the tuplestore */
 	tuplestore_donestoring(tupstore);
 
-	MemoryContextSwitchTo(oldcontext);
-
 	return (Datum) 0;
 }
 
diff --git a/contrib/pg_stat_statements/pg_stat_statements.sql.in b/contrib/pg_stat_statements/pg_stat_statements.sql.in
index 7655136ed9..cf82a0e3dc 100644
--- a/contrib/pg_stat_statements/pg_stat_statements.sql.in
+++ b/contrib/pg_stat_statements/pg_stat_statements.sql.in
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/contrib/pg_stat_statements/pg_stat_statements.sql.in,v 1.1 2009/01/04 22:19:59 tgl Exp $ */
+/* $PostgreSQL: pgsql/contrib/pg_stat_statements/pg_stat_statements.sql.in,v 1.2 2010/01/08 00:38:19 itagaki Exp $ */
 
 -- Adjust this setting to control where the objects get created.
 SET search_path = public;
@@ -15,7 +15,15 @@ CREATE FUNCTION pg_stat_statements(
     OUT query text,
     OUT calls int8,
     OUT total_time float8,
-    OUT rows int8
+    OUT rows int8,
+    OUT shared_blks_hit int8,
+    OUT shared_blks_read int8,
+    OUT shared_blks_written int8,
+    OUT local_blks_hit int8,
+    OUT local_blks_read int8,
+    OUT local_blks_written int8,
+    OUT temp_blks_read int8,
+    OUT temp_blks_written int8
 )
 RETURNS SETOF record
 AS 'MODULE_PATHNAME'
diff --git a/contrib/pg_upgrade/IMPLEMENTATION b/contrib/pg_upgrade/IMPLEMENTATION
new file mode 100644
index 0000000000..91bee727b4
--- /dev/null
+++ b/contrib/pg_upgrade/IMPLEMENTATION
@@ -0,0 +1,100 @@
+$PostgreSQL: pgsql/contrib/pg_upgrade/IMPLEMENTATION,v 1.3 2010/07/03 14:23:13 momjian Exp $
+
+------------------------------------------------------------------------------
+PG_UPGRADE: IN-PLACE UPGRADES FOR POSTGRESQL
+------------------------------------------------------------------------------
+
+Upgrading a PostgreSQL database from one major release to another can be
+an expensive process. For minor upgrades, you can simply install new
+executables and forget about upgrading existing data. But for major
+upgrades, you have to export all of your data using pg_dump, install the
+new release, run initdb to create a new cluster, and then import your
+old data. If you have a lot of data, that can take a considerable amount
+of time. If you have too much data, you may have to buy more storage
+since you need enough room to hold the original data plus the exported
+data.  pg_upgrade can reduce the amount of time and disk space required
+for many upgrades.  
+
+The URL http://momjian.us/main/writings/pgsql/pg_upgrade.pdf contains a
+presentation about pg_upgrade internals that mirrors the text
+description below.
+
+------------------------------------------------------------------------------
+WHAT IT DOES
+------------------------------------------------------------------------------
+
+pg_upgrade is a tool that performs an in-place upgrade of existing
+data. Some upgrades change the on-disk representation of data;
+pg_upgrade cannot help in those upgrades.  However, many upgrades do
+not change the on-disk representation of a user-defined table.  In those
+cases, pg_upgrade can move existing user-defined tables from the old
+database cluster into the new cluster.
+
+There are two factors that determine whether an in-place upgrade is
+practical.
+
+Every table in a cluster shares the same on-disk representation of the
+table headers and trailers and the on-disk representation of tuple
+headers. If this changes between the old version of PostgreSQL and the
+new version, pg_upgrade cannot move existing tables to the new cluster;
+you will have to pg_dump the old data and then import that data into the
+new cluster.
+
+Second, all data types should have the same binary representation
+between the two major PostgreSQL versions.
+
+------------------------------------------------------------------------------
+HOW IT WORKS
+------------------------------------------------------------------------------
+
+To use pg_upgrade during an upgrade, start by installing a fresh
+cluster using the newest version in a new directory. When you've
+finished installation, the new cluster will contain the new executables
+and the usual template0, template1, and postgres, but no user-defined
+tables. At this point, you can shut down the old and new postmasters and
+invoke pg_upgrade.
+
+When pg_upgrade starts, it ensures that all required executables are
+present and contain the expected version numbers. The verification
+process also checks the old and new $PGDATA directories to ensure that
+the expected files and subdirectories are in place.  If the verification
+process succeeds, pg_upgrade starts the old postmaster and runs
+pg_dumpall --schema-only to capture the metadata contained in the old
+cluster. The script produced by pg_dumpall will be used in a later step
+to recreate all user-defined objects in the new cluster.
+
+Note that the script produced by pg_dumpall will only recreate
+user-defined objects, not system-defined objects.  The new cluster will
+contain the system-defined objects created by the latest version of
+PostgreSQL.
+
+Once pg_upgrade has extracted the metadata from the old cluster, it
+performs a number of bookkeeping tasks required to 'sync up' the new
+cluster with the existing data.
+
+First, pg_upgrade copies the commit status information and 'next
+transaction ID' from the old cluster to the new cluster. This is the
+steps ensures that the proper tuples are visible from the new cluster.
+Remember, pg_upgrade does not export/import the content of user-defined
+tables so the transaction IDs in the new cluster must match the
+transaction IDs in the old data. pg_upgrade also copies the starting
+address for write-ahead logs from the old cluster to the new cluster.
+
+Now pg_upgrade begins reconstructing the metadata obtained from the old
+cluster using the first part of the pg_dumpall output.
+
+Next, pg_upgrade executes the remainder of the script produced earlier
+by pg_dumpall --- this script effectively creates the complete
+user-defined metadata from the old cluster to the new cluster.  It
+preserves the relfilenode numbers so TOAST and other references
+to relfilenodes in user data is preserved.  (See binary-upgrade usage
+in pg_dump).
+
+Finally, pg_upgrade links or copies each user-defined table and its
+supporting indexes and toast tables from the old cluster to the new
+cluster.
+
+An important feature of the pg_upgrade design is that it leaves the
+original cluster intact --- if a problem occurs during the upgrade, you
+can still run the previous version, after renaming the tablespaces back
+to the original names.
diff --git a/contrib/pg_upgrade/Makefile b/contrib/pg_upgrade/Makefile
new file mode 100644
index 0000000000..1998ffe899
--- /dev/null
+++ b/contrib/pg_upgrade/Makefile
@@ -0,0 +1,26 @@
+#
+# Makefile for pg_upgrade
+#
+# $PostgreSQL: pgsql/contrib/pg_upgrade/Makefile,v 1.4 2010/07/03 14:23:13 momjian Exp $
+
+PGFILEDESC = "pg_upgrade - an in-place binary upgrade utility"
+PGAPPICON = win32
+
+PROGRAM  = pg_upgrade
+OBJS = check.o controldata.o dump.o exec.o file.o function.o info.o \
+       option.o page.o pg_upgrade.o relfilenode.o server.o \
+       tablespace.o util.o version.o version_old_8_3.o $(WIN32RES)
+
+PG_CPPFLAGS  = -DFRONTEND -DDLSUFFIX=\"$(DLSUFFIX)\" -I$(srcdir) -I$(libpq_srcdir)
+PG_LIBS = $(libpq_pgport)
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/pg_upgrade
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
diff --git a/contrib/pg_upgrade/TESTING b/contrib/pg_upgrade/TESTING
new file mode 100644
index 0000000000..ca771fefdd
--- /dev/null
+++ b/contrib/pg_upgrade/TESTING
@@ -0,0 +1,69 @@
+$PostgreSQL: pgsql/contrib/pg_upgrade/TESTING,v 1.2 2010/07/03 14:23:13 momjian Exp $
+
+The most effective way to test pg_upgrade, aside from testing on user
+data, is by upgrading the PostgreSQL regression database.
+
+This testing process first requires the creation of a valid regression
+database dump.  Such files contain most database features and are
+specific to each major version of Postgres.
+
+Here are the steps needed to create a regression database dump file:
+
+1)  Create and populate the regression database in the old cluster
+    This database can be created by running 'gmake installcheck' from
+    src/test/regression.
+
+2)  Use pg_dump to dump out the regression database
+    Use the new cluster's pg_dump on the old database to minimize
+    whitespace differences in the diff.
+
+3)  Adjust the regression database dump file
+
+    a)  Change CREATE FUNCTION shared object paths to use '$libdir'
+        The old and new cluster will have different shared object paths.
+
+    b)  Remove 'regex_flavor' (not supported in Postgres 9.0)
+
+    c)  Change CREATE OR REPLACE LANGUAGE to CREATE LANGUAGE
+        The former syntax is only supported in Postgres 9.0.
+
+    d)  Perform the load/dump twice
+        This fixes problems with the ordering of COPY columns for
+        inherited tables.
+
+    e)  Fix any wrapping format differences
+        Commands like CREATE TRIGGER and ALTER TABLE sometimes have
+        differences.
+
+    f)  Adjust extra_float_digits
+	Postgres 9.0 pg_dump uses extra_float_digits=-2 for pre-9.0
+	databases, and extra_float_digits=-3 for >= 9.0 databases.
+	It is necessary to modify 9.0 pg_dump to always use -3, and
+	modify the pre-9.0 old server to accept extra_float_digits=-3.
+
+Once the dump is created, it can be repeatedly loaded into the old
+database, upgraded, and dumped out of the new database, and then
+compared to the original version. To test the dump file, perform these
+steps:
+
+1)  Create the old and new clusters in different directories.
+
+2)  Copy the regression shared object files into the appropriate /lib
+    directory for old and new clusters.
+
+3)  Create the regression database in the old server.
+
+4)  Load the dump file created above into the regression database; 
+    check for errors while loading.
+
+5)  Upgrade the old database to the new major version, as outlined in
+    the pg_upgrade manual section.
+
+6)  Use pg_dump to dump out the regression database in the new cluster.
+
+7)  Diff the regression database dump file with the regression dump
+    file loaded into the old server.
+
+
+
+
diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
new file mode 100644
index 0000000000..0e96705b2d
--- /dev/null
+++ b/contrib/pg_upgrade/check.c
@@ -0,0 +1,441 @@
+/*
+ *	check.c
+ *
+ *	server checks and output routines
+ *
+ *	Copyright (c) 2010, PostgreSQL Global Development Group
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/check.c,v 1.11 2010/07/06 19:18:55 momjian Exp $
+ */
+
+#include "pg_upgrade.h"
+
+
+static void set_locale_and_encoding(migratorContext *ctx, Cluster whichCluster);
+static void check_new_db_is_empty(migratorContext *ctx);
+static void check_locale_and_encoding(migratorContext *ctx, ControlData *oldctrl,
+						  ControlData *newctrl);
+
+
+void
+output_check_banner(migratorContext *ctx, bool *live_check)
+{
+	if (ctx->check && is_server_running(ctx, ctx->old.pgdata))
+	{
+		*live_check = true;
+		if (ctx->old.port == ctx->new.port)
+			pg_log(ctx, PG_FATAL, "When checking a live server, "
+				   "the old and new port numbers must be different.\n");
+		pg_log(ctx, PG_REPORT, "PerForming Consistency Checks on Old Live Server\n");
+		pg_log(ctx, PG_REPORT, "------------------------------------------------\n");
+	}
+	else
+	{
+		pg_log(ctx, PG_REPORT, "Performing Consistency Checks\n");
+		pg_log(ctx, PG_REPORT, "-----------------------------\n");
+	}
+}
+
+
+void
+check_old_cluster(migratorContext *ctx, bool live_check,
+				  char **sequence_script_file_name)
+{
+	/* -- OLD -- */
+
+	if (!live_check)
+		start_postmaster(ctx, CLUSTER_OLD, false);
+
+	set_locale_and_encoding(ctx, CLUSTER_OLD);
+
+	get_pg_database_relfilenode(ctx, CLUSTER_OLD);
+
+	/* Extract a list of databases and tables from the old cluster */
+	get_db_and_rel_infos(ctx, &ctx->old.dbarr, CLUSTER_OLD);
+
+	init_tablespaces(ctx);
+
+	get_loadable_libraries(ctx);
+
+
+	/*
+	 * Check for various failure cases
+	 */
+
+	old_8_3_check_for_isn_and_int8_passing_mismatch(ctx, CLUSTER_OLD);
+
+	/* old = PG 8.3 checks? */
+	if (GET_MAJOR_VERSION(ctx->old.major_version) <= 803)
+	{
+		old_8_3_check_for_name_data_type_usage(ctx, CLUSTER_OLD);
+		old_8_3_check_for_tsquery_usage(ctx, CLUSTER_OLD);
+		if (ctx->check)
+		{
+			old_8_3_rebuild_tsvector_tables(ctx, true, CLUSTER_OLD);
+			old_8_3_invalidate_hash_gin_indexes(ctx, true, CLUSTER_OLD);
+			old_8_3_invalidate_bpchar_pattern_ops_indexes(ctx, true, CLUSTER_OLD);
+		}
+		else
+
+			/*
+			 * While we have the old server running, create the script to
+			 * properly restore its sequence values but we report this at the
+			 * end.
+			 */
+			*sequence_script_file_name =
+				old_8_3_create_sequence_script(ctx, CLUSTER_OLD);
+	}
+
+	/* Pre-PG 9.0 had no large object permissions */
+	if (GET_MAJOR_VERSION(ctx->old.major_version) <= 804)
+		new_9_0_populate_pg_largeobject_metadata(ctx, true, CLUSTER_OLD);
+
+	/*
+	 * While not a check option, we do this now because this is the only time
+	 * the old server is running.
+	 */
+	if (!ctx->check)
+	{
+		generate_old_dump(ctx);
+		split_old_dump(ctx);
+	}
+
+	if (!live_check)
+		stop_postmaster(ctx, false, false);
+}
+
+
+void
+check_new_cluster(migratorContext *ctx)
+{
+	set_locale_and_encoding(ctx, CLUSTER_NEW);
+
+	check_new_db_is_empty(ctx);
+
+	check_loadable_libraries(ctx);
+
+	check_locale_and_encoding(ctx, &ctx->old.controldata, &ctx->new.controldata);
+
+	if (ctx->transfer_mode == TRANSFER_MODE_LINK)
+		check_hard_link(ctx);
+}
+
+
+void
+report_clusters_compatible(migratorContext *ctx)
+{
+	if (ctx->check)
+	{
+		pg_log(ctx, PG_REPORT, "\n*Clusters are compatible*\n");
+		/* stops new cluster */
+		stop_postmaster(ctx, false, false);
+		exit_nicely(ctx, false);
+	}
+
+	pg_log(ctx, PG_REPORT, "\n"
+		   "| If pg_upgrade fails after this point, you must\n"
+		   "| re-initdb the new cluster before continuing.\n"
+		   "| You will also need to remove the \".old\" suffix\n"
+		   "| from %s/global/pg_control.old.\n", ctx->old.pgdata);
+}
+
+
+void
+issue_warnings(migratorContext *ctx, char *sequence_script_file_name)
+{
+	/* old = PG 8.3 warnings? */
+	if (GET_MAJOR_VERSION(ctx->old.major_version) <= 803)
+	{
+		start_postmaster(ctx, CLUSTER_NEW, true);
+
+		/* restore proper sequence values using file created from old server */
+		if (sequence_script_file_name)
+		{
+			prep_status(ctx, "Adjusting sequences");
+			exec_prog(ctx, true,
+				  SYSTEMQUOTE "\"%s/psql\" --set ON_ERROR_STOP=on --port %d "
+				   "--username \"%s\" -f \"%s\" --dbname template1 >> \"%s\""
+					  SYSTEMQUOTE,
+					  ctx->new.bindir, ctx->new.port, ctx->user,
+					  sequence_script_file_name, ctx->logfile);
+			unlink(sequence_script_file_name);
+			check_ok(ctx);
+		}
+
+		old_8_3_rebuild_tsvector_tables(ctx, false, CLUSTER_NEW);
+		old_8_3_invalidate_hash_gin_indexes(ctx, false, CLUSTER_NEW);
+		old_8_3_invalidate_bpchar_pattern_ops_indexes(ctx, false, CLUSTER_NEW);
+		stop_postmaster(ctx, false, true);
+	}
+
+	/* Create dummy large object permissions for old < PG 9.0? */
+	if (GET_MAJOR_VERSION(ctx->old.major_version) <= 804)
+	{
+		start_postmaster(ctx, CLUSTER_NEW, true);
+		new_9_0_populate_pg_largeobject_metadata(ctx, false, CLUSTER_NEW);
+		stop_postmaster(ctx, false, true);
+	}
+}
+
+
+void
+output_completion_banner(migratorContext *ctx, char *deletion_script_file_name)
+{
+	/* Did we migrate the free space files? */
+	if (GET_MAJOR_VERSION(ctx->old.major_version) >= 804)
+		pg_log(ctx, PG_REPORT,
+			   "| Optimizer statistics is not transferred by pg_upgrade\n"
+			   "| so consider running:\n"
+			   "| \tvacuumdb --all --analyze-only\n"
+			   "| on the newly-upgraded cluster.\n\n");
+	else
+		pg_log(ctx, PG_REPORT,
+			   "| Optimizer statistics and free space information\n"
+			   "| are not transferred by pg_upgrade so consider\n"
+			   "| running:\n"
+			   "| \tvacuumdb --all --analyze\n"
+			   "| on the newly-upgraded cluster.\n\n");
+
+	pg_log(ctx, PG_REPORT,
+		   "| Running this script will delete the old cluster's data files:\n"
+		   "| \t%s\n",
+		   deletion_script_file_name);
+}
+
+
+void
+check_cluster_versions(migratorContext *ctx)
+{
+	/* get old and new cluster versions */
+	ctx->old.major_version = get_major_server_version(ctx, &ctx->old.major_version_str, CLUSTER_OLD);
+	ctx->new.major_version = get_major_server_version(ctx, &ctx->new.major_version_str, CLUSTER_NEW);
+
+	/* We allow migration from/to the same major version for beta upgrades */
+
+	if (GET_MAJOR_VERSION(ctx->old.major_version) < 803)
+		pg_log(ctx, PG_FATAL, "This utility can only upgrade from PostgreSQL version 8.3 and later.\n");
+
+	/* Only current PG version is supported as a target */
+	if (GET_MAJOR_VERSION(ctx->new.major_version) != GET_MAJOR_VERSION(PG_VERSION_NUM))
+		pg_log(ctx, PG_FATAL, "This utility can only upgrade to PostgreSQL version %s.\n",
+			   PG_MAJORVERSION);
+
+	/*
+	 * We can't allow downgrading because we use the target pg_dumpall, and
+	 * pg_dumpall cannot operate on new datbase versions, only older versions.
+	 */
+	if (ctx->old.major_version > ctx->new.major_version)
+		pg_log(ctx, PG_FATAL, "This utility cannot be used to downgrade to older major PostgreSQL versions.\n");
+}
+
+
+void
+check_cluster_compatibility(migratorContext *ctx, bool live_check)
+{
+	char		libfile[MAXPGPATH];
+	FILE	   *lib_test;
+
+	/*
+	 * Test pg_upgrade_support.so is in the proper place.	 We cannot copy it
+	 * ourselves because install directories are typically root-owned.
+	 */
+	snprintf(libfile, sizeof(libfile), "%s/pg_upgrade_support%s", ctx->new.libpath,
+			 DLSUFFIX);
+
+	if ((lib_test = fopen(libfile, "r")) == NULL)
+		pg_log(ctx, PG_FATAL,
+			   "\npg_upgrade_support%s must be created and installed in %s\n", DLSUFFIX, libfile);
+	else
+		fclose(lib_test);
+
+	/* get/check pg_control data of servers */
+	get_control_data(ctx, &ctx->old, live_check);
+	get_control_data(ctx, &ctx->new, false);
+	check_control_data(ctx, &ctx->old.controldata, &ctx->new.controldata);
+
+	/* Is it 9.0 but without tablespace directories? */
+	if (GET_MAJOR_VERSION(ctx->new.major_version) == 900 &&
+		ctx->new.controldata.cat_ver < TABLE_SPACE_SUBDIRS)
+		pg_log(ctx, PG_FATAL, "This utility can only upgrade to PostgreSQL version 9.0 after 2010-01-11\n"
+			   "because of backend API changes made during development.\n");
+}
+
+
+/*
+ * set_locale_and_encoding()
+ *
+ * query the database to get the template0 locale
+ */
+static void
+set_locale_and_encoding(migratorContext *ctx, Cluster whichCluster)
+{
+	PGconn	   *conn;
+	PGresult   *res;
+	int			i_encoding;
+	ControlData *ctrl = (whichCluster == CLUSTER_OLD) ?
+	&ctx->old.controldata : &ctx->new.controldata;
+	int			cluster_version = (whichCluster == CLUSTER_OLD) ?
+	ctx->old.major_version : ctx->new.major_version;
+
+	conn = connectToServer(ctx, "template1", whichCluster);
+
+	/* for pg < 80400, we got the values from pg_controldata */
+	if (cluster_version >= 80400)
+	{
+		int			i_datcollate;
+		int			i_datctype;
+
+		res = executeQueryOrDie(ctx, conn,
+								"SELECT datcollate, datctype "
+								"FROM 	pg_catalog.pg_database "
+								"WHERE	datname = 'template0' ");
+		assert(PQntuples(res) == 1);
+
+		i_datcollate = PQfnumber(res, "datcollate");
+		i_datctype = PQfnumber(res, "datctype");
+
+		ctrl->lc_collate = pg_strdup(ctx, PQgetvalue(res, 0, i_datcollate));
+		ctrl->lc_ctype = pg_strdup(ctx, PQgetvalue(res, 0, i_datctype));
+
+		PQclear(res);
+	}
+
+	res = executeQueryOrDie(ctx, conn,
+							"SELECT pg_catalog.pg_encoding_to_char(encoding) "
+							"FROM 	pg_catalog.pg_database "
+							"WHERE	datname = 'template0' ");
+	assert(PQntuples(res) == 1);
+
+	i_encoding = PQfnumber(res, "pg_encoding_to_char");
+	ctrl->encoding = pg_strdup(ctx, PQgetvalue(res, 0, i_encoding));
+
+	PQclear(res);
+
+	PQfinish(conn);
+}
+
+
+/*
+ * check_locale_and_encoding()
+ *
+ *	locale is not in pg_controldata in 8.4 and later so
+ *	we probably had to get via a database query.
+ */
+static void
+check_locale_and_encoding(migratorContext *ctx, ControlData *oldctrl,
+						  ControlData *newctrl)
+{
+	if (strcmp(oldctrl->lc_collate, newctrl->lc_collate) != 0)
+		pg_log(ctx, PG_FATAL,
+			   "old and new cluster lc_collate values do not match\n");
+	if (strcmp(oldctrl->lc_ctype, newctrl->lc_ctype) != 0)
+		pg_log(ctx, PG_FATAL,
+			   "old and new cluster lc_ctype values do not match\n");
+	if (strcmp(oldctrl->encoding, newctrl->encoding) != 0)
+		pg_log(ctx, PG_FATAL,
+			   "old and new cluster encoding values do not match\n");
+}
+
+
+static void
+check_new_db_is_empty(migratorContext *ctx)
+{
+	int			dbnum;
+	bool		found = false;
+
+	get_db_and_rel_infos(ctx, &ctx->new.dbarr, CLUSTER_NEW);
+
+	for (dbnum = 0; dbnum < ctx->new.dbarr.ndbs; dbnum++)
+	{
+		int			relnum;
+		RelInfoArr *rel_arr = &ctx->new.dbarr.dbs[dbnum].rel_arr;
+
+		for (relnum = 0; relnum < rel_arr->nrels;
+			 relnum++)
+		{
+			/* pg_largeobject and its index should be skipped */
+			if (strcmp(rel_arr->rels[relnum].nspname, "pg_catalog") != 0)
+			{
+				found = true;
+				break;
+			}
+		}
+	}
+
+	dbarr_free(&ctx->new.dbarr);
+
+	if (found)
+		pg_log(ctx, PG_FATAL, "New cluster is not empty; exiting\n");
+}
+
+
+/*
+ * create_script_for_old_cluster_deletion()
+ *
+ *	This is particularly useful for tablespace deletion.
+ */
+void
+create_script_for_old_cluster_deletion(migratorContext *ctx,
+									   char **deletion_script_file_name)
+{
+	FILE	   *script = NULL;
+	int			tblnum;
+
+	*deletion_script_file_name = pg_malloc(ctx, MAXPGPATH);
+
+	prep_status(ctx, "Creating script to delete old cluster");
+
+	snprintf(*deletion_script_file_name, MAXPGPATH, "%s/delete_old_cluster.%s",
+			 ctx->cwd, EXEC_EXT);
+
+	if ((script = fopen(*deletion_script_file_name, "w")) == NULL)
+		pg_log(ctx, PG_FATAL, "Could not create necessary file:  %s\n",
+			   *deletion_script_file_name);
+
+#ifndef WIN32
+	/* add shebang header */
+	fprintf(script, "#!/bin/sh\n\n");
+#endif
+
+	/* delete old cluster's default tablespace */
+	fprintf(script, RMDIR_CMD " %s\n", ctx->old.pgdata);
+
+	/* delete old cluster's alternate tablespaces */
+	for (tblnum = 0; tblnum < ctx->num_tablespaces; tblnum++)
+	{
+		/*
+		 * Do the old cluster's per-database directories share a directory
+		 * with a new version-specific tablespace?
+		 */
+		if (strlen(ctx->old.tablespace_suffix) == 0)
+		{
+			/* delete per-database directories */
+			int			dbnum;
+
+			fprintf(script, "\n");
+			for (dbnum = 0; dbnum < ctx->new.dbarr.ndbs; dbnum++)
+			{
+				fprintf(script, RMDIR_CMD " %s%s/%d\n",
+						ctx->tablespaces[tblnum], ctx->old.tablespace_suffix,
+						ctx->old.dbarr.dbs[dbnum].db_oid);
+			}
+		}
+		else
+
+			/*
+			 * Simply delete the tablespace directory, which might be ".old"
+			 * or a version-specific subdirectory.
+			 */
+			fprintf(script, RMDIR_CMD " %s%s\n",
+					ctx->tablespaces[tblnum], ctx->old.tablespace_suffix);
+	}
+
+	fclose(script);
+
+#ifndef WIN32
+	if (chmod(*deletion_script_file_name, S_IRWXU) != 0)
+		pg_log(ctx, PG_FATAL, "Could not add execute permission to file:  %s\n",
+			   *deletion_script_file_name);
+#endif
+
+	check_ok(ctx);
+}
diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c
new file mode 100644
index 0000000000..18c1e89f4b
--- /dev/null
+++ b/contrib/pg_upgrade/controldata.c
@@ -0,0 +1,494 @@
+/*
+ *	controldata.c
+ *
+ *	controldata functions
+ *
+ *	Copyright (c) 2010, PostgreSQL Global Development Group
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/controldata.c,v 1.9 2010/07/06 19:18:55 momjian Exp $
+ */
+
+#include "pg_upgrade.h"
+
+#include <ctype.h>
+
+
+/*
+ * get_control_data()
+ *
+ * gets pg_control information in "ctrl". Assumes that bindir and
+ * datadir are valid absolute paths to postgresql bin and pgdata
+ * directories respectively *and* pg_resetxlog is version compatible
+ * with datadir. The main purpose of this function is to get pg_control
+ * data in a version independent manner.
+ *
+ * The approach taken here is to invoke pg_resetxlog with -n option
+ * and then pipe its output. With little string parsing we get the
+ * pg_control data.  pg_resetxlog cannot be run while the server is running
+ * so we use pg_controldata;  pg_controldata doesn't provide all the fields
+ * we need to actually perform the migration, but it provides enough for
+ * check mode.	We do not implement pg_resetxlog -n because it is hard to
+ * return valid xid data for a running server.
+ */
+void
+get_control_data(migratorContext *ctx, ClusterInfo *cluster, bool live_check)
+{
+	char		cmd[MAXPGPATH];
+	char		bufin[MAX_STRING];
+	FILE	   *output;
+	char	   *p;
+	bool		got_xid = false;
+	bool		got_oid = false;
+	bool		got_log_id = false;
+	bool		got_log_seg = false;
+	bool		got_tli = false;
+	bool		got_align = false;
+	bool		got_blocksz = false;
+	bool		got_largesz = false;
+	bool		got_walsz = false;
+	bool		got_walseg = false;
+	bool		got_ident = false;
+	bool		got_index = false;
+	bool		got_toast = false;
+	bool		got_date_is_int = false;
+	bool		got_float8_pass_by_value = false;
+	char	   *lang = NULL;
+
+	/*
+	 * Because we test the pg_resetxlog output strings, it has to be in
+	 * English.
+	 */
+	if (getenv("LANG"))
+		lang = pg_strdup(ctx, getenv("LANG"));
+#ifndef WIN32
+	putenv(pg_strdup(ctx, "LANG=C"));
+#else
+	SetEnvironmentVariableA("LANG", "C");
+#endif
+	snprintf(cmd, sizeof(cmd), SYSTEMQUOTE "\"%s/%s \"%s\"" SYSTEMQUOTE,
+			 cluster->bindir,
+			 live_check ? "pg_controldata\"" : "pg_resetxlog\" -n",
+			 cluster->pgdata);
+	fflush(stdout);
+	fflush(stderr);
+
+	if ((output = popen(cmd, "r")) == NULL)
+		pg_log(ctx, PG_FATAL, "Could not get control data: %s\n",
+			   getErrorText(errno));
+
+	/* Only pre-8.4 has these so if they are not set below we will check later */
+	cluster->controldata.lc_collate = NULL;
+	cluster->controldata.lc_ctype = NULL;
+
+	/* Only in <= 8.3 */
+	if (GET_MAJOR_VERSION(cluster->major_version) <= 803)
+	{
+		cluster->controldata.float8_pass_by_value = false;
+		got_float8_pass_by_value = true;
+	}
+
+	/* we have the result of cmd in "output". so parse it line by line now */
+	while (fgets(bufin, sizeof(bufin), output))
+	{
+		if (ctx->debug)
+			fputs(bufin, ctx->debug_fd);
+
+#ifdef WIN32
+
+		/*
+		 * Due to an installer bug, LANG=C doesn't work for PG 8.3.3, but does
+		 * work 8.2.6 and 8.3.7, so check for non-ASCII output and suggest a
+		 * minor upgrade.
+		 */
+		if (GET_MAJOR_VERSION(cluster->major_version) <= 803)
+		{
+			for (p = bufin; *p; p++)
+				if (!isascii(*p))
+					pg_log(ctx, PG_FATAL,
+						   "The 8.3 cluster's pg_controldata is incapable of outputting ASCII, even\n"
+						   "with LANG=C.  You must upgrade this cluster to a newer version of Postgres\n"
+						   "8.3 to fix this bug.  Postgres 8.3.7 and later are known to work properly.\n");
+		}
+#endif
+
+		if ((p = strstr(bufin, "pg_control version number:")) != NULL)
+		{
+			p = strchr(p, ':');
+
+			if (p == NULL || strlen(p) <= 1)
+				pg_log(ctx, PG_FATAL, "%d: pg_resetxlog problem\n", __LINE__);
+
+			p++;				/* removing ':' char */
+			cluster->controldata.ctrl_ver = (uint32) atol(p);
+		}
+		else if ((p = strstr(bufin, "Catalog version number:")) != NULL)
+		{
+			p = strchr(p, ':');
+
+			if (p == NULL || strlen(p) <= 1)
+				pg_log(ctx, PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
+
+			p++;				/* removing ':' char */
+			cluster->controldata.cat_ver = (uint32) atol(p);
+		}
+		else if ((p = strstr(bufin, "First log file ID after reset:")) != NULL)
+		{
+			p = strchr(p, ':');
+
+			if (p == NULL || strlen(p) <= 1)
+				pg_log(ctx, PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
+
+			p++;				/* removing ':' char */
+			cluster->controldata.logid = (uint32) atol(p);
+			got_log_id = true;
+		}
+		else if ((p = strstr(bufin, "First log file segment after reset:")) != NULL)
+		{
+			p = strchr(p, ':');
+
+			if (p == NULL || strlen(p) <= 1)
+				pg_log(ctx, PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
+
+			p++;				/* removing ':' char */
+			cluster->controldata.nxtlogseg = (uint32) atol(p);
+			got_log_seg = true;
+		}
+		else if ((p = strstr(bufin, "Latest checkpoint's TimeLineID:")) != NULL)
+		{
+			p = strchr(p, ':');
+
+			if (p == NULL || strlen(p) <= 1)
+				pg_log(ctx, PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
+
+			p++;				/* removing ':' char */
+			cluster->controldata.chkpnt_tli = (uint32) atol(p);
+			got_tli = true;
+		}
+		else if ((p = strstr(bufin, "Latest checkpoint's NextXID:")) != NULL)
+		{
+			char	   *op = strchr(p, '/');
+
+			if (op == NULL)
+				op = strchr(p, ':');
+
+			if (op == NULL || strlen(op) <= 1)
+				pg_log(ctx, PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
+
+			op++;				/* removing ':' char */
+			cluster->controldata.chkpnt_nxtxid = (uint32) atol(op);
+			got_xid = true;
+		}
+		else if ((p = strstr(bufin, "Latest checkpoint's NextOID:")) != NULL)
+		{
+			p = strchr(p, ':');
+
+			if (p == NULL || strlen(p) <= 1)
+				pg_log(ctx, PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
+
+			p++;				/* removing ':' char */
+			cluster->controldata.chkpnt_nxtoid = (uint32) atol(p);
+			got_oid = true;
+		}
+		else if ((p = strstr(bufin, "Maximum data alignment:")) != NULL)
+		{
+			p = strchr(p, ':');
+
+			if (p == NULL || strlen(p) <= 1)
+				pg_log(ctx, PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
+
+			p++;				/* removing ':' char */
+			cluster->controldata.align = (uint32) atol(p);
+			got_align = true;
+		}
+		else if ((p = strstr(bufin, "Database block size:")) != NULL)
+		{
+			p = strchr(p, ':');
+
+			if (p == NULL || strlen(p) <= 1)
+				pg_log(ctx, PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
+
+			p++;				/* removing ':' char */
+			cluster->controldata.blocksz = (uint32) atol(p);
+			got_blocksz = true;
+		}
+		else if ((p = strstr(bufin, "Blocks per segment of large relation:")) != NULL)
+		{
+			p = strchr(p, ':');
+
+			if (p == NULL || strlen(p) <= 1)
+				pg_log(ctx, PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
+
+			p++;				/* removing ':' char */
+			cluster->controldata.largesz = (uint32) atol(p);
+			got_largesz = true;
+		}
+		else if ((p = strstr(bufin, "WAL block size:")) != NULL)
+		{
+			p = strchr(p, ':');
+
+			if (p == NULL || strlen(p) <= 1)
+				pg_log(ctx, PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
+
+			p++;				/* removing ':' char */
+			cluster->controldata.walsz = (uint32) atol(p);
+			got_walsz = true;
+		}
+		else if ((p = strstr(bufin, "Bytes per WAL segment:")) != NULL)
+		{
+			p = strchr(p, ':');
+
+			if (p == NULL || strlen(p) <= 1)
+				pg_log(ctx, PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
+
+			p++;				/* removing ':' char */
+			cluster->controldata.walseg = (uint32) atol(p);
+			got_walseg = true;
+		}
+		else if ((p = strstr(bufin, "Maximum length of identifiers:")) != NULL)
+		{
+			p = strchr(p, ':');
+
+			if (p == NULL || strlen(p) <= 1)
+				pg_log(ctx, PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
+
+			p++;				/* removing ':' char */
+			cluster->controldata.ident = (uint32) atol(p);
+			got_ident = true;
+		}
+		else if ((p = strstr(bufin, "Maximum columns in an index:")) != NULL)
+		{
+			p = strchr(p, ':');
+
+			if (p == NULL || strlen(p) <= 1)
+				pg_log(ctx, PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
+
+			p++;				/* removing ':' char */
+			cluster->controldata.index = (uint32) atol(p);
+			got_index = true;
+		}
+		else if ((p = strstr(bufin, "Maximum size of a TOAST chunk:")) != NULL)
+		{
+			p = strchr(p, ':');
+
+			if (p == NULL || strlen(p) <= 1)
+				pg_log(ctx, PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
+
+			p++;				/* removing ':' char */
+			cluster->controldata.toast = (uint32) atol(p);
+			got_toast = true;
+		}
+		else if ((p = strstr(bufin, "Date/time type storage:")) != NULL)
+		{
+			p = strchr(p, ':');
+
+			if (p == NULL || strlen(p) <= 1)
+				pg_log(ctx, PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
+
+			p++;				/* removing ':' char */
+			cluster->controldata.date_is_int = strstr(p, "64-bit integers") != NULL;
+			got_date_is_int = true;
+		}
+		else if ((p = strstr(bufin, "Float8 argument passing:")) != NULL)
+		{
+			p = strchr(p, ':');
+
+			if (p == NULL || strlen(p) <= 1)
+				pg_log(ctx, PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
+
+			p++;				/* removing ':' char */
+			/* used later for /contrib check */
+			cluster->controldata.float8_pass_by_value = strstr(p, "by value") != NULL;
+			got_float8_pass_by_value = true;
+		}
+		/* In pre-8.4 only */
+		else if ((p = strstr(bufin, "LC_COLLATE:")) != NULL)
+		{
+			p = strchr(p, ':');
+
+			if (p == NULL || strlen(p) <= 1)
+				pg_log(ctx, PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
+
+			p++;				/* removing ':' char */
+			/* skip leading spaces and remove trailing newline */
+			p += strspn(p, " ");
+			if (strlen(p) > 0 && *(p + strlen(p) - 1) == '\n')
+				*(p + strlen(p) - 1) = '\0';
+			cluster->controldata.lc_collate = pg_strdup(ctx, p);
+		}
+		/* In pre-8.4 only */
+		else if ((p = strstr(bufin, "LC_CTYPE:")) != NULL)
+		{
+			p = strchr(p, ':');
+
+			if (p == NULL || strlen(p) <= 1)
+				pg_log(ctx, PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
+
+			p++;				/* removing ':' char */
+			/* skip leading spaces and remove trailing newline */
+			p += strspn(p, " ");
+			if (strlen(p) > 0 && *(p + strlen(p) - 1) == '\n')
+				*(p + strlen(p) - 1) = '\0';
+			cluster->controldata.lc_ctype = pg_strdup(ctx, p);
+		}
+	}
+
+	if (output)
+		pclose(output);
+
+	/* restore LANG */
+	if (lang)
+	{
+#ifndef WIN32
+		char	   *envstr = (char *) pg_malloc(ctx, strlen(lang) + 6);
+
+		sprintf(envstr, "LANG=%s", lang);
+		putenv(envstr);
+#else
+		SetEnvironmentVariableA("LANG", lang);
+#endif
+		pg_free(lang);
+	}
+	else
+	{
+#ifndef WIN32
+		unsetenv("LANG");
+#else
+		SetEnvironmentVariableA("LANG", "");
+#endif
+	}
+
+	/* verify that we got all the mandatory pg_control data */
+	if (!got_xid || !got_oid ||
+		(!live_check && !got_log_id) ||
+		(!live_check && !got_log_seg) ||
+		!got_tli ||
+		!got_align || !got_blocksz || !got_largesz || !got_walsz ||
+		!got_walseg || !got_ident || !got_index || !got_toast ||
+		!got_date_is_int || !got_float8_pass_by_value)
+	{
+		pg_log(ctx, PG_REPORT,
+			"Some required control information is missing;  cannot find:\n");
+
+		if (!got_xid)
+			pg_log(ctx, PG_REPORT, "  checkpoint next XID\n");
+
+		if (!got_oid)
+			pg_log(ctx, PG_REPORT, "  latest checkpoint next OID\n");
+
+		if (!live_check && !got_log_id)
+			pg_log(ctx, PG_REPORT, "  first log file ID after reset\n");
+
+		if (!live_check && !got_log_seg)
+			pg_log(ctx, PG_REPORT, "  first log file segment after reset\n");
+
+		if (!got_tli)
+			pg_log(ctx, PG_REPORT, "  latest checkpoint timeline ID\n");
+
+		if (!got_align)
+			pg_log(ctx, PG_REPORT, "  maximum alignment\n");
+
+		if (!got_blocksz)
+			pg_log(ctx, PG_REPORT, "  block size\n");
+
+		if (!got_largesz)
+			pg_log(ctx, PG_REPORT, "  large relation segment size\n");
+
+		if (!got_walsz)
+			pg_log(ctx, PG_REPORT, "  WAL block size\n");
+
+		if (!got_walseg)
+			pg_log(ctx, PG_REPORT, "  WAL segment size\n");
+
+		if (!got_ident)
+			pg_log(ctx, PG_REPORT, "  maximum identifier length\n");
+
+		if (!got_index)
+			pg_log(ctx, PG_REPORT, "  maximum number of indexed columns\n");
+
+		if (!got_toast)
+			pg_log(ctx, PG_REPORT, "  maximum TOAST chunk size\n");
+
+		if (!got_date_is_int)
+			pg_log(ctx, PG_REPORT, "  dates/times are integers?\n");
+
+		/* value added in Postgres 8.4 */
+		if (!got_float8_pass_by_value)
+			pg_log(ctx, PG_REPORT, "  float8 argument passing method\n");
+
+		pg_log(ctx, PG_FATAL,
+			   "Unable to continue without required control information, terminating\n");
+	}
+}
+
+
+/*
+ * check_control_data()
+ *
+ * check to make sure the control data settings are compatible
+ */
+void
+check_control_data(migratorContext *ctx, ControlData *oldctrl,
+				   ControlData *newctrl)
+{
+	if (oldctrl->align == 0 || oldctrl->align != newctrl->align)
+		pg_log(ctx, PG_FATAL,
+			   "old and new pg_controldata alignments are invalid or do not match\n");
+
+	if (oldctrl->blocksz == 0 || oldctrl->blocksz != newctrl->blocksz)
+		pg_log(ctx, PG_FATAL,
+			   "old and new pg_controldata block sizes are invalid or do not match\n");
+
+	if (oldctrl->largesz == 0 || oldctrl->largesz != newctrl->largesz)
+		pg_log(ctx, PG_FATAL,
+			   "old and new pg_controldata maximum relation segement sizes are invalid or do not match\n");
+
+	if (oldctrl->walsz == 0 || oldctrl->walsz != newctrl->walsz)
+		pg_log(ctx, PG_FATAL,
+			   "old and new pg_controldata WAL block sizes are invalid or do not match\n");
+
+	if (oldctrl->walseg == 0 || oldctrl->walseg != newctrl->walseg)
+		pg_log(ctx, PG_FATAL,
+			   "old and new pg_controldata WAL segment sizes are invalid or do not match\n");
+
+	if (oldctrl->ident == 0 || oldctrl->ident != newctrl->ident)
+		pg_log(ctx, PG_FATAL,
+			   "old and new pg_controldata maximum identifier lengths are invalid or do not match\n");
+
+	if (oldctrl->index == 0 || oldctrl->index != newctrl->index)
+		pg_log(ctx, PG_FATAL,
+			   "old and new pg_controldata maximum indexed columns are invalid or do not match\n");
+
+	if (oldctrl->toast == 0 || oldctrl->toast != newctrl->toast)
+		pg_log(ctx, PG_FATAL,
+			   "old and new pg_controldata maximum TOAST chunk sizes are invalid or do not match\n");
+
+	if (oldctrl->date_is_int != newctrl->date_is_int)
+	{
+		pg_log(ctx, PG_WARNING,
+			   "\nOld and new pg_controldata date/time storage types do not match.\n");
+
+		/*
+		 * This is a common 8.3 -> 8.4 migration problem, so we are more
+		 * verboase
+		 */
+		pg_log(ctx, PG_FATAL,
+			   "You will need to rebuild the new server with configure\n"
+			   "--disable-integer-datetimes or get server binaries built\n"
+			   "with those options.\n");
+	}
+}
+
+
+void
+rename_old_pg_control(migratorContext *ctx)
+{
+	char		old_path[MAXPGPATH],
+				new_path[MAXPGPATH];
+
+	prep_status(ctx, "Adding \".old\" suffix to old global/pg_control");
+
+	snprintf(old_path, sizeof(old_path), "%s/global/pg_control", ctx->old.pgdata);
+	snprintf(new_path, sizeof(new_path), "%s/global/pg_control.old", ctx->old.pgdata);
+	if (pg_mv_file(old_path, new_path) != 0)
+		pg_log(ctx, PG_FATAL, "Unable to rename %s to %s.\n", old_path, new_path);
+	check_ok(ctx);
+}
diff --git a/contrib/pg_upgrade/dump.c b/contrib/pg_upgrade/dump.c
new file mode 100644
index 0000000000..3a2ded629c
--- /dev/null
+++ b/contrib/pg_upgrade/dump.c
@@ -0,0 +1,100 @@
+/*
+ *	dump.c
+ *
+ *	dump functions
+ *
+ *	Copyright (c) 2010, PostgreSQL Global Development Group
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/dump.c,v 1.7 2010/07/06 19:18:55 momjian Exp $
+ */
+
+#include "pg_upgrade.h"
+
+
+
+void
+generate_old_dump(migratorContext *ctx)
+{
+	/* run new pg_dumpall binary */
+	prep_status(ctx, "Creating catalog dump");
+
+	/*
+	 * --binary-upgrade records the width of dropped columns in pg_class, and
+	 * restores the frozenid's for databases and relations.
+	 */
+	exec_prog(ctx, true,
+			  SYSTEMQUOTE "\"%s/pg_dumpall\" --port %d --username \"%s\" "
+			  "--schema-only --binary-upgrade > \"%s/" ALL_DUMP_FILE "\""
+		   SYSTEMQUOTE, ctx->new.bindir, ctx->old.port, ctx->user, ctx->cwd);
+	check_ok(ctx);
+}
+
+
+/*
+ *	split_old_dump
+ *
+ *	This function splits pg_dumpall output into global values and
+ *	database creation, and per-db schemas.	This allows us to create
+ *	the toast place holders between restoring these two parts of the
+ *	dump.  We split on the first "\connect " after a CREATE ROLE
+ *	username match;  this is where the per-db restore starts.
+ *
+ *	We suppress recreation of our own username so we don't generate
+ *	an error during restore
+ */
+void
+split_old_dump(migratorContext *ctx)
+{
+	FILE	   *all_dump,
+			   *globals_dump,
+			   *db_dump;
+	FILE	   *current_output;
+	char		line[LINE_ALLOC];
+	bool		start_of_line = true;
+	char		create_role_str[MAX_STRING];
+	char		create_role_str_quote[MAX_STRING];
+	char		filename[MAXPGPATH];
+	bool		suppressed_username = false;
+
+	snprintf(filename, sizeof(filename), "%s/%s", ctx->cwd, ALL_DUMP_FILE);
+	if ((all_dump = fopen(filename, "r")) == NULL)
+		pg_log(ctx, PG_FATAL, "Cannot open dump file %s\n", filename);
+	snprintf(filename, sizeof(filename), "%s/%s", ctx->cwd, GLOBALS_DUMP_FILE);
+	if ((globals_dump = fopen(filename, "w")) == NULL)
+		pg_log(ctx, PG_FATAL, "Cannot write to dump file %s\n", filename);
+	snprintf(filename, sizeof(filename), "%s/%s", ctx->cwd, DB_DUMP_FILE);
+	if ((db_dump = fopen(filename, "w")) == NULL)
+		pg_log(ctx, PG_FATAL, "Cannot write to dump file %s\n", filename);
+	current_output = globals_dump;
+
+	/* patterns used to prevent our own username from being recreated */
+	snprintf(create_role_str, sizeof(create_role_str),
+			 "CREATE ROLE %s;", ctx->user);
+	snprintf(create_role_str_quote, sizeof(create_role_str_quote),
+			 "CREATE ROLE %s;", quote_identifier(ctx, ctx->user));
+
+	while (fgets(line, sizeof(line), all_dump) != NULL)
+	{
+		/* switch to db_dump file output? */
+		if (current_output == globals_dump && start_of_line &&
+			suppressed_username &&
+			strncmp(line, "\\connect ", strlen("\\connect ")) == 0)
+			current_output = db_dump;
+
+		/* output unless we are recreating our own username */
+		if (current_output != globals_dump || !start_of_line ||
+			(strncmp(line, create_role_str, strlen(create_role_str)) != 0 &&
+			 strncmp(line, create_role_str_quote, strlen(create_role_str_quote)) != 0))
+			fputs(line, current_output);
+		else
+			suppressed_username = true;
+
+		if (strlen(line) > 0 && line[strlen(line) - 1] == '\n')
+			start_of_line = true;
+		else
+			start_of_line = false;
+	}
+
+	fclose(all_dump);
+	fclose(globals_dump);
+	fclose(db_dump);
+}
diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c
new file mode 100644
index 0000000000..88a2129e89
--- /dev/null
+++ b/contrib/pg_upgrade/exec.c
@@ -0,0 +1,313 @@
+/*
+ *	exec.c
+ *
+ *	execution functions
+ *
+ *	Copyright (c) 2010, PostgreSQL Global Development Group
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/exec.c,v 1.8 2010/07/06 19:18:55 momjian Exp $
+ */
+
+#include "pg_upgrade.h"
+
+#include <fcntl.h>
+#include <grp.h>
+
+
+static void checkBinDir(migratorContext *ctx, ClusterInfo *cluster);
+static int	check_exec(migratorContext *ctx, const char *dir, const char *cmdName);
+static const char *validate_exec(const char *path);
+static int	check_data_dir(migratorContext *ctx, const char *pg_data);
+
+
+/*
+ * exec_prog()
+ *
+ *	Formats a command from the given argument list and executes that
+ *	command.  If the command executes, exec_prog() returns 1 otherwise
+ *	exec_prog() logs an error message and returns 0.
+ *
+ *	If throw_error is TRUE, this function will throw a PG_FATAL error
+ *	instead of returning should an error occur.
+ */
+int
+exec_prog(migratorContext *ctx, bool throw_error, const char *fmt,...)
+{
+	va_list		args;
+	int			result;
+	char		cmd[MAXPGPATH];
+
+	va_start(args, fmt);
+	vsnprintf(cmd, MAXPGPATH, fmt, args);
+	va_end(args);
+
+	pg_log(ctx, PG_INFO, "%s\n", cmd);
+
+	result = system(cmd);
+
+	if (result != 0)
+	{
+		pg_log(ctx, throw_error ? PG_FATAL : PG_INFO,
+			   "\nThere were problems executing %s\n", cmd);
+		return 1;
+	}
+
+	return 0;
+}
+
+
+/*
+ * verify_directories()
+ *
+ * does all the hectic work of verifying directories and executables
+ * of old and new server.
+ *
+ * NOTE: May update the values of all parameters
+ */
+void
+verify_directories(migratorContext *ctx)
+{
+	prep_status(ctx, "Checking old data directory (%s)", ctx->old.pgdata);
+	if (check_data_dir(ctx, ctx->old.pgdata) != 0)
+		pg_log(ctx, PG_FATAL, "Failed\n");
+	checkBinDir(ctx, &ctx->old);
+	check_ok(ctx);
+
+	prep_status(ctx, "Checking new data directory (%s)", ctx->new.pgdata);
+	if (check_data_dir(ctx, ctx->new.pgdata) != 0)
+		pg_log(ctx, PG_FATAL, "Failed\n");
+	checkBinDir(ctx, &ctx->new);
+	check_ok(ctx);
+}
+
+
+/*
+ * checkBinDir()
+ *
+ *	This function searches for the executables that we expect to find
+ *	in the binaries directory.	If we find that a required executable
+ *	is missing (or secured against us), we display an error message and
+ *	exit().
+ */
+static void
+checkBinDir(migratorContext *ctx, ClusterInfo *cluster)
+{
+	check_exec(ctx, cluster->bindir, "postgres");
+	check_exec(ctx, cluster->bindir, "psql");
+	check_exec(ctx, cluster->bindir, "pg_ctl");
+	check_exec(ctx, cluster->bindir, "pg_dumpall");
+}
+
+
+/*
+ * is_server_running()
+ *
+ * checks whether postmaster on the given data directory is running or not.
+ * The check is performed by looking for the existence of postmaster.pid file.
+ */
+bool
+is_server_running(migratorContext *ctx, const char *datadir)
+{
+	char		path[MAXPGPATH];
+	int			fd;
+
+	snprintf(path, sizeof(path), "%s/postmaster.pid", datadir);
+
+	if ((fd = open(path, O_RDONLY, 0)) < 0)
+	{
+		if (errno != ENOENT)
+			pg_log(ctx, PG_FATAL, "\ncould not open file \"%s\" for reading\n",
+				   path);
+
+		return false;
+	}
+
+	close(fd);
+	return true;
+}
+
+
+/*
+ * check_exec()
+ *
+ *	Checks whether either of the two command names (cmdName and alternative)
+ *	appears to be an executable (in the given directory).  If dir/cmdName is
+ *	an executable, this function returns 1. If dir/alternative is an
+ *	executable, this function returns 2.  If neither of the given names is
+ *	a valid executable, this function returns 0 to indicated failure.
+ */
+static int
+check_exec(migratorContext *ctx, const char *dir, const char *cmdName)
+{
+	char		path[MAXPGPATH];
+	const char *errMsg;
+
+	snprintf(path, sizeof(path), "%s/%s", dir, cmdName);
+
+	if ((errMsg = validate_exec(path)) == NULL)
+		return 1;				/* 1 -> first alternative OK */
+	else
+		pg_log(ctx, PG_FATAL, "check for %s failed - %s\n", cmdName, errMsg);
+
+	return 0;					/* 0 -> neither alternative is acceptable */
+}
+
+
+/*
+ * validate_exec()
+ *
+ * validate "path" as an executable file
+ * returns 0 if the file is found and no error is encountered.
+ *		  -1 if the regular file "path" does not exist or cannot be executed.
+ *		  -2 if the file is otherwise valid but cannot be read.
+ */
+static const char *
+validate_exec(const char *path)
+{
+	struct stat buf;
+
+#ifndef WIN32
+	uid_t		euid;
+	struct group *gp;
+	struct passwd *pwp;
+	int			in_grp = 0;
+#else
+	char		path_exe[MAXPGPATH + sizeof(EXE_EXT) - 1];
+#endif
+
+#ifdef WIN32
+	/* Win32 requires a .exe suffix for stat() */
+
+	if (strlen(path) >= strlen(EXE_EXT) &&
+		pg_strcasecmp(path + strlen(path) - strlen(EXE_EXT), EXE_EXT) != 0)
+	{
+		strcpy(path_exe, path);
+		strcat(path_exe, EXE_EXT);
+		path = path_exe;
+	}
+#endif
+
+	/*
+	 * Ensure that the file exists and is a regular file.
+	 */
+	if (stat(path, &buf) < 0)
+		return getErrorText(errno);
+
+	if ((buf.st_mode & S_IFMT) != S_IFREG)
+		return "not an executable file";
+
+	/*
+	 * Ensure that we are using an authorized executable.
+	 */
+
+	/*
+	 * Ensure that the file is both executable and readable (required for
+	 * dynamic loading).
+	 */
+#ifndef WIN32
+	euid = geteuid();
+
+	/* If owned by us, just check owner bits */
+	if (euid == buf.st_uid)
+	{
+		if ((buf.st_mode & S_IRUSR) == 0)
+			return "can't read file (permission denied)";
+		if ((buf.st_mode & S_IXUSR) == 0)
+			return "can't execute (permission denied)";
+		return NULL;
+	}
+
+	/* OK, check group bits */
+	pwp = getpwuid(euid);		/* not thread-safe */
+
+	if (pwp)
+	{
+		if (pwp->pw_gid == buf.st_gid)	/* my primary group? */
+			++in_grp;
+		else if (pwp->pw_name &&
+				 (gp = getgrgid(buf.st_gid)) != NULL &&
+				  /* not thread-safe */ gp->gr_mem != NULL)
+		{
+			/* try list of member groups */
+			int			i;
+
+			for (i = 0; gp->gr_mem[i]; ++i)
+			{
+				if (!strcmp(gp->gr_mem[i], pwp->pw_name))
+				{
+					++in_grp;
+					break;
+				}
+			}
+		}
+
+		if (in_grp)
+		{
+			if ((buf.st_mode & S_IRGRP) == 0)
+				return "can't read file (permission denied)";
+			if ((buf.st_mode & S_IXGRP) == 0)
+				return "can't execute (permission denied)";
+			return NULL;
+		}
+	}
+
+	/* Check "other" bits */
+	if ((buf.st_mode & S_IROTH) == 0)
+		return "can't read file (permission denied)";
+	if ((buf.st_mode & S_IXOTH) == 0)
+		return "can't execute (permission denied)";
+	return NULL;
+#else
+	if ((buf.st_mode & S_IRUSR) == 0)
+		return "can't read file (permission denied)";
+	if ((buf.st_mode & S_IXUSR) == 0)
+		return "can't execute (permission denied)";
+	return NULL;
+#endif
+}
+
+
+/*
+ * check_data_dir()
+ *
+ *	This function validates the given cluster directory - we search for a
+ *	small set of subdirectories that we expect to find in a valid $PGDATA
+ *	directory.	If any of the subdirectories are missing (or secured against
+ *	us) we display an error message and exit()
+ *
+ */
+static int
+check_data_dir(migratorContext *ctx, const char *pg_data)
+{
+	char		subDirName[MAXPGPATH];
+	const char *requiredSubdirs[] = {"base", "global", "pg_clog",
+		"pg_multixact", "pg_subtrans",
+	"pg_tblspc", "pg_twophase", "pg_xlog"};
+	bool		fail = false;
+	int			subdirnum;
+
+	for (subdirnum = 0; subdirnum < sizeof(requiredSubdirs) / sizeof(requiredSubdirs[0]); ++subdirnum)
+	{
+		struct stat statBuf;
+
+		snprintf(subDirName, sizeof(subDirName), "%s/%s", pg_data,
+				 requiredSubdirs[subdirnum]);
+
+		if ((stat(subDirName, &statBuf)) != 0)
+		{
+			report_status(ctx, PG_WARNING, "check for %s warning:  %s",
+						  requiredSubdirs[subdirnum], getErrorText(errno));
+			fail = true;
+		}
+		else
+		{
+			if (!S_ISDIR(statBuf.st_mode))
+			{
+				report_status(ctx, PG_WARNING, "%s is not a directory",
+							  requiredSubdirs[subdirnum]);
+				fail = true;
+			}
+		}
+	}
+
+	return (fail) ? -1 : 0;
+}
diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c
new file mode 100644
index 0000000000..7ddaddafd6
--- /dev/null
+++ b/contrib/pg_upgrade/file.c
@@ -0,0 +1,465 @@
+/*
+ *	file.c
+ *
+ *	file system operations
+ *
+ *	Copyright (c) 2010, PostgreSQL Global Development Group
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/file.c,v 1.13 2010/07/06 19:18:55 momjian Exp $
+ */
+
+#include "pg_upgrade.h"
+
+#include <fcntl.h>
+
+
+static int	copy_file(const char *fromfile, const char *tofile, bool force);
+
+#ifdef WIN32
+static int	win32_pghardlink(const char *src, const char *dst);
+#endif
+#ifdef NOT_USED
+static int	copy_dir(const char *from, const char *to, bool force);
+#endif
+
+#ifndef HAVE_SCANDIR
+static int pg_scandir_internal(migratorContext *ctx, const char *dirname,
+					struct dirent *** namelist,
+					int (*selector) (const struct dirent *));
+#endif
+
+
+/*
+ * copyAndUpdateFile()
+ *
+ *	Copies a relation file from src to dst.  If pageConverter is non-NULL, this function
+ *	uses that pageConverter to do a page-by-page conversion.
+ */
+const char *
+copyAndUpdateFile(migratorContext *ctx, pageCnvCtx *pageConverter,
+				  const char *src, const char *dst, bool force)
+{
+	if (pageConverter == NULL)
+	{
+		if (pg_copy_file(src, dst, force) == -1)
+			return getErrorText(errno);
+		else
+			return NULL;
+	}
+	else
+	{
+		/*
+		 * We have a pageConverter object - that implies that the
+		 * PageLayoutVersion differs between the two clusters so we have to
+		 * perform a page-by-page conversion.
+		 *
+		 * If the pageConverter can convert the entire file at once, invoke
+		 * that plugin function, otherwise, read each page in the relation
+		 * file and call the convertPage plugin function.
+		 */
+
+#ifdef PAGE_CONVERSION
+		if (pageConverter->convertFile)
+			return pageConverter->convertFile(pageConverter->pluginData,
+											  dst, src);
+		else
+#endif
+		{
+			int			src_fd;
+			int			dstfd;
+			char		buf[BLCKSZ];
+			ssize_t		bytesRead;
+			const char *msg = NULL;
+
+			if ((src_fd = open(src, O_RDONLY, 0)) < 0)
+				return "can't open source file";
+
+			if ((dstfd = open(dst, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR)) < 0)
+				return "can't create destination file";
+
+			while ((bytesRead = read(src_fd, buf, BLCKSZ)) == BLCKSZ)
+			{
+#ifdef PAGE_CONVERSION
+				if ((msg = pageConverter->convertPage(pageConverter->pluginData, buf, buf)) != NULL)
+					break;
+#endif
+				if (write(dstfd, buf, BLCKSZ) != BLCKSZ)
+				{
+					msg = "can't write new page to destination";
+					break;
+				}
+			}
+
+			close(src_fd);
+			close(dstfd);
+
+			if (msg)
+				return msg;
+			else if (bytesRead != 0)
+				return "found partial page in source file";
+			else
+				return NULL;
+		}
+	}
+}
+
+
+/*
+ * linkAndUpdateFile()
+ *
+ * Creates a symbolic link between the given relation files. We use
+ * this function to perform a true in-place update. If the on-disk
+ * format of the new cluster is bit-for-bit compatible with the on-disk
+ * format of the old cluster, we can simply symlink each relation
+ * instead of copying the data from the old cluster to the new cluster.
+ */
+const char *
+linkAndUpdateFile(migratorContext *ctx, pageCnvCtx *pageConverter,
+				  const char *src, const char *dst)
+{
+	if (pageConverter != NULL)
+		return "Can't in-place update this cluster, page-by-page conversion is required";
+
+	if (pg_link_file(src, dst) == -1)
+		return getErrorText(errno);
+	else
+		return NULL;
+}
+
+
+static int
+copy_file(const char *srcfile, const char *dstfile, bool force)
+{
+
+#define COPY_BUF_SIZE (50 * BLCKSZ)
+
+	int			src_fd;
+	int			dest_fd;
+	char	   *buffer;
+
+	if ((srcfile == NULL) || (dstfile == NULL))
+		return -1;
+
+	if ((src_fd = open(srcfile, O_RDONLY, 0)) < 0)
+		return -1;
+
+	if ((dest_fd = open(dstfile, O_RDWR | O_CREAT | (force ? 0 : O_EXCL), S_IRUSR | S_IWUSR)) < 0)
+	{
+		if (src_fd != 0)
+			close(src_fd);
+
+		return -1;
+	}
+
+	buffer = (char *) malloc(COPY_BUF_SIZE);
+
+	if (buffer == NULL)
+	{
+		if (src_fd != 0)
+			close(src_fd);
+
+		if (dest_fd != 0)
+			close(dest_fd);
+
+		return -1;
+	}
+
+	/* perform data copying i.e read src source, write to destination */
+	while (true)
+	{
+		ssize_t		nbytes = read(src_fd, buffer, COPY_BUF_SIZE);
+
+		if (nbytes < 0)
+		{
+			if (buffer != NULL)
+				free(buffer);
+
+			if (src_fd != 0)
+				close(src_fd);
+
+			if (dest_fd != 0)
+				close(dest_fd);
+
+			return -1;
+		}
+
+		if (nbytes == 0)
+			break;
+
+		errno = 0;
+
+		if (write(dest_fd, buffer, nbytes) != nbytes)
+		{
+			/* if write didn't set errno, assume problem is no disk space */
+			if (errno == 0)
+				errno = ENOSPC;
+
+			if (buffer != NULL)
+				free(buffer);
+
+			if (src_fd != 0)
+				close(src_fd);
+
+			if (dest_fd != 0)
+				close(dest_fd);
+
+			return -1;
+		}
+	}
+
+	if (buffer != NULL)
+		free(buffer);
+
+	if (src_fd != 0)
+		close(src_fd);
+
+	if (dest_fd != 0)
+		close(dest_fd);
+
+	return 1;
+}
+
+
+/*
+ * pg_scandir()
+ *
+ * Wrapper for portable scandir functionality
+ */
+int
+pg_scandir(migratorContext *ctx, const char *dirname,
+		   struct dirent *** namelist,
+		   int (*selector) (const struct dirent *))
+{
+#ifndef HAVE_SCANDIR
+	return pg_scandir_internal(ctx, dirname, namelist, selector);
+
+	/*
+	 * scandir() is originally from BSD 4.3, which had the third argument as
+	 * non-const. Linux and other C libraries have updated it to use a const.
+	 * http://unix.derkeiler.com/Mailing-Lists/FreeBSD/questions/2005-12/msg002
+	 * 14.html
+	 *
+	 * Here we try to guess which libc's need const, and which don't. The net
+	 * goal here is to try to suppress a compiler warning due to a prototype
+	 * mismatch of const usage. Ideally we would do this via autoconf, but
+	 * autoconf doesn't have a suitable builtin test and it seems overkill to
+	 * add one just to avoid a warning.
+	 */
+#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(__darwin__) || defined(__OpenBSD__)
+	/* no const */
+	return scandir(dirname, namelist, (int (*) (struct dirent *)) selector, NULL);
+#else
+	/* use const */
+	return scandir(dirname, namelist, selector, NULL);
+#endif
+}
+
+
+#ifndef HAVE_SCANDIR
+/*
+ * pg_scandir_internal()
+ *
+ * Implement our own scandir() on platforms that don't have it.
+ *
+ * Returns count of files that meet the selection criteria coded in
+ * the function pointed to by selector.  Creates an array of pointers
+ * to dirent structures.  Address of array returned in namelist.
+ *
+ * Note that the number of dirent structures needed is dynamically
+ * allocated using realloc.  Realloc can be inefficient if invoked a
+ * large number of times.  Its use in pg_upgrade is to find filesystem
+ * filenames that have extended beyond the initial segment (file.1,
+ * .2, etc.) and should therefore be invoked a small number of times.
+ */
+static int
+pg_scandir_internal(migratorContext *ctx, const char *dirname,
+		 struct dirent *** namelist, int (*selector) (const struct dirent *))
+{
+	DIR		   *dirdesc;
+	struct dirent *direntry;
+	int			count = 0;
+	int			name_num = 0;
+	size_t		entrysize;
+
+	if ((dirdesc = opendir(dirname)) == NULL)
+		pg_log(ctx, PG_FATAL, "Could not open directory \"%s\": %m\n", dirname);
+
+	*namelist = NULL;
+
+	while ((direntry = readdir(dirdesc)) != NULL)
+	{
+		/* Invoke the selector function to see if the direntry matches */
+		if ((*selector) (direntry))
+		{
+			count++;
+
+			*namelist = (struct dirent **) realloc((void *) (*namelist),
+						(size_t) ((name_num + 1) * sizeof(struct dirent *)));
+
+			if (*namelist == NULL)
+				return -1;
+
+			entrysize = sizeof(struct dirent) - sizeof(direntry->d_name) +
+				strlen(direntry->d_name) + 1;
+
+			(*namelist)[name_num] = (struct dirent *) malloc(entrysize);
+
+			if ((*namelist)[name_num] == NULL)
+				return -1;
+
+			memcpy((*namelist)[name_num], direntry, entrysize);
+
+			name_num++;
+		}
+	}
+
+	closedir(dirdesc);
+
+	return count;
+}
+#endif
+
+
+/*
+ *	dir_matching_filenames
+ *
+ *	Return only matching file names during directory scan
+ */
+int
+dir_matching_filenames(const struct dirent * scan_ent)
+{
+	/* we only compare for string length because the number suffix varies */
+	if (!strncmp(scandir_file_pattern, scan_ent->d_name, strlen(scandir_file_pattern)))
+		return 1;
+
+	return 0;
+}
+
+
+void
+check_hard_link(migratorContext *ctx)
+{
+	char		existing_file[MAXPGPATH];
+	char		new_link_file[MAXPGPATH];
+
+	snprintf(existing_file, sizeof(existing_file), "%s/PG_VERSION", ctx->old.pgdata);
+	snprintf(new_link_file, sizeof(new_link_file), "%s/PG_VERSION.linktest", ctx->new.pgdata);
+	unlink(new_link_file);		/* might fail */
+
+	if (pg_link_file(existing_file, new_link_file) == -1)
+	{
+		pg_log(ctx, PG_FATAL,
+			   "Could not create hard link between old and new data directories:  %s\n"
+			   "In link mode the old and new data directories must be on the same file system volume.\n",
+			   getErrorText(errno));
+	}
+	unlink(new_link_file);
+}
+
+#ifdef WIN32
+static int
+win32_pghardlink(const char *src, const char *dst)
+{
+	/*
+	 * CreateHardLinkA returns zero for failure
+	 * http://msdn.microsoft.com/en-us/library/aa363860(VS.85).aspx
+	 */
+	if (CreateHardLinkA(dst, src, NULL) == 0)
+		return -1;
+	else
+		return 0;
+}
+#endif
+
+
+#ifdef NOT_USED
+/*
+ * copy_dir()
+ *
+ *	Copies either a directory or a single file within a directory.	If the
+ *	source argument names a directory, we recursively copy that directory,
+ *	otherwise we copy a single file.
+ */
+static int
+copy_dir(const char *src, const char *dst, bool force)
+{
+	DIR		   *srcdir;
+	struct dirent *de = NULL;
+	struct stat fst;
+
+	if (src == NULL || dst == NULL)
+		return -1;
+
+	/*
+	 * Try to open the source directory - if it turns out not to be a
+	 * directory, assume that it's a file and copy that instead.
+	 */
+	if ((srcdir = opendir(src)) == NULL)
+	{
+		if (errno == ENOTDIR)
+			return copy_file(src, dst, true);
+		return -1;
+	}
+
+	if (mkdir(dst, S_IRWXU) != 0)
+	{
+		/*
+		 * ignore directory already exist error
+		 */
+		if (errno != EEXIST)
+			return -1;
+	}
+
+	while ((de = readdir(srcdir)) != NULL)
+	{
+		char		src_file[MAXPGPATH];
+		char		dest_file[MAXPGPATH];
+
+		if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0)
+			continue;
+
+		memset(src_file, 0, sizeof(src_file));
+		memset(dest_file, 0, sizeof(dest_file));
+
+		snprintf(src_file, sizeof(src_file), "%s/%s", src, de->d_name);
+		snprintf(dest_file, sizeof(dest_file), "%s/%s", dst, de->d_name);
+
+		if (stat(src_file, &fst) < 0)
+		{
+			if (srcdir != NULL)
+			{
+				closedir(srcdir);
+				srcdir = NULL;
+			}
+
+			return -1;
+		}
+
+		if (fst.st_mode & S_IFDIR)
+		{
+			/* recurse to handle subdirectories */
+			if (force)
+				copy_dir(src_file, dest_file, true);
+		}
+		else if (fst.st_mode & S_IFREG)
+		{
+			if ((copy_file(src_file, dest_file, 1)) == -1)
+			{
+				if (srcdir != NULL)
+				{
+					closedir(srcdir);
+					srcdir = NULL;
+				}
+				return -1;
+			}
+		}
+	}
+
+	if (srcdir != NULL)
+	{
+		closedir(srcdir);
+		srcdir = NULL;
+	}
+	return 1;
+}
+
+#endif
diff --git a/contrib/pg_upgrade/function.c b/contrib/pg_upgrade/function.c
new file mode 100644
index 0000000000..3187506df0
--- /dev/null
+++ b/contrib/pg_upgrade/function.c
@@ -0,0 +1,265 @@
+/*
+ *	function.c
+ *
+ *	server-side function support
+ *
+ *	Copyright (c) 2010, PostgreSQL Global Development Group
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/function.c,v 1.6 2010/07/03 16:33:14 momjian Exp $
+ */
+
+#include "pg_upgrade.h"
+
+#include "access/transam.h"
+
+
+/*
+ * install_support_functions()
+ *
+ * pg_upgrade requires some support functions that enable it to modify
+ * backend behavior.
+ */
+void
+install_support_functions(migratorContext *ctx)
+{
+	int			dbnum;
+
+	prep_status(ctx, "Adding support functions to new cluster");
+
+	for (dbnum = 0; dbnum < ctx->new.dbarr.ndbs; dbnum++)
+	{
+		DbInfo	   *newdb = &ctx->new.dbarr.dbs[dbnum];
+		PGconn	   *conn = connectToServer(ctx, newdb->db_name, CLUSTER_NEW);
+
+		/* suppress NOTICE of dropped objects */
+		PQclear(executeQueryOrDie(ctx, conn,
+								  "SET client_min_messages = warning;"));
+		PQclear(executeQueryOrDie(ctx, conn,
+						   "DROP SCHEMA IF EXISTS binary_upgrade CASCADE;"));
+		PQclear(executeQueryOrDie(ctx, conn,
+								  "RESET client_min_messages;"));
+
+		PQclear(executeQueryOrDie(ctx, conn,
+								  "CREATE SCHEMA binary_upgrade;"));
+
+		PQclear(executeQueryOrDie(ctx, conn,
+								  "CREATE OR REPLACE FUNCTION "
+					 "		binary_upgrade.set_next_pg_type_oid(OID) "
+								  "RETURNS VOID "
+								  "AS '$libdir/pg_upgrade_support' "
+								  "LANGUAGE C STRICT;"));
+		PQclear(executeQueryOrDie(ctx, conn,
+								  "CREATE OR REPLACE FUNCTION "
+			   "		binary_upgrade.set_next_pg_type_array_oid(OID) "
+								  "RETURNS VOID "
+								  "AS '$libdir/pg_upgrade_support' "
+								  "LANGUAGE C STRICT;"));
+		PQclear(executeQueryOrDie(ctx, conn,
+								  "CREATE OR REPLACE FUNCTION "
+			   "		binary_upgrade.set_next_pg_type_toast_oid(OID) "
+								  "RETURNS VOID "
+								  "AS '$libdir/pg_upgrade_support' "
+								  "LANGUAGE C STRICT;"));
+		PQclear(executeQueryOrDie(ctx, conn,
+								  "CREATE OR REPLACE FUNCTION "
+				"		binary_upgrade.set_next_heap_relfilenode(OID) "
+								  "RETURNS VOID "
+								  "AS '$libdir/pg_upgrade_support' "
+								  "LANGUAGE C STRICT;"));
+		PQclear(executeQueryOrDie(ctx, conn,
+								  "CREATE OR REPLACE FUNCTION "
+			   "		binary_upgrade.set_next_toast_relfilenode(OID) "
+								  "RETURNS VOID "
+								  "AS '$libdir/pg_upgrade_support' "
+								  "LANGUAGE C STRICT;"));
+		PQclear(executeQueryOrDie(ctx, conn,
+								  "CREATE OR REPLACE FUNCTION "
+			   "		binary_upgrade.set_next_index_relfilenode(OID) "
+								  "RETURNS VOID "
+								  "AS '$libdir/pg_upgrade_support' "
+								  "LANGUAGE C STRICT;"));
+		PQclear(executeQueryOrDie(ctx, conn,
+								  "CREATE OR REPLACE FUNCTION "
+			 "		binary_upgrade.add_pg_enum_label(OID, OID, NAME) "
+								  "RETURNS VOID "
+								  "AS '$libdir/pg_upgrade_support' "
+								  "LANGUAGE C STRICT;"));
+		PQfinish(conn);
+	}
+	check_ok(ctx);
+}
+
+
+void
+uninstall_support_functions(migratorContext *ctx)
+{
+	int			dbnum;
+
+	prep_status(ctx, "Removing support functions from new cluster");
+
+	for (dbnum = 0; dbnum < ctx->new.dbarr.ndbs; dbnum++)
+	{
+		DbInfo	   *newdb = &ctx->new.dbarr.dbs[dbnum];
+		PGconn	   *conn = connectToServer(ctx, newdb->db_name, CLUSTER_NEW);
+
+		/* suppress NOTICE of dropped objects */
+		PQclear(executeQueryOrDie(ctx, conn,
+								  "SET client_min_messages = warning;"));
+		PQclear(executeQueryOrDie(ctx, conn,
+								  "DROP SCHEMA binary_upgrade CASCADE;"));
+		PQclear(executeQueryOrDie(ctx, conn,
+								  "RESET client_min_messages;"));
+		PQfinish(conn);
+	}
+	check_ok(ctx);
+}
+
+
+/*
+ * get_loadable_libraries()
+ *
+ *	Fetch the names of all old libraries containing C-language functions.
+ *	We will later check that they all exist in the new installation.
+ */
+void
+get_loadable_libraries(migratorContext *ctx)
+{
+	ClusterInfo *active_cluster = &ctx->old;
+	PGresult  **ress;
+	int			totaltups;
+	int			dbnum;
+
+	ress = (PGresult **)
+		pg_malloc(ctx, active_cluster->dbarr.ndbs * sizeof(PGresult *));
+	totaltups = 0;
+
+	/* Fetch all library names, removing duplicates within each DB */
+	for (dbnum = 0; dbnum < active_cluster->dbarr.ndbs; dbnum++)
+	{
+		DbInfo	   *active_db = &active_cluster->dbarr.dbs[dbnum];
+		PGconn	   *conn = connectToServer(ctx, active_db->db_name, CLUSTER_OLD);
+
+		/* Fetch all libraries referenced in this DB */
+		ress[dbnum] = executeQueryOrDie(ctx, conn,
+										"SELECT DISTINCT probin "
+										"FROM	pg_catalog.pg_proc "
+										"WHERE	prolang = 13 /* C */ AND "
+									 "		probin IS NOT NULL AND "
+										"		oid >= %u;",
+										FirstNormalObjectId);
+		totaltups += PQntuples(ress[dbnum]);
+
+		PQfinish(conn);
+	}
+
+	/* Allocate what's certainly enough space */
+	if (totaltups > 0)
+		ctx->libraries = (char **) pg_malloc(ctx, totaltups * sizeof(char *));
+	else
+		ctx->libraries = NULL;
+
+	/*
+	 * Now remove duplicates across DBs.  This is pretty inefficient code, but
+	 * there probably aren't enough entries to matter.
+	 */
+	totaltups = 0;
+
+	for (dbnum = 0; dbnum < active_cluster->dbarr.ndbs; dbnum++)
+	{
+		PGresult   *res = ress[dbnum];
+		int			ntups;
+		int			rowno;
+
+		ntups = PQntuples(res);
+		for (rowno = 0; rowno < ntups; rowno++)
+		{
+			char	   *lib = PQgetvalue(res, rowno, 0);
+			bool		dup = false;
+			int			n;
+
+			for (n = 0; n < totaltups; n++)
+			{
+				if (strcmp(lib, ctx->libraries[n]) == 0)
+				{
+					dup = true;
+					break;
+				}
+			}
+			if (!dup)
+				ctx->libraries[totaltups++] = pg_strdup(ctx, lib);
+		}
+
+		PQclear(res);
+	}
+
+	ctx->num_libraries = totaltups;
+
+	pg_free(ress);
+}
+
+
+/*
+ * check_loadable_libraries()
+ *
+ *	Check that the new cluster contains all required libraries.
+ *	We do this by actually trying to LOAD each one, thereby testing
+ *	compatibility as well as presence.
+ */
+void
+check_loadable_libraries(migratorContext *ctx)
+{
+	PGconn	   *conn = connectToServer(ctx, "template1", CLUSTER_NEW);
+	int			libnum;
+	FILE	   *script = NULL;
+	bool		found = false;
+	char		output_path[MAXPGPATH];
+
+	prep_status(ctx, "Checking for presence of required libraries");
+
+	snprintf(output_path, sizeof(output_path), "%s/loadable_libraries.txt",
+			 ctx->cwd);
+
+	for (libnum = 0; libnum < ctx->num_libraries; libnum++)
+	{
+		char	   *lib = ctx->libraries[libnum];
+		int			llen = strlen(lib);
+		char	   *cmd = (char *) pg_malloc(ctx, 8 + 2 * llen + 1);
+		PGresult   *res;
+
+		strcpy(cmd, "LOAD '");
+		PQescapeStringConn(conn, cmd + 6, lib, llen, NULL);
+		strcat(cmd, "'");
+
+		res = PQexec(conn, cmd);
+
+		if (PQresultStatus(res) != PGRES_COMMAND_OK)
+		{
+			found = true;
+			if (script == NULL && (script = fopen(output_path, "w")) == NULL)
+				pg_log(ctx, PG_FATAL, "Could not create necessary file:  %s\n",
+					   output_path);
+			fprintf(script, "Failed to load library: %s\n%s\n",
+					lib,
+					PQerrorMessage(conn));
+		}
+
+		PQclear(res);
+		pg_free(cmd);
+	}
+
+	PQfinish(conn);
+
+	if (found)
+	{
+		fclose(script);
+		pg_log(ctx, PG_REPORT, "fatal\n");
+		pg_log(ctx, PG_FATAL,
+			 "| Your installation uses loadable libraries that are missing\n"
+			 "| from the new installation.  You can add these libraries to\n"
+			   "| the new installation, or remove the functions using them\n"
+			"| from the old installation.  A list of the problem libraries\n"
+			   "| is in the file\n"
+			   "| \"%s\".\n\n", output_path);
+	}
+	else
+		check_ok(ctx);
+}
diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
new file mode 100644
index 0000000000..dad2a5f8d1
--- /dev/null
+++ b/contrib/pg_upgrade/info.c
@@ -0,0 +1,511 @@
+/*
+ *	info.c
+ *
+ *	information support functions
+ *
+ *	Copyright (c) 2010, PostgreSQL Global Development Group
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/info.c,v 1.11 2010/07/06 19:18:55 momjian Exp $
+ */
+
+#include "pg_upgrade.h"
+
+#include "access/transam.h"
+
+
+static void get_db_infos(migratorContext *ctx, DbInfoArr *dbinfos,
+			 Cluster whichCluster);
+static void dbarr_print(migratorContext *ctx, DbInfoArr *arr,
+			Cluster whichCluster);
+static void relarr_print(migratorContext *ctx, RelInfoArr *arr);
+static void get_rel_infos(migratorContext *ctx, const DbInfo *dbinfo,
+			  RelInfoArr *relarr, Cluster whichCluster);
+static void relarr_free(RelInfoArr *rel_arr);
+static void map_rel(migratorContext *ctx, const RelInfo *oldrel,
+		const RelInfo *newrel, const DbInfo *old_db,
+		const DbInfo *new_db, const char *olddata,
+		const char *newdata, FileNameMap *map);
+static void map_rel_by_id(migratorContext *ctx, Oid oldid, Oid newid,
+			  const char *old_nspname, const char *old_relname,
+			  const char *new_nspname, const char *new_relname,
+			  const char *old_tablespace, const DbInfo *old_db,
+			  const DbInfo *new_db, const char *olddata,
+			  const char *newdata, FileNameMap *map);
+static RelInfo *relarr_lookup_reloid(migratorContext *ctx,
+					 RelInfoArr *rel_arr, Oid oid, Cluster whichCluster);
+static RelInfo *relarr_lookup_rel(migratorContext *ctx, RelInfoArr *rel_arr,
+				  const char *nspname, const char *relname,
+				  Cluster whichCluster);
+
+
+/*
+ * gen_db_file_maps()
+ *
+ * generates database mappings for "old_db" and "new_db". Returns a malloc'ed
+ * array of mappings. nmaps is a return parameter which refers to the number
+ * mappings.
+ *
+ * NOTE: Its the Caller's responsibility to free the returned array.
+ */
+FileNameMap *
+gen_db_file_maps(migratorContext *ctx, DbInfo *old_db, DbInfo *new_db,
+				 int *nmaps, const char *old_pgdata, const char *new_pgdata)
+{
+	FileNameMap *maps;
+	int			relnum;
+	int			num_maps = 0;
+
+	maps = (FileNameMap *) pg_malloc(ctx, sizeof(FileNameMap) *
+									 new_db->rel_arr.nrels);
+
+	for (relnum = 0; relnum < new_db->rel_arr.nrels; relnum++)
+	{
+		RelInfo    *newrel = &new_db->rel_arr.rels[relnum];
+		RelInfo    *oldrel;
+
+		/* toast tables are handled by their parent */
+		if (strcmp(newrel->nspname, "pg_toast") == 0)
+			continue;
+
+		oldrel = relarr_lookup_rel(ctx, &(old_db->rel_arr), newrel->nspname,
+								   newrel->relname, CLUSTER_OLD);
+
+		map_rel(ctx, oldrel, newrel, old_db, new_db, old_pgdata, new_pgdata,
+				maps + num_maps);
+		num_maps++;
+
+		/*
+		 * so much for the mapping of this relation. Now we need a mapping for
+		 * its corresponding toast relation if any.
+		 */
+		if (oldrel->toastrelid > 0)
+		{
+			RelInfo    *new_toast;
+			RelInfo    *old_toast;
+			char		new_name[MAXPGPATH];
+			char		old_name[MAXPGPATH];
+
+			/* construct the new and old relnames for the toast relation */
+			snprintf(old_name, sizeof(old_name), "pg_toast_%u",
+					 oldrel->reloid);
+			snprintf(new_name, sizeof(new_name), "pg_toast_%u",
+					 newrel->reloid);
+
+			/* look them up in their respective arrays */
+			old_toast = relarr_lookup_reloid(ctx, &old_db->rel_arr,
+											 oldrel->toastrelid, CLUSTER_OLD);
+			new_toast = relarr_lookup_rel(ctx, &new_db->rel_arr,
+										  "pg_toast", new_name, CLUSTER_NEW);
+
+			/* finally create a mapping for them */
+			map_rel(ctx, old_toast, new_toast, old_db, new_db, old_pgdata, new_pgdata,
+					maps + num_maps);
+			num_maps++;
+
+			/*
+			 * also need to provide a mapping for the index of this toast
+			 * relation. The procedure is similar to what we did above for
+			 * toast relation itself, the only difference being that the
+			 * relnames need to be appended with _index.
+			 */
+
+			/*
+			 * construct the new and old relnames for the toast index
+			 * relations
+			 */
+			snprintf(old_name, sizeof(old_name), "%s_index", old_toast->relname);
+			snprintf(new_name, sizeof(new_name), "pg_toast_%u_index",
+					 newrel->reloid);
+
+			/* look them up in their respective arrays */
+			old_toast = relarr_lookup_rel(ctx, &old_db->rel_arr,
+										  "pg_toast", old_name, CLUSTER_OLD);
+			new_toast = relarr_lookup_rel(ctx, &new_db->rel_arr,
+										  "pg_toast", new_name, CLUSTER_NEW);
+
+			/* finally create a mapping for them */
+			map_rel(ctx, old_toast, new_toast, old_db, new_db, old_pgdata,
+					new_pgdata, maps + num_maps);
+			num_maps++;
+		}
+	}
+
+	*nmaps = num_maps;
+	return maps;
+}
+
+
+static void
+map_rel(migratorContext *ctx, const RelInfo *oldrel, const RelInfo *newrel,
+		const DbInfo *old_db, const DbInfo *new_db, const char *olddata,
+		const char *newdata, FileNameMap *map)
+{
+	map_rel_by_id(ctx, oldrel->relfilenode, newrel->relfilenode, oldrel->nspname,
+				  oldrel->relname, newrel->nspname, newrel->relname, oldrel->tablespace, old_db,
+				  new_db, olddata, newdata, map);
+}
+
+
+/*
+ * map_rel_by_id()
+ *
+ * fills a file node map structure and returns it in "map".
+ */
+static void
+map_rel_by_id(migratorContext *ctx, Oid oldid, Oid newid,
+			  const char *old_nspname, const char *old_relname,
+			  const char *new_nspname, const char *new_relname,
+			  const char *old_tablespace, const DbInfo *old_db,
+			  const DbInfo *new_db, const char *olddata,
+			  const char *newdata, FileNameMap *map)
+{
+	map->new = newid;
+	map->old = oldid;
+
+	snprintf(map->old_nspname, sizeof(map->old_nspname), "%s", old_nspname);
+	snprintf(map->old_relname, sizeof(map->old_relname), "%s", old_relname);
+	snprintf(map->new_nspname, sizeof(map->new_nspname), "%s", new_nspname);
+	snprintf(map->new_relname, sizeof(map->new_relname), "%s", new_relname);
+
+	if (strlen(old_tablespace) == 0)
+	{
+		/*
+		 * relation belongs to the default tablespace, hence relfiles would
+		 * exist in the data directories.
+		 */
+		snprintf(map->old_file, sizeof(map->old_file), "%s/base/%u", olddata, old_db->db_oid);
+		snprintf(map->new_file, sizeof(map->new_file), "%s/base/%u", newdata, new_db->db_oid);
+	}
+	else
+	{
+		/*
+		 * relation belongs to some tablespace, hence copy its physical
+		 * location
+		 */
+		snprintf(map->old_file, sizeof(map->old_file), "%s%s/%u", old_tablespace,
+				 ctx->old.tablespace_suffix, old_db->db_oid);
+		snprintf(map->new_file, sizeof(map->new_file), "%s%s/%u", old_tablespace,
+				 ctx->new.tablespace_suffix, new_db->db_oid);
+	}
+}
+
+
+void
+print_maps(migratorContext *ctx, FileNameMap *maps, int n, const char *dbName)
+{
+	if (ctx->debug)
+	{
+		int			mapnum;
+
+		pg_log(ctx, PG_DEBUG, "mappings for db %s:\n", dbName);
+
+		for (mapnum = 0; mapnum < n; mapnum++)
+			pg_log(ctx, PG_DEBUG, "%s.%s:%u ==> %s.%s:%u\n",
+				   maps[mapnum].old_nspname, maps[mapnum].old_relname, maps[mapnum].old,
+				   maps[mapnum].new_nspname, maps[mapnum].new_relname, maps[mapnum].new);
+
+		pg_log(ctx, PG_DEBUG, "\n\n");
+	}
+}
+
+
+/*
+ * get_db_infos()
+ *
+ * Scans pg_database system catalog and returns (in dbinfs_arr) all user
+ * databases.
+ */
+static void
+get_db_infos(migratorContext *ctx, DbInfoArr *dbinfs_arr, Cluster whichCluster)
+{
+	PGconn	   *conn = connectToServer(ctx, "template1", whichCluster);
+	PGresult   *res;
+	int			ntups;
+	int			tupnum;
+	DbInfo	   *dbinfos;
+	int			i_datname;
+	int			i_oid;
+	int			i_spclocation;
+
+	res = executeQueryOrDie(ctx, conn,
+							"SELECT d.oid, d.datname, t.spclocation "
+							"FROM pg_catalog.pg_database d "
+							" LEFT OUTER JOIN pg_catalog.pg_tablespace t "
+							" ON d.dattablespace = t.oid "
+							"WHERE d.datallowconn = true");
+
+	i_datname = PQfnumber(res, "datname");
+	i_oid = PQfnumber(res, "oid");
+	i_spclocation = PQfnumber(res, "spclocation");
+
+	ntups = PQntuples(res);
+	dbinfos = (DbInfo *) pg_malloc(ctx, sizeof(DbInfo) * ntups);
+
+	for (tupnum = 0; tupnum < ntups; tupnum++)
+	{
+		dbinfos[tupnum].db_oid = atol(PQgetvalue(res, tupnum, i_oid));
+
+		snprintf(dbinfos[tupnum].db_name, sizeof(dbinfos[tupnum].db_name), "%s",
+				 PQgetvalue(res, tupnum, i_datname));
+		snprintf(dbinfos[tupnum].db_tblspace, sizeof(dbinfos[tupnum].db_tblspace), "%s",
+				 PQgetvalue(res, tupnum, i_spclocation));
+	}
+	PQclear(res);
+
+	PQfinish(conn);
+
+	dbinfs_arr->dbs = dbinfos;
+	dbinfs_arr->ndbs = ntups;
+}
+
+
+/*
+ * get_db_and_rel_infos()
+ *
+ * higher level routine to generate dbinfos for the database running
+ * on the given "port". Assumes that server is already running.
+ */
+void
+get_db_and_rel_infos(migratorContext *ctx, DbInfoArr *db_arr, Cluster whichCluster)
+{
+	int			dbnum;
+
+	get_db_infos(ctx, db_arr, whichCluster);
+
+	for (dbnum = 0; dbnum < db_arr->ndbs; dbnum++)
+		get_rel_infos(ctx, &db_arr->dbs[dbnum],
+					  &(db_arr->dbs[dbnum].rel_arr), whichCluster);
+
+	if (ctx->debug)
+		dbarr_print(ctx, db_arr, whichCluster);
+}
+
+
+/*
+ * get_rel_infos()
+ *
+ * gets the relinfos for all the user tables of the database refered
+ * by "db".
+ *
+ * NOTE: we assume that relations/entities with oids greater than
+ * FirstNormalObjectId belongs to the user
+ */
+static void
+get_rel_infos(migratorContext *ctx, const DbInfo *dbinfo,
+			  RelInfoArr *relarr, Cluster whichCluster)
+{
+	PGconn	   *conn = connectToServer(ctx, dbinfo->db_name, whichCluster);
+	PGresult   *res;
+	RelInfo    *relinfos;
+	int			ntups;
+	int			relnum;
+	int			num_rels = 0;
+	char	   *nspname = NULL;
+	char	   *relname = NULL;
+	int			i_spclocation = -1;
+	int			i_nspname = -1;
+	int			i_relname = -1;
+	int			i_oid = -1;
+	int			i_relfilenode = -1;
+	int			i_reltoastrelid = -1;
+	char		query[QUERY_ALLOC];
+
+	/*
+	 * pg_largeobject contains user data that does not appear the pg_dumpall
+	 * --schema-only output, so we have to migrate that system table heap and
+	 * index.  Ideally we could just get the relfilenode from template1 but
+	 * pg_largeobject_loid_pn_index's relfilenode can change if the table was
+	 * reindexed so we get the relfilenode for each database and migrate it as
+	 * a normal user table.
+	 */
+
+	snprintf(query, sizeof(query),
+			 "SELECT DISTINCT c.oid, n.nspname, c.relname, "
+			 "	c.relfilenode, c.reltoastrelid, t.spclocation "
+			 "FROM pg_catalog.pg_class c JOIN "
+			 "		pg_catalog.pg_namespace n "
+			 "	ON c.relnamespace = n.oid "
+			 "   LEFT OUTER JOIN pg_catalog.pg_tablespace t "
+			 "	ON c.reltablespace = t.oid "
+			 "WHERE (( n.nspname NOT IN ('pg_catalog', 'information_schema') "
+			 "	AND c.oid >= %u "
+			 "	) OR ( "
+			 "	n.nspname = 'pg_catalog' "
+			 "	AND relname IN "
+			 "        ('pg_largeobject', 'pg_largeobject_loid_pn_index') )) "
+			 "	AND relkind IN ('r','t', 'i'%s)"
+			 "GROUP BY  c.oid, n.nspname, c.relname, c.relfilenode,"
+			 "			c.reltoastrelid, t.spclocation, "
+			 "			n.nspname "
+			 "ORDER BY n.nspname, c.relname;",
+			 FirstNormalObjectId,
+	/* see the comment at the top of old_8_3_create_sequence_script() */
+			 (GET_MAJOR_VERSION(ctx->old.major_version) <= 803) ?
+			 "" : ", 'S'");
+
+	res = executeQueryOrDie(ctx, conn, query);
+
+	ntups = PQntuples(res);
+
+	relinfos = (RelInfo *) pg_malloc(ctx, sizeof(RelInfo) * ntups);
+
+	i_oid = PQfnumber(res, "oid");
+	i_nspname = PQfnumber(res, "nspname");
+	i_relname = PQfnumber(res, "relname");
+	i_relfilenode = PQfnumber(res, "relfilenode");
+	i_reltoastrelid = PQfnumber(res, "reltoastrelid");
+	i_spclocation = PQfnumber(res, "spclocation");
+
+	for (relnum = 0; relnum < ntups; relnum++)
+	{
+		RelInfo    *curr = &relinfos[num_rels++];
+		const char *tblspace;
+
+		curr->reloid = atol(PQgetvalue(res, relnum, i_oid));
+
+		nspname = PQgetvalue(res, relnum, i_nspname);
+		strlcpy(curr->nspname, nspname, sizeof(curr->nspname));
+
+		relname = PQgetvalue(res, relnum, i_relname);
+		strlcpy(curr->relname, relname, sizeof(curr->relname));
+
+		curr->relfilenode = atol(PQgetvalue(res, relnum, i_relfilenode));
+		curr->toastrelid = atol(PQgetvalue(res, relnum, i_reltoastrelid));
+
+		tblspace = PQgetvalue(res, relnum, i_spclocation);
+		/* if no table tablespace, use the database tablespace */
+		if (strlen(tblspace) == 0)
+			tblspace = dbinfo->db_tblspace;
+		strlcpy(curr->tablespace, tblspace, sizeof(curr->tablespace));
+	}
+	PQclear(res);
+
+	PQfinish(conn);
+
+	relarr->rels = relinfos;
+	relarr->nrels = num_rels;
+}
+
+
+/*
+ * dbarr_lookup_db()
+ *
+ * Returns the pointer to the DbInfo structure
+ */
+DbInfo *
+dbarr_lookup_db(DbInfoArr *db_arr, const char *db_name)
+{
+	int			dbnum;
+
+	if (!db_arr || !db_name)
+		return NULL;
+
+	for (dbnum = 0; dbnum < db_arr->ndbs; dbnum++)
+	{
+		if (strcmp(db_arr->dbs[dbnum].db_name, db_name) == 0)
+			return &db_arr->dbs[dbnum];
+	}
+
+	return NULL;
+}
+
+
+/*
+ * relarr_lookup_rel()
+ *
+ * Searches "relname" in rel_arr. Returns the *real* pointer to the
+ * RelInfo structure.
+ */
+static RelInfo *
+relarr_lookup_rel(migratorContext *ctx, RelInfoArr *rel_arr,
+				  const char *nspname, const char *relname,
+				  Cluster whichCluster)
+{
+	int			relnum;
+
+	if (!rel_arr || !relname)
+		return NULL;
+
+	for (relnum = 0; relnum < rel_arr->nrels; relnum++)
+	{
+		if (strcmp(rel_arr->rels[relnum].nspname, nspname) == 0 &&
+			strcmp(rel_arr->rels[relnum].relname, relname) == 0)
+			return &rel_arr->rels[relnum];
+	}
+	pg_log(ctx, PG_FATAL, "Could not find %s.%s in %s cluster\n",
+		   nspname, relname, CLUSTERNAME(whichCluster));
+	return NULL;
+}
+
+
+/*
+ * relarr_lookup_reloid()
+ *
+ *	Returns a pointer to the RelInfo structure for the
+ *	given oid or NULL if the desired entry cannot be
+ *	found.
+ */
+static RelInfo *
+relarr_lookup_reloid(migratorContext *ctx, RelInfoArr *rel_arr, Oid oid,
+					 Cluster whichCluster)
+{
+	int			relnum;
+
+	if (!rel_arr || !oid)
+		return NULL;
+
+	for (relnum = 0; relnum < rel_arr->nrels; relnum++)
+	{
+		if (rel_arr->rels[relnum].reloid == oid)
+			return &rel_arr->rels[relnum];
+	}
+	pg_log(ctx, PG_FATAL, "Could not find %d in %s cluster\n",
+		   oid, CLUSTERNAME(whichCluster));
+	return NULL;
+}
+
+
+static void
+relarr_free(RelInfoArr *rel_arr)
+{
+	pg_free(rel_arr->rels);
+	rel_arr->nrels = 0;
+}
+
+
+void
+dbarr_free(DbInfoArr *db_arr)
+{
+	int			dbnum;
+
+	for (dbnum = 0; dbnum < db_arr->ndbs; dbnum++)
+		relarr_free(&db_arr->dbs[dbnum].rel_arr);
+	db_arr->ndbs = 0;
+}
+
+
+static void
+dbarr_print(migratorContext *ctx, DbInfoArr *arr, Cluster whichCluster)
+{
+	int			dbnum;
+
+	pg_log(ctx, PG_DEBUG, "%s databases\n", CLUSTERNAME(whichCluster));
+
+	for (dbnum = 0; dbnum < arr->ndbs; dbnum++)
+	{
+		pg_log(ctx, PG_DEBUG, "Database: %s\n", arr->dbs[dbnum].db_name);
+		relarr_print(ctx, &arr->dbs[dbnum].rel_arr);
+		pg_log(ctx, PG_DEBUG, "\n\n");
+	}
+}
+
+
+static void
+relarr_print(migratorContext *ctx, RelInfoArr *arr)
+{
+	int			relnum;
+
+	for (relnum = 0; relnum < arr->nrels; relnum++)
+		pg_log(ctx, PG_DEBUG, "relname: %s.%s: reloid: %u reltblspace: %s\n",
+			   arr->rels[relnum].nspname, arr->rels[relnum].relname,
+			   arr->rels[relnum].reloid, arr->rels[relnum].tablespace);
+}
diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c
new file mode 100644
index 0000000000..1704069b34
--- /dev/null
+++ b/contrib/pg_upgrade/option.c
@@ -0,0 +1,346 @@
+/*
+ *	opt.c
+ *
+ *	options functions
+ *
+ *	Copyright (c) 2010, PostgreSQL Global Development Group
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/option.c,v 1.12 2010/07/06 19:18:55 momjian Exp $
+ */
+
+#include "pg_upgrade.h"
+
+#include "getopt_long.h"
+
+#ifdef WIN32
+#include <io.h>
+#endif
+
+
+static void usage(migratorContext *ctx);
+static void validateDirectoryOption(migratorContext *ctx, char **dirpath,
+				   char *envVarName, char *cmdLineOption, char *description);
+static void get_pkglibdirs(migratorContext *ctx);
+static char *get_pkglibdir(migratorContext *ctx, const char *bindir);
+
+
+/*
+ * parseCommandLine()
+ *
+ *	Parses the command line (argc, argv[]) into the given migratorContext object
+ *	and initializes the rest of the object.
+ */
+void
+parseCommandLine(migratorContext *ctx, int argc, char *argv[])
+{
+	static struct option long_options[] = {
+		{"old-datadir", required_argument, NULL, 'd'},
+		{"new-datadir", required_argument, NULL, 'D'},
+		{"old-bindir", required_argument, NULL, 'b'},
+		{"new-bindir", required_argument, NULL, 'B'},
+		{"old-port", required_argument, NULL, 'p'},
+		{"new-port", required_argument, NULL, 'P'},
+
+		{"user", required_argument, NULL, 'u'},
+		{"check", no_argument, NULL, 'c'},
+		{"debug", no_argument, NULL, 'g'},
+		{"debugfile", required_argument, NULL, 'G'},
+		{"link", no_argument, NULL, 'k'},
+		{"logfile", required_argument, NULL, 'l'},
+		{"verbose", no_argument, NULL, 'v'},
+		{NULL, 0, NULL, 0}
+	};
+	int			option;			/* Command line option */
+	int			optindex = 0;	/* used by getopt_long */
+	int			user_id;
+
+	if (getenv("PGUSER"))
+	{
+		pg_free(ctx->user);
+		ctx->user = pg_strdup(ctx, getenv("PGUSER"));
+	}
+
+	ctx->progname = get_progname(argv[0]);
+	ctx->old.port = getenv("PGPORT") ? atoi(getenv("PGPORT")) : DEF_PGPORT;
+	ctx->new.port = getenv("PGPORT") ? atoi(getenv("PGPORT")) : DEF_PGPORT;
+	/* must save value, getenv()'s pointer is not stable */
+
+	ctx->transfer_mode = TRANSFER_MODE_COPY;
+
+	/* user lookup and 'root' test must be split because of usage() */
+	user_id = get_user_info(ctx, &ctx->user);
+
+	if (argc > 1)
+	{
+		if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0 ||
+			strcmp(argv[1], "-?") == 0)
+		{
+			usage(ctx);
+			exit_nicely(ctx, false);
+		}
+		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
+		{
+			pg_log(ctx, PG_REPORT, "pg_upgrade " PG_VERSION "\n");
+			exit_nicely(ctx, false);
+		}
+	}
+
+	if (user_id == 0)
+		pg_log(ctx, PG_FATAL, "%s: cannot be run as root\n", ctx->progname);
+
+	getcwd(ctx->cwd, MAXPGPATH);
+
+	while ((option = getopt_long(argc, argv, "d:D:b:B:cgG:kl:p:P:u:v",
+								 long_options, &optindex)) != -1)
+	{
+		switch (option)
+		{
+			case 'd':
+				ctx->old.pgdata = pg_strdup(ctx, optarg);
+				break;
+
+			case 'D':
+				ctx->new.pgdata = pg_strdup(ctx, optarg);
+				break;
+
+			case 'b':
+				ctx->old.bindir = pg_strdup(ctx, optarg);
+				break;
+
+			case 'B':
+				ctx->new.bindir = pg_strdup(ctx, optarg);
+				break;
+
+			case 'c':
+				ctx->check = true;
+				break;
+
+			case 'g':
+				pg_log(ctx, PG_REPORT, "Running in debug mode\n");
+				ctx->debug = true;
+				break;
+
+			case 'G':
+				if ((ctx->debug_fd = fopen(optarg, "w")) == NULL)
+				{
+					pg_log(ctx, PG_FATAL, "cannot open debug file\n");
+					exit_nicely(ctx, false);
+				}
+				break;
+
+			case 'k':
+				ctx->transfer_mode = TRANSFER_MODE_LINK;
+				break;
+
+			case 'l':
+				ctx->logfile = pg_strdup(ctx, optarg);
+				break;
+
+			case 'p':
+				if ((ctx->old.port = atoi(optarg)) <= 0)
+				{
+					pg_log(ctx, PG_FATAL, "invalid old port number\n");
+					exit_nicely(ctx, false);
+				}
+				break;
+
+			case 'P':
+				if ((ctx->new.port = atoi(optarg)) <= 0)
+				{
+					pg_log(ctx, PG_FATAL, "invalid new port number\n");
+					exit_nicely(ctx, false);
+				}
+				break;
+
+			case 'u':
+				pg_free(ctx->user);
+				ctx->user = pg_strdup(ctx, optarg);
+				break;
+
+			case 'v':
+				pg_log(ctx, PG_REPORT, "Running in verbose mode\n");
+				ctx->verbose = true;
+				break;
+
+			default:
+				pg_log(ctx, PG_FATAL,
+					   "Try \"%s --help\" for more information.\n",
+					   ctx->progname);
+				break;
+		}
+	}
+
+	if (ctx->logfile != NULL)
+	{
+		/*
+		 * We must use append mode so output generated by child processes via
+		 * ">>" will not be overwritten, and we want the file truncated on
+		 * start.
+		 */
+		/* truncate */
+		if ((ctx->log_fd = fopen(ctx->logfile, "w")) == NULL)
+			pg_log(ctx, PG_FATAL, "Cannot write to log file %s\n", ctx->logfile);
+		fclose(ctx->log_fd);
+		if ((ctx->log_fd = fopen(ctx->logfile, "a")) == NULL)
+			pg_log(ctx, PG_FATAL, "Cannot write to log file %s\n", ctx->logfile);
+	}
+	else
+		ctx->logfile = strdup(DEVNULL);
+
+	/* if no debug file name, output to the terminal */
+	if (ctx->debug && !ctx->debug_fd)
+	{
+		ctx->debug_fd = fopen(DEVTTY, "w");
+		if (!ctx->debug_fd)
+			pg_log(ctx, PG_FATAL, "Cannot write to terminal\n");
+	}
+
+	/* Get values from env if not already set */
+	validateDirectoryOption(ctx, &ctx->old.pgdata, "OLDDATADIR", "-d",
+							"old cluster data resides");
+	validateDirectoryOption(ctx, &ctx->new.pgdata, "NEWDATADIR", "-D",
+							"new cluster data resides");
+	validateDirectoryOption(ctx, &ctx->old.bindir, "OLDBINDIR", "-b",
+							"old cluster binaries reside");
+	validateDirectoryOption(ctx, &ctx->new.bindir, "NEWBINDIR", "-B",
+							"new cluster binaries reside");
+
+	get_pkglibdirs(ctx);
+}
+
+
+static void
+usage(migratorContext *ctx)
+{
+	printf(_("\nUsage: pg_upgrade [OPTIONS]...\n\
+\n\
+Options:\n\
+ -b, --old-bindir=old_bindir      old cluster executable directory\n\
+ -B, --new-bindir=new_bindir      new cluster executable directory\n\
+ -c, --check                      check clusters only, don't change any data\n\
+ -d, --old-datadir=old_datadir    old cluster data directory\n\
+ -D, --new-datadir=new_datadir    new cluster data directory\n\
+ -g, --debug                      enable debugging\n\
+ -G, --debugfile=debug_filename   output debugging activity to file\n\
+ -k, --link                       link instead of copying files to new cluster\n\
+ -l, --logfile=log_filename       log session activity to file\n\
+ -p, --old-port=old_portnum       old cluster port number (default %d)\n\
+ -P, --new-port=new_portnum       new cluster port number (default %d)\n\
+ -u, --user=username              clusters superuser (default \"%s\")\n\
+ -v, --verbose                    enable verbose output\n\
+ -V, --version                    display version information, then exit\n\
+ -h, --help                       show this help, then exit\n\
+\n\
+Before running pg_upgrade you must:\n\
+  create a new database cluster (using the new version of initdb)\n\
+  shutdown the postmaster servicing the old cluster\n\
+  shutdown the postmaster servicing the new cluster\n\
+\n\
+When you run pg_upgrade, you must provide the following information:\n\
+  the data directory for the old cluster  (-d OLDDATADIR)\n\
+  the data directory for the new cluster  (-D NEWDATADIR)\n\
+  the 'bin' directory for the old version (-b OLDBINDIR)\n\
+  the 'bin' directory for the new version (-B NEWBINDIR)\n\
+\n\
+For example:\n\
+  pg_upgrade -d oldCluster/data -D newCluster/data -b oldCluster/bin -B newCluster/bin\n\
+or\n"), ctx->old.port, ctx->new.port, ctx->user);
+#ifndef WIN32
+	printf(_("\
+  $ export OLDDATADIR=oldCluster/data\n\
+  $ export NEWDATADIR=newCluster/data\n\
+  $ export OLDBINDIR=oldCluster/bin\n\
+  $ export NEWBINDIR=newCluster/bin\n\
+  $ pg_upgrade\n"));
+#else
+	printf(_("\
+  C:\\> set OLDDATADIR=oldCluster/data\n\
+  C:\\> set NEWDATADIR=newCluster/data\n\
+  C:\\> set OLDBINDIR=oldCluster/bin\n\
+  C:\\> set NEWBINDIR=newCluster/bin\n\
+  C:\\> pg_upgrade\n"));
+#endif
+	printf(_("\n\
+You may find it useful to save the preceding 5 commands in a shell script\n\
+\n\
+Report bugs to <[email protected]>\n"));
+}
+
+
+/*
+ * validateDirectoryOption()
+ *
+ * Validates a directory option.
+ *	dirpath		  - the directory name supplied on the command line
+ *	envVarName	  - the name of an environment variable to get if dirpath is NULL
+ *	cmdLineOption - the command line option corresponds to this directory (-o, -O, -n, -N)
+ *	description   - a description of this directory option
+ *
+ * We use the last two arguments to construct a meaningful error message if the
+ * user hasn't provided the required directory name.
+ */
+static void
+validateDirectoryOption(migratorContext *ctx, char **dirpath,
+					char *envVarName, char *cmdLineOption, char *description)
+{
+	if (*dirpath == NULL || (strlen(*dirpath) == 0))
+	{
+		const char *envVar;
+
+		if ((envVar = getenv(envVarName)) && strlen(envVar))
+			*dirpath = pg_strdup(ctx, envVar);
+		else
+		{
+			pg_log(ctx, PG_FATAL, "You must identify the directory where the %s\n"
+				   "Please use the %s command-line option or the %s environment variable\n",
+				   description, cmdLineOption, envVarName);
+		}
+	}
+
+	/*
+	 * Trim off any trailing path separators
+	 */
+#ifndef WIN32
+	if ((*dirpath)[strlen(*dirpath) - 1] == '/')
+#else
+	if ((*dirpath)[strlen(*dirpath) - 1] == '/' ||
+		(*dirpath)[strlen(*dirpath) - 1] == '\\')
+#endif
+		(*dirpath)[strlen(*dirpath) - 1] = 0;
+}
+
+
+static void
+get_pkglibdirs(migratorContext *ctx)
+{
+	ctx->old.libpath = get_pkglibdir(ctx, ctx->old.bindir);
+	ctx->new.libpath = get_pkglibdir(ctx, ctx->new.bindir);
+}
+
+
+static char *
+get_pkglibdir(migratorContext *ctx, const char *bindir)
+{
+	char		cmd[MAXPGPATH];
+	char		bufin[MAX_STRING];
+	FILE	   *output;
+	int			i;
+
+	snprintf(cmd, sizeof(cmd), "\"%s/pg_config\" --pkglibdir", bindir);
+
+	if ((output = popen(cmd, "r")) == NULL)
+		pg_log(ctx, PG_FATAL, "Could not get pkglibdir data: %s\n",
+			   getErrorText(errno));
+
+	fgets(bufin, sizeof(bufin), output);
+
+	if (output)
+		pclose(output);
+
+	/* Remove trailing newline */
+	i = strlen(bufin) - 1;
+
+	if (bufin[i] == '\n')
+		bufin[i] = '\0';
+
+	return pg_strdup(ctx, bufin);
+}
diff --git a/contrib/pg_upgrade/page.c b/contrib/pg_upgrade/page.c
new file mode 100644
index 0000000000..de19a0023e
--- /dev/null
+++ b/contrib/pg_upgrade/page.c
@@ -0,0 +1,175 @@
+/*
+ *	page.c
+ *
+ *	per-page conversion operations
+ *
+ *	Copyright (c) 2010, PostgreSQL Global Development Group
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/page.c,v 1.5 2010/07/03 16:33:14 momjian Exp $
+ */
+
+#include "pg_upgrade.h"
+
+#include "storage/bufpage.h"
+
+
+#ifdef PAGE_CONVERSION
+
+
+static const char *getPageVersion(migratorContext *ctx,
+			   uint16 *version, const char *pathName);
+static pageCnvCtx *loadConverterPlugin(migratorContext *ctx,
+					uint16 newPageVersion, uint16 oldPageVersion);
+
+
+/*
+ * setupPageConverter()
+ *
+ *	This function determines the PageLayoutVersion of the old cluster and
+ *	the PageLayoutVersion of the new cluster.  If the versions differ, this
+ *	function loads a converter plugin and returns a pointer to a pageCnvCtx
+ *	object (in *result) that knows how to convert pages from the old format
+ *	to the new format.	If the versions are identical, this function just
+ *	returns a NULL pageCnvCtx pointer to indicate that page-by-page conversion
+ *	is not required.
+ *
+ *	If successful this function sets *result and returns NULL.	If an error
+ *	occurs, this function returns an error message in the form of an null-terminated
+ *	string.
+ */
+const char *
+setupPageConverter(migratorContext *ctx, pageCnvCtx **result)
+{
+	uint16		oldPageVersion;
+	uint16		newPageVersion;
+	pageCnvCtx *converter;
+	const char *msg;
+	char		dstName[MAXPGPATH];
+	char		srcName[MAXPGPATH];
+
+	snprintf(dstName, sizeof(dstName), "%s/global/%u", ctx->new.pgdata,
+			 ctx->new.pg_database_oid);
+	snprintf(srcName, sizeof(srcName), "%s/global/%u", ctx->old.pgdata,
+			 ctx->old.pg_database_oid);
+
+	if ((msg = getPageVersion(ctx, &oldPageVersion, srcName)) != NULL)
+		return msg;
+
+	if ((msg = getPageVersion(ctx, &newPageVersion, dstName)) != NULL)
+		return msg;
+
+	/*
+	 * If the old cluster and new cluster use the same page layouts, then we
+	 * don't need a page converter.
+	 */
+	if (newPageVersion == oldPageVersion)
+	{
+		*result = NULL;
+		return NULL;
+	}
+
+	/*
+	 * The clusters use differing page layouts, see if we can find a plugin
+	 * that knows how to convert from the old page layout to the new page
+	 * layout.
+	 */
+
+	if ((converter = loadConverterPlugin(ctx, newPageVersion, oldPageVersion)) == NULL)
+		return "can't find plugin to convert from old page layout to new page layout";
+	else
+	{
+		*result = converter;
+		return NULL;
+	}
+}
+
+
+/*
+ * getPageVersion()
+ *
+ *	Retrieves the PageLayoutVersion for the given relation.
+ *
+ *	Returns NULL on success (and stores the PageLayoutVersion at *version),
+ *	if an error occurs, this function returns an error message (in the form
+ *	of a null-terminated string).
+ */
+static const char *
+getPageVersion(migratorContext *ctx, uint16 *version, const char *pathName)
+{
+	int			relfd;
+	PageHeaderData page;
+	ssize_t		bytesRead;
+
+	if ((relfd = open(pathName, O_RDONLY, 0)) < 0)
+		return "can't open relation";
+
+	if ((bytesRead = read(relfd, &page, sizeof(page))) != sizeof(page))
+		return "can't read page header";
+
+	*version = PageGetPageLayoutVersion(&page);
+
+	close(relfd);
+
+	return NULL;
+}
+
+
+/*
+ * loadConverterPlugin()
+ *
+ *	This function loads a page-converter plugin library and grabs a
+ *	pointer to each of the (interesting) functions provided by that
+ *	plugin.  The name of the plugin library is derived from the given
+ *	newPageVersion and oldPageVersion.	If a plugin is found, this
+ *	function returns a pointer to a pageCnvCtx object (which will contain
+ *	a collection of plugin function pointers). If the required plugin
+ *	is not found, this function returns NULL.
+ */
+static pageCnvCtx *
+loadConverterPlugin(migratorContext *ctx, uint16 newPageVersion, uint16 oldPageVersion)
+{
+	char		pluginName[MAXPGPATH];
+	void	   *plugin;
+
+	/*
+	 * Try to find a plugin that can convert pages of oldPageVersion into
+	 * pages of newPageVersion.  For example, if we oldPageVersion = 3 and
+	 * newPageVersion is 4, we search for a plugin named:
+	 * plugins/convertLayout_3_to_4.dll
+	 */
+
+	/*
+	 * FIXME: we are searching for plugins relative to the current directory,
+	 * we should really search relative to our own executable instead.
+	 */
+	snprintf(pluginName, sizeof(pluginName), "./plugins/convertLayout_%d_to_%d%s",
+			 oldPageVersion, newPageVersion, DLSUFFIX);
+
+	if ((plugin = pg_dlopen(pluginName)) == NULL)
+		return NULL;
+	else
+	{
+		pageCnvCtx *result = (pageCnvCtx *) pg_malloc(ctx, sizeof(*result));
+
+		result->old.PageVersion = oldPageVersion;
+		result->new.PageVersion = newPageVersion;
+
+		result->startup = (pluginStartup) pg_dlsym(plugin, "init");
+		result->convertFile = (pluginConvertFile) pg_dlsym(plugin, "convertFile");
+		result->convertPage = (pluginConvertPage) pg_dlsym(plugin, "convertPage");
+		result->shutdown = (pluginShutdown) pg_dlsym(plugin, "fini");
+		result->pluginData = NULL;
+
+		/*
+		 * If the plugin has exported an initializer, go ahead and invoke it.
+		 */
+		if (result->startup)
+			result->startup(MIGRATOR_API_VERSION, &result->pluginVersion,
+						newPageVersion, oldPageVersion, &result->pluginData);
+
+		return result;
+	}
+}
+
+
+
+#endif
diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c
new file mode 100644
index 0000000000..695596ba60
--- /dev/null
+++ b/contrib/pg_upgrade/pg_upgrade.c
@@ -0,0 +1,414 @@
+/*
+ *	pg_upgrade.c
+ *
+ *	main source file
+ *
+ *	Copyright (c) 2010, PostgreSQL Global Development Group
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/pg_upgrade.c,v 1.10 2010/07/06 19:18:55 momjian Exp $
+ */
+
+#include "pg_upgrade.h"
+
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+
+static void disable_old_cluster(migratorContext *ctx);
+static void prepare_new_cluster(migratorContext *ctx);
+static void prepare_new_databases(migratorContext *ctx);
+static void create_new_objects(migratorContext *ctx);
+static void copy_clog_xlog_xid(migratorContext *ctx);
+static void set_frozenxids(migratorContext *ctx);
+static void setup(migratorContext *ctx, char *argv0, bool live_check);
+static void cleanup(migratorContext *ctx);
+
+
+int
+main(int argc, char **argv)
+{
+	migratorContext ctx;
+	char	   *sequence_script_file_name = NULL;
+	char	   *deletion_script_file_name = NULL;
+	bool		live_check = false;
+
+	memset(&ctx, 0, sizeof(ctx));
+
+	parseCommandLine(&ctx, argc, argv);
+
+	output_check_banner(&ctx, &live_check);
+
+	setup(&ctx, argv[0], live_check);
+
+	check_cluster_versions(&ctx);
+	check_cluster_compatibility(&ctx, live_check);
+
+	check_old_cluster(&ctx, live_check, &sequence_script_file_name);
+
+
+	/* -- NEW -- */
+	start_postmaster(&ctx, CLUSTER_NEW, false);
+
+	check_new_cluster(&ctx);
+	report_clusters_compatible(&ctx);
+
+	pg_log(&ctx, PG_REPORT, "\nPerforming Migration\n");
+	pg_log(&ctx, PG_REPORT, "--------------------\n");
+
+	disable_old_cluster(&ctx);
+	prepare_new_cluster(&ctx);
+
+	stop_postmaster(&ctx, false, false);
+
+	/*
+	 * Destructive Changes to New Cluster
+	 */
+
+	copy_clog_xlog_xid(&ctx);
+
+	/* New now using xids of the old system */
+
+	prepare_new_databases(&ctx);
+
+	create_new_objects(&ctx);
+
+	transfer_all_new_dbs(&ctx, &ctx.old.dbarr, &ctx.new.dbarr,
+						 ctx.old.pgdata, ctx.new.pgdata);
+
+	/*
+	 * Assuming OIDs are only used in system tables, there is no need to
+	 * restore the OID counter because we have not transferred any OIDs from
+	 * the old system, but we do it anyway just in case.  We do it late here
+	 * because there is no need to have the schema load use new oids.
+	 */
+	prep_status(&ctx, "Setting next oid for new cluster");
+	exec_prog(&ctx, true, SYSTEMQUOTE "\"%s/pg_resetxlog\" -o %u \"%s\" > "
+			  DEVNULL SYSTEMQUOTE,
+		  ctx.new.bindir, ctx.old.controldata.chkpnt_nxtoid, ctx.new.pgdata);
+	check_ok(&ctx);
+
+	create_script_for_old_cluster_deletion(&ctx, &deletion_script_file_name);
+
+	issue_warnings(&ctx, sequence_script_file_name);
+
+	pg_log(&ctx, PG_REPORT, "\nUpgrade complete\n");
+	pg_log(&ctx, PG_REPORT, "----------------\n");
+
+	output_completion_banner(&ctx, deletion_script_file_name);
+
+	pg_free(deletion_script_file_name);
+	pg_free(sequence_script_file_name);
+
+	cleanup(&ctx);
+
+	return 0;
+}
+
+
+static void
+setup(migratorContext *ctx, char *argv0, bool live_check)
+{
+	char		exec_path[MAXPGPATH];	/* full path to my executable */
+
+	/*
+	 * make sure the user has a clean environment, otherwise, we may confuse
+	 * libpq when we connect to one (or both) of the servers.
+	 */
+	check_for_libpq_envvars(ctx);
+
+	verify_directories(ctx);
+
+	/* no postmasters should be running */
+	if (!live_check && is_server_running(ctx, ctx->old.pgdata))
+	{
+		pg_log(ctx, PG_FATAL, "There seems to be a postmaster servicing the old cluster.\n"
+			   "Please shutdown that postmaster and try again.\n");
+	}
+
+	/* same goes for the new postmaster */
+	if (is_server_running(ctx, ctx->new.pgdata))
+	{
+		pg_log(ctx, PG_FATAL, "There seems to be a postmaster servicing the new cluster.\n"
+			   "Please shutdown that postmaster and try again.\n");
+	}
+
+	/* get path to pg_upgrade executable */
+	if (find_my_exec(argv0, exec_path) < 0)
+		pg_log(ctx, PG_FATAL, "Could not get pathname to pg_upgrade: %s\n", getErrorText(errno));
+
+	/* Trim off program name and keep just path */
+	*last_dir_separator(exec_path) = '\0';
+	canonicalize_path(exec_path);
+	ctx->exec_path = pg_strdup(ctx, exec_path);
+}
+
+
+static void
+disable_old_cluster(migratorContext *ctx)
+{
+	/* rename pg_control so old server cannot be accidentally started */
+	rename_old_pg_control(ctx);
+}
+
+
+static void
+prepare_new_cluster(migratorContext *ctx)
+{
+	/*
+	 * It would make more sense to freeze after loading the schema, but that
+	 * would cause us to lose the frozenids restored by the load. We use
+	 * --analyze so autovacuum doesn't update statistics later
+	 */
+	prep_status(ctx, "Analyzing all rows in the new cluster");
+	exec_prog(ctx, true,
+			  SYSTEMQUOTE "\"%s/vacuumdb\" --port %d --username \"%s\" "
+			  "--all --analyze >> %s 2>&1" SYSTEMQUOTE,
+			  ctx->new.bindir, ctx->new.port, ctx->user, ctx->logfile);
+	check_ok(ctx);
+
+	/*
+	 * We do freeze after analyze so pg_statistic is also frozen. template0 is
+	 * not frozen here, but data rows were frozen by initdb, and we set its
+	 * datfrozenxid and relfrozenxids later to match the new xid counter
+	 * later.
+	 */
+	prep_status(ctx, "Freezing all rows on the new cluster");
+	exec_prog(ctx, true,
+			  SYSTEMQUOTE "\"%s/vacuumdb\" --port %d --username \"%s\" "
+			  "--all --freeze >> %s 2>&1" SYSTEMQUOTE,
+			  ctx->new.bindir, ctx->new.port, ctx->user, ctx->logfile);
+	check_ok(ctx);
+
+	get_pg_database_relfilenode(ctx, CLUSTER_NEW);
+}
+
+
+static void
+prepare_new_databases(migratorContext *ctx)
+{
+	/* -- NEW -- */
+	start_postmaster(ctx, CLUSTER_NEW, false);
+
+	/*
+	 * We set autovacuum_freeze_max_age to its maximum value so autovacuum
+	 * does not launch here and delete clog files, before the frozen xids are
+	 * set.
+	 */
+
+	set_frozenxids(ctx);
+
+	/*
+	 * We have to create the databases first so we can create the toast table
+	 * placeholder relfiles.
+	 */
+	prep_status(ctx, "Creating databases in the new cluster");
+	exec_prog(ctx, true,
+			  SYSTEMQUOTE "\"%s/psql\" --port %d --username \"%s\" "
+		   "--set ON_ERROR_STOP=on -f \"%s/%s\" --dbname template1 >> \"%s\""
+			  SYSTEMQUOTE,
+			  ctx->new.bindir, ctx->new.port, ctx->user, ctx->cwd,
+			  GLOBALS_DUMP_FILE, ctx->logfile);
+	check_ok(ctx);
+
+	get_db_and_rel_infos(ctx, &ctx->new.dbarr, CLUSTER_NEW);
+
+	stop_postmaster(ctx, false, false);
+}
+
+
+static void
+create_new_objects(migratorContext *ctx)
+{
+	/* -- NEW -- */
+	start_postmaster(ctx, CLUSTER_NEW, false);
+
+	install_support_functions(ctx);
+
+	prep_status(ctx, "Restoring database schema to new cluster");
+	exec_prog(ctx, true,
+			  SYSTEMQUOTE "\"%s/psql\" --port %d --username \"%s\" "
+		   "--set ON_ERROR_STOP=on -f \"%s/%s\" --dbname template1 >> \"%s\""
+			  SYSTEMQUOTE,
+			  ctx->new.bindir, ctx->new.port, ctx->user, ctx->cwd,
+			  DB_DUMP_FILE, ctx->logfile);
+	check_ok(ctx);
+
+	/* regenerate now that we have db schemas */
+	dbarr_free(&ctx->new.dbarr);
+	get_db_and_rel_infos(ctx, &ctx->new.dbarr, CLUSTER_NEW);
+
+	uninstall_support_functions(ctx);
+
+	stop_postmaster(ctx, false, false);
+}
+
+
+static void
+copy_clog_xlog_xid(migratorContext *ctx)
+{
+	char		old_clog_path[MAXPGPATH];
+	char		new_clog_path[MAXPGPATH];
+
+	/* copy old commit logs to new data dir */
+	prep_status(ctx, "Deleting new commit clogs");
+
+	snprintf(old_clog_path, sizeof(old_clog_path), "%s/pg_clog", ctx->old.pgdata);
+	snprintf(new_clog_path, sizeof(new_clog_path), "%s/pg_clog", ctx->new.pgdata);
+	if (rmtree(new_clog_path, true) != true)
+		pg_log(ctx, PG_FATAL, "Unable to delete directory %s\n", new_clog_path);
+	check_ok(ctx);
+
+	prep_status(ctx, "Copying old commit clogs to new server");
+	/* libpgport's copydir() doesn't work in FRONTEND code */
+#ifndef WIN32
+	exec_prog(ctx, true, SYSTEMQUOTE "%s \"%s\" \"%s\"" SYSTEMQUOTE,
+			  "cp -Rf",
+#else
+	/* flags: everything, no confirm, quiet, overwrite read-only */
+	exec_prog(ctx, true, SYSTEMQUOTE "%s \"%s\" \"%s\\\"" SYSTEMQUOTE,
+			  "xcopy /e /y /q /r",
+#endif
+			  old_clog_path, new_clog_path);
+	check_ok(ctx);
+
+	/* set the next transaction id of the new cluster */
+	prep_status(ctx, "Setting next transaction id for new cluster");
+	exec_prog(ctx, true, SYSTEMQUOTE "\"%s/pg_resetxlog\" -f -x %u \"%s\" > " DEVNULL SYSTEMQUOTE,
+	   ctx->new.bindir, ctx->old.controldata.chkpnt_nxtxid, ctx->new.pgdata);
+	check_ok(ctx);
+
+	/* now reset the wal archives in the new cluster */
+	prep_status(ctx, "Resetting WAL archives");
+	exec_prog(ctx, true, SYSTEMQUOTE "\"%s/pg_resetxlog\" -l %u,%u,%u \"%s\" >> \"%s\" 2>&1" SYSTEMQUOTE,
+			  ctx->new.bindir, ctx->old.controldata.chkpnt_tli,
+			  ctx->old.controldata.logid, ctx->old.controldata.nxtlogseg,
+			  ctx->new.pgdata, ctx->logfile);
+	check_ok(ctx);
+}
+
+
+/*
+ *	set_frozenxids()
+ *
+ *	We have frozen all xids, so set relfrozenxid and datfrozenxid
+ *	to be the old cluster's xid counter, which we just set in the new
+ *	cluster.  User-table frozenxid values will be set by pg_dumpall
+ *	--binary-upgrade, but objects not set by the pg_dump must have
+ *	proper frozen counters.
+ */
+static
+void
+set_frozenxids(migratorContext *ctx)
+{
+	int			dbnum;
+	PGconn	   *conn,
+			   *conn_template1;
+	PGresult   *dbres;
+	int			ntups;
+	int			i_datname;
+	int			i_datallowconn;
+
+	prep_status(ctx, "Setting frozenxid counters in new cluster");
+
+	conn_template1 = connectToServer(ctx, "template1", CLUSTER_NEW);
+
+	/* set pg_database.datfrozenxid */
+	PQclear(executeQueryOrDie(ctx, conn_template1,
+							  "UPDATE pg_catalog.pg_database "
+							  "SET	datfrozenxid = '%u'",
+							  ctx->old.controldata.chkpnt_nxtxid));
+
+	/* get database names */
+	dbres = executeQueryOrDie(ctx, conn_template1,
+							  "SELECT	datname, datallowconn "
+							  "FROM	pg_catalog.pg_database");
+
+	i_datname = PQfnumber(dbres, "datname");
+	i_datallowconn = PQfnumber(dbres, "datallowconn");
+
+	ntups = PQntuples(dbres);
+	for (dbnum = 0; dbnum < ntups; dbnum++)
+	{
+		char	   *datname = PQgetvalue(dbres, dbnum, i_datname);
+		char	   *datallowconn = PQgetvalue(dbres, dbnum, i_datallowconn);
+
+		/*
+		 * We must update databases where datallowconn = false, e.g.
+		 * template0, because autovacuum increments their datfrozenxids and
+		 * relfrozenxids even if autovacuum is turned off, and even though all
+		 * the data rows are already frozen  To enable this, we temporarily
+		 * change datallowconn.
+		 */
+		if (strcmp(datallowconn, "f") == 0)
+			PQclear(executeQueryOrDie(ctx, conn_template1,
+									  "UPDATE pg_catalog.pg_database "
+									  "SET	datallowconn = true "
+									  "WHERE datname = '%s'", datname));
+
+		conn = connectToServer(ctx, datname, CLUSTER_NEW);
+
+		/* set pg_class.relfrozenxid */
+		PQclear(executeQueryOrDie(ctx, conn,
+								  "UPDATE	pg_catalog.pg_class "
+								  "SET	relfrozenxid = '%u' "
+		/* only heap and TOAST are vacuumed */
+								  "WHERE	relkind IN ('r', 't')",
+								  ctx->old.controldata.chkpnt_nxtxid));
+		PQfinish(conn);
+
+		/* Reset datallowconn flag */
+		if (strcmp(datallowconn, "f") == 0)
+			PQclear(executeQueryOrDie(ctx, conn_template1,
+									  "UPDATE pg_catalog.pg_database "
+									  "SET	datallowconn = false "
+									  "WHERE datname = '%s'", datname));
+	}
+
+	PQclear(dbres);
+
+	PQfinish(conn_template1);
+
+	check_ok(ctx);
+}
+
+
+static void
+cleanup(migratorContext *ctx)
+{
+	int			tblnum;
+	char		filename[MAXPGPATH];
+
+	for (tblnum = 0; tblnum < ctx->num_tablespaces; tblnum++)
+		pg_free(ctx->tablespaces[tblnum]);
+	pg_free(ctx->tablespaces);
+
+	dbarr_free(&ctx->old.dbarr);
+	dbarr_free(&ctx->new.dbarr);
+	pg_free(ctx->logfile);
+	pg_free(ctx->user);
+	pg_free(ctx->old.major_version_str);
+	pg_free(ctx->new.major_version_str);
+	pg_free(ctx->old.controldata.lc_collate);
+	pg_free(ctx->new.controldata.lc_collate);
+	pg_free(ctx->old.controldata.lc_ctype);
+	pg_free(ctx->new.controldata.lc_ctype);
+	pg_free(ctx->old.controldata.encoding);
+	pg_free(ctx->new.controldata.encoding);
+	pg_free(ctx->old.tablespace_suffix);
+	pg_free(ctx->new.tablespace_suffix);
+
+	if (ctx->log_fd != NULL)
+	{
+		fclose(ctx->log_fd);
+		ctx->log_fd = NULL;
+	}
+
+	if (ctx->debug_fd)
+		fclose(ctx->debug_fd);
+
+	snprintf(filename, sizeof(filename), "%s/%s", ctx->cwd, ALL_DUMP_FILE);
+	unlink(filename);
+	snprintf(filename, sizeof(filename), "%s/%s", ctx->cwd, GLOBALS_DUMP_FILE);
+	unlink(filename);
+	snprintf(filename, sizeof(filename), "%s/%s", ctx->cwd, DB_DUMP_FILE);
+	unlink(filename);
+}
diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
new file mode 100644
index 0000000000..b80f32778d
--- /dev/null
+++ b/contrib/pg_upgrade/pg_upgrade.h
@@ -0,0 +1,400 @@
+/*
+ *	pg_upgrade.h
+ *
+ *	Copyright (c) 2010, PostgreSQL Global Development Group
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/pg_upgrade.h,v 1.15 2010/07/06 19:18:55 momjian Exp $
+ */
+
+#include "postgres.h"
+
+#include <unistd.h>
+#include <assert.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+
+#include "libpq-fe.h"
+
+/* Allocate for null byte */
+#define USER_NAME_SIZE		128
+
+#define MAX_STRING			1024
+#define LINE_ALLOC			4096
+#define QUERY_ALLOC			8192
+
+#define MIGRATOR_API_VERSION	1
+
+#define MESSAGE_WIDTH		"60"
+
+#define OVERWRITE_MESSAGE	"  %-" MESSAGE_WIDTH "." MESSAGE_WIDTH "s\r"
+#define GET_MAJOR_VERSION(v)	((v) / 100)
+
+#define ALL_DUMP_FILE		"pg_upgrade_dump_all.sql"
+/* contains both global db information and CREATE DATABASE commands */
+#define GLOBALS_DUMP_FILE	"pg_upgrade_dump_globals.sql"
+#define DB_DUMP_FILE		"pg_upgrade_dump_db.sql"
+
+#ifndef WIN32
+#define pg_copy_file		copy_file
+#define pg_mv_file			rename
+#define pg_link_file		link
+#define RMDIR_CMD			"rm -rf"
+#define EXEC_EXT			"sh"
+#else
+#define pg_copy_file		CopyFile
+#define pg_mv_file			pgrename
+#define pg_link_file		win32_pghardlink
+#define sleep(x)			Sleep(x * 1000)
+#define RMDIR_CMD			"RMDIR /s/q"
+#define EXEC_EXT			"bat"
+#define EXE_EXT				".exe"
+#endif
+
+#define CLUSTERNAME(cluster)	((cluster) == CLUSTER_OLD ? "old" : "new")
+
+/* OID system catalog preservation added during PG 9.0 development */
+#define TABLE_SPACE_SUBDIRS 201001111
+
+/*
+ * Each relation is represented by a relinfo structure.
+ */
+typedef struct
+{
+	char		nspname[NAMEDATALEN];	/* namespace name */
+	char		relname[NAMEDATALEN];	/* relation name */
+	Oid			reloid;			/* relation oid				 */
+	Oid			relfilenode;	/* relation relfile node	 */
+	Oid			toastrelid;		/* oid of the toast relation */
+	char		tablespace[MAXPGPATH];	/* relations tablespace path */
+} RelInfo;
+
+typedef struct
+{
+	RelInfo    *rels;
+	int			nrels;
+} RelInfoArr;
+
+/*
+ * The following structure represents a relation mapping.
+ */
+typedef struct
+{
+	Oid			old;			/* Relfilenode of the old relation */
+	Oid			new;			/* Relfilenode of the new relation */
+	char		old_file[MAXPGPATH];
+	char		new_file[MAXPGPATH];
+	char		old_nspname[NAMEDATALEN];		/* old name of the namespace */
+	char		old_relname[NAMEDATALEN];		/* old name of the relation */
+	char		new_nspname[NAMEDATALEN];		/* new name of the namespace */
+	char		new_relname[NAMEDATALEN];		/* new name of the relation */
+} FileNameMap;
+
+/*
+ * Structure to store database information
+ */
+typedef struct
+{
+	Oid			db_oid;			/* oid of the database */
+	char		db_name[NAMEDATALEN];	/* database name */
+	char		db_tblspace[MAXPGPATH]; /* database default tablespace path */
+	RelInfoArr	rel_arr;		/* array of all user relinfos */
+} DbInfo;
+
+typedef struct
+{
+	DbInfo	   *dbs;			/* array of db infos */
+	int			ndbs;			/* number of db infos */
+} DbInfoArr;
+
+/*
+ * The following structure is used to hold pg_control information.
+ * Rather than using the backend's control structure we use our own
+ * structure to avoid pg_control version issues between releases.
+ */
+typedef struct
+{
+	uint32		ctrl_ver;
+	uint32		cat_ver;
+	uint32		logid;
+	uint32		nxtlogseg;
+	uint32		chkpnt_tli;
+	uint32		chkpnt_nxtxid;
+	uint32		chkpnt_nxtoid;
+	uint32		align;
+	uint32		blocksz;
+	uint32		largesz;
+	uint32		walsz;
+	uint32		walseg;
+	uint32		ident;
+	uint32		index;
+	uint32		toast;
+	bool		date_is_int;
+	bool		float8_pass_by_value;
+	char	   *lc_collate;
+	char	   *lc_ctype;
+	char	   *encoding;
+} ControlData;
+
+/*
+ * Enumeration to denote link modes
+ */
+typedef enum
+{
+	TRANSFER_MODE_COPY,
+	TRANSFER_MODE_LINK
+} transferMode;
+
+/*
+ * Enumeration to denote pg_log modes
+ */
+typedef enum
+{
+	PG_INFO,
+	PG_REPORT,
+	PG_WARNING,
+	PG_FATAL,
+	PG_DEBUG
+} eLogType;
+
+/*
+ * Enumeration to distinguish between old cluster and new cluster
+ */
+typedef enum
+{
+	NONE = 0,					/* used for no running servers */
+	CLUSTER_OLD,
+	CLUSTER_NEW
+} Cluster;
+
+typedef long pgpid_t;
+
+
+/*
+ * cluster
+ *
+ *	information about each cluster
+ */
+typedef struct
+{
+	ControlData controldata;	/* pg_control information */
+	DbInfoArr	dbarr;			/* dbinfos array */
+	char	   *pgdata;			/* pathname for cluster's $PGDATA directory */
+	char	   *bindir;			/* pathname for cluster's executable directory */
+	unsigned short port;		/* port number where postmaster is waiting */
+	uint32		major_version;	/* PG_VERSION of cluster */
+	char	   *major_version_str;		/* string PG_VERSION of cluster */
+	Oid			pg_database_oid;	/* OID of pg_database relation */
+	char	   *libpath;		/* pathname for cluster's pkglibdir */
+	char	   *tablespace_suffix;		/* directory specification */
+} ClusterInfo;
+
+
+/*
+ * migratorContext
+ *
+ *	We create a migratorContext object to store all of the information
+ *	that we need to migrate a single cluster.
+ */
+typedef struct
+{
+	ClusterInfo old,
+				new;			/* old and new cluster information */
+	const char *progname;		/* complete pathname for this program */
+	char	   *exec_path;		/* full path to my executable */
+	char	   *user;			/* username for clusters */
+	char		cwd[MAXPGPATH]; /* current working directory, used for output */
+	char	  **tablespaces;	/* tablespaces */
+	int			num_tablespaces;
+	char	  **libraries;		/* loadable libraries */
+	int			num_libraries;
+	pgpid_t		postmasterPID;	/* PID of currently running postmaster */
+	Cluster		running_cluster;
+
+	char	   *logfile;		/* name of log file (may be /dev/null) */
+	FILE	   *log_fd;			/* log FILE */
+	FILE	   *debug_fd;		/* debug-level log FILE */
+	bool		check;			/* TRUE -> ask user for permission to make
+								 * changes */
+	bool		verbose;		/* TRUE -> be verbose in messages */
+	bool		debug;			/* TRUE -> log more information */
+	transferMode transfer_mode; /* copy files or link them? */
+} migratorContext;
+
+
+/*
+ * Global variables
+ */
+extern char scandir_file_pattern[];
+
+
+/* check.c */
+
+void		output_check_banner(migratorContext *ctx, bool *live_check);
+void check_old_cluster(migratorContext *ctx, bool live_check,
+				  char **sequence_script_file_name);
+void		check_new_cluster(migratorContext *ctx);
+void		report_clusters_compatible(migratorContext *ctx);
+void issue_warnings(migratorContext *ctx,
+			   char *sequence_script_file_name);
+void output_completion_banner(migratorContext *ctx,
+						 char *deletion_script_file_name);
+void		check_cluster_versions(migratorContext *ctx);
+void		check_cluster_compatibility(migratorContext *ctx, bool live_check);
+void create_script_for_old_cluster_deletion(migratorContext *ctx,
+									   char **deletion_script_file_name);
+
+
+/* controldata.c */
+
+void		get_control_data(migratorContext *ctx, ClusterInfo *cluster, bool live_check);
+void check_control_data(migratorContext *ctx, ControlData *oldctrl,
+				   ControlData *newctrl);
+
+
+/* dump.c */
+
+void		generate_old_dump(migratorContext *ctx);
+void		split_old_dump(migratorContext *ctx);
+
+
+/* exec.c */
+
+int exec_prog(migratorContext *ctx, bool throw_error,
+		  const char *cmd,...);
+void		verify_directories(migratorContext *ctx);
+bool		is_server_running(migratorContext *ctx, const char *datadir);
+void		rename_old_pg_control(migratorContext *ctx);
+
+
+/* file.c */
+
+#ifdef PAGE_CONVERSION
+typedef const char *(*pluginStartup) (uint16 migratorVersion,
+								uint16 *pluginVersion, uint16 newPageVersion,
+								   uint16 oldPageVersion, void **pluginData);
+typedef const char *(*pluginConvertFile) (void *pluginData,
+								   const char *dstName, const char *srcName);
+typedef const char *(*pluginConvertPage) (void *pluginData,
+								   const char *dstPage, const char *srcPage);
+typedef const char *(*pluginShutdown) (void *pluginData);
+
+typedef struct
+{
+	uint16		oldPageVersion; /* Page layout version of the old cluster		*/
+	uint16		newPageVersion; /* Page layout version of the new cluster		*/
+	uint16		pluginVersion;	/* API version of converter plugin */
+	void	   *pluginData;		/* Plugin data (set by plugin) */
+	pluginStartup startup;		/* Pointer to plugin's startup function */
+	pluginConvertFile convertFile;		/* Pointer to plugin's file converter
+										 * function */
+	pluginConvertPage convertPage;		/* Pointer to plugin's page converter
+										 * function */
+	pluginShutdown shutdown;	/* Pointer to plugin's shutdown function */
+} pageCnvCtx;
+
+const char *setupPageConverter(migratorContext *ctx, pageCnvCtx **result);
+#else
+/* dummy */
+typedef void *pageCnvCtx;
+#endif
+
+int			dir_matching_filenames(const struct dirent * scan_ent);
+int pg_scandir(migratorContext *ctx, const char *dirname,
+		   struct dirent *** namelist,
+		   int (*selector) (const struct dirent *));
+const char *copyAndUpdateFile(migratorContext *ctx,
+				  pageCnvCtx *pageConverter, const char *src,
+				  const char *dst, bool force);
+const char *linkAndUpdateFile(migratorContext *ctx,
+				pageCnvCtx *pageConverter, const char *src, const char *dst);
+
+void		check_hard_link(migratorContext *ctx);
+
+/* function.c */
+
+void		install_support_functions(migratorContext *ctx);
+void		uninstall_support_functions(migratorContext *ctx);
+void		get_loadable_libraries(migratorContext *ctx);
+void		check_loadable_libraries(migratorContext *ctx);
+
+/* info.c */
+
+FileNameMap *gen_db_file_maps(migratorContext *ctx, DbInfo *old_db,
+				 DbInfo *new_db, int *nmaps, const char *old_pgdata,
+				 const char *new_pgdata);
+void get_db_and_rel_infos(migratorContext *ctx, DbInfoArr *db_arr,
+					 Cluster whichCluster);
+DbInfo	   *dbarr_lookup_db(DbInfoArr *db_arr, const char *db_name);
+void		dbarr_free(DbInfoArr *db_arr);
+void print_maps(migratorContext *ctx, FileNameMap *maps, int n,
+		   const char *dbName);
+
+/* option.c */
+
+void		parseCommandLine(migratorContext *ctx, int argc, char *argv[]);
+
+/* relfilenode.c */
+
+void		get_pg_database_relfilenode(migratorContext *ctx, Cluster whichCluster);
+const char *transfer_all_new_dbs(migratorContext *ctx, DbInfoArr *olddb_arr,
+				   DbInfoArr *newdb_arr, char *old_pgdata, char *new_pgdata);
+
+
+/* tablespace.c */
+
+void		init_tablespaces(migratorContext *ctx);
+
+
+/* server.c */
+
+PGconn *connectToServer(migratorContext *ctx, const char *db_name,
+				Cluster whichCluster);
+PGresult *executeQueryOrDie(migratorContext *ctx, PGconn *conn,
+				  const char *fmt,...);
+
+void		start_postmaster(migratorContext *ctx, Cluster whichCluster, bool quiet);
+void		stop_postmaster(migratorContext *ctx, bool fast, bool quiet);
+uint32 get_major_server_version(migratorContext *ctx, char **verstr,
+						 Cluster whichCluster);
+void		check_for_libpq_envvars(migratorContext *ctx);
+
+
+/* util.c */
+
+void		exit_nicely(migratorContext *ctx, bool need_cleanup);
+void	   *pg_malloc(migratorContext *ctx, int n);
+void		pg_free(void *p);
+char	   *pg_strdup(migratorContext *ctx, const char *s);
+char	   *quote_identifier(migratorContext *ctx, const char *s);
+int			get_user_info(migratorContext *ctx, char **user_name);
+void		check_ok(migratorContext *ctx);
+void		report_status(migratorContext *ctx, eLogType type, const char *fmt,...);
+void		pg_log(migratorContext *ctx, eLogType type, char *fmt,...);
+void		prep_status(migratorContext *ctx, const char *fmt,...);
+void		check_ok(migratorContext *ctx);
+char	   *pg_strdup(migratorContext *ctx, const char *s);
+void	   *pg_malloc(migratorContext *ctx, int size);
+void		pg_free(void *ptr);
+const char *getErrorText(int errNum);
+
+/* version.c */
+
+void new_9_0_populate_pg_largeobject_metadata(migratorContext *ctx,
+									  bool check_mode, Cluster whichCluster);
+
+/* version_old_8_3.c */
+
+void old_8_3_check_for_name_data_type_usage(migratorContext *ctx,
+									   Cluster whichCluster);
+void old_8_3_check_for_tsquery_usage(migratorContext *ctx,
+								Cluster whichCluster);
+void old_8_3_check_for_isn_and_int8_passing_mismatch(migratorContext *ctx,
+												Cluster whichCluster);
+void old_8_3_rebuild_tsvector_tables(migratorContext *ctx,
+								bool check_mode, Cluster whichCluster);
+void old_8_3_invalidate_hash_gin_indexes(migratorContext *ctx,
+									bool check_mode, Cluster whichCluster);
+void old_8_3_invalidate_bpchar_pattern_ops_indexes(migratorContext *ctx,
+									  bool check_mode, Cluster whichCluster);
+char *old_8_3_create_sequence_script(migratorContext *ctx,
+							   Cluster whichCluster);
diff --git a/contrib/pg_upgrade/relfilenode.c b/contrib/pg_upgrade/relfilenode.c
new file mode 100644
index 0000000000..1ef176a041
--- /dev/null
+++ b/contrib/pg_upgrade/relfilenode.c
@@ -0,0 +1,230 @@
+/*
+ *	relfilenode.c
+ *
+ *	relfilenode functions
+ *
+ *	Copyright (c) 2010, PostgreSQL Global Development Group
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/relfilenode.c,v 1.8 2010/07/06 19:18:55 momjian Exp $
+ */
+
+#include "pg_upgrade.h"
+
+#include "catalog/pg_class.h"
+#include "access/transam.h"
+
+
+static void transfer_single_new_db(migratorContext *ctx, pageCnvCtx *pageConverter,
+					   FileNameMap *maps, int size);
+static void transfer_relfile(migratorContext *ctx, pageCnvCtx *pageConverter,
+				 const char *fromfile, const char *tofile,
+				 const char *oldnspname, const char *oldrelname,
+				 const char *newnspname, const char *newrelname);
+
+/* used by scandir(), must be global */
+char		scandir_file_pattern[MAXPGPATH];
+
+/*
+ * transfer_all_new_dbs()
+ *
+ * Responsible for upgrading all database. invokes routines to generate mappings and then
+ * physically link the databases.
+ */
+const char *
+transfer_all_new_dbs(migratorContext *ctx, DbInfoArr *olddb_arr,
+					 DbInfoArr *newdb_arr, char *old_pgdata, char *new_pgdata)
+{
+	int			dbnum;
+	const char *msg = NULL;
+
+	prep_status(ctx, "Restoring user relation files\n");
+
+	for (dbnum = 0; dbnum < newdb_arr->ndbs; dbnum++)
+	{
+		DbInfo	   *new_db = &newdb_arr->dbs[dbnum];
+		DbInfo	   *old_db = dbarr_lookup_db(olddb_arr, new_db->db_name);
+		FileNameMap *mappings;
+		int			n_maps;
+		pageCnvCtx *pageConverter = NULL;
+
+		n_maps = 0;
+		mappings = gen_db_file_maps(ctx, old_db, new_db, &n_maps, old_pgdata,
+									new_pgdata);
+
+		if (n_maps)
+		{
+			print_maps(ctx, mappings, n_maps, new_db->db_name);
+
+#ifdef PAGE_CONVERSION
+			msg = setupPageConverter(ctx, &pageConverter);
+#endif
+			transfer_single_new_db(ctx, pageConverter, mappings, n_maps);
+
+			pg_free(mappings);
+		}
+	}
+
+	prep_status(ctx, "");		/* in case nothing printed */
+	check_ok(ctx);
+
+	return msg;
+}
+
+
+/*
+ * get_pg_database_relfilenode()
+ *
+ *	Retrieves the relfilenode for a few system-catalog tables.	We need these
+ *	relfilenodes later in the upgrade process.
+ */
+void
+get_pg_database_relfilenode(migratorContext *ctx, Cluster whichCluster)
+{
+	PGconn	   *conn = connectToServer(ctx, "template1", whichCluster);
+	PGresult   *res;
+	int			i_relfile;
+
+	res = executeQueryOrDie(ctx, conn,
+							"SELECT c.relname, c.relfilenode "
+							"FROM 	pg_catalog.pg_class c, "
+							"		pg_catalog.pg_namespace n "
+							"WHERE 	c.relnamespace = n.oid AND "
+							"		n.nspname = 'pg_catalog' AND "
+							"		c.relname = 'pg_database' "
+							"ORDER BY c.relname");
+
+	i_relfile = PQfnumber(res, "relfilenode");
+	if (whichCluster == CLUSTER_OLD)
+		ctx->old.pg_database_oid = atol(PQgetvalue(res, 0, i_relfile));
+	else
+		ctx->new.pg_database_oid = atol(PQgetvalue(res, 0, i_relfile));
+
+	PQclear(res);
+	PQfinish(conn);
+}
+
+
+/*
+ * transfer_single_new_db()
+ *
+ * create links for mappings stored in "maps" array.
+ */
+static void
+transfer_single_new_db(migratorContext *ctx, pageCnvCtx *pageConverter,
+					   FileNameMap *maps, int size)
+{
+	int			mapnum;
+
+	for (mapnum = 0; mapnum < size; mapnum++)
+	{
+		char		old_file[MAXPGPATH];
+		char		new_file[MAXPGPATH];
+		struct dirent **namelist = NULL;
+		int			numFiles;
+
+		/* Copying files might take some time, so give feedback. */
+
+		snprintf(old_file, sizeof(old_file), "%s/%u", maps[mapnum].old_file, maps[mapnum].old);
+		snprintf(new_file, sizeof(new_file), "%s/%u", maps[mapnum].new_file, maps[mapnum].new);
+		pg_log(ctx, PG_REPORT, OVERWRITE_MESSAGE, old_file);
+
+		/*
+		 * Copy/link the relation file to the new cluster
+		 */
+		unlink(new_file);
+		transfer_relfile(ctx, pageConverter, old_file, new_file,
+						 maps[mapnum].old_nspname, maps[mapnum].old_relname,
+						 maps[mapnum].new_nspname, maps[mapnum].new_relname);
+
+		/* fsm/vm files added in PG 8.4 */
+		if (GET_MAJOR_VERSION(ctx->old.major_version) >= 804)
+		{
+			/*
+			 * Now copy/link any fsm and vm files, if they exist
+			 */
+			snprintf(scandir_file_pattern, sizeof(scandir_file_pattern), "%u_", maps[mapnum].old);
+			numFiles = pg_scandir(ctx, maps[mapnum].old_file, &namelist, dir_matching_filenames);
+
+			while (numFiles--)
+			{
+				snprintf(old_file, sizeof(old_file), "%s/%s", maps[mapnum].old_file,
+						 namelist[numFiles]->d_name);
+				snprintf(new_file, sizeof(new_file), "%s/%u%s", maps[mapnum].new_file,
+				  maps[mapnum].new, strchr(namelist[numFiles]->d_name, '_'));
+
+				unlink(new_file);
+				transfer_relfile(ctx, pageConverter, old_file, new_file,
+						  maps[mapnum].old_nspname, maps[mapnum].old_relname,
+						 maps[mapnum].new_nspname, maps[mapnum].new_relname);
+
+				pg_free(namelist[numFiles]);
+			}
+
+			pg_free(namelist);
+		}
+
+		/*
+		 * Now copy/link any related segments as well. Remember, PG breaks
+		 * large files into 1GB segments, the first segment has no extension,
+		 * subsequent segments are named relfilenode.1, relfilenode.2,
+		 * relfilenode.3, ...  'fsm' and 'vm' files use underscores so are not
+		 * copied.
+		 */
+		snprintf(scandir_file_pattern, sizeof(scandir_file_pattern), "%u.", maps[mapnum].old);
+		numFiles = pg_scandir(ctx, maps[mapnum].old_file, &namelist, dir_matching_filenames);
+
+		while (numFiles--)
+		{
+			snprintf(old_file, sizeof(old_file), "%s/%s", maps[mapnum].old_file,
+					 namelist[numFiles]->d_name);
+			snprintf(new_file, sizeof(new_file), "%s/%u%s", maps[mapnum].new_file,
+				  maps[mapnum].new, strchr(namelist[numFiles]->d_name, '.'));
+
+			unlink(new_file);
+			transfer_relfile(ctx, pageConverter, old_file, new_file,
+						  maps[mapnum].old_nspname, maps[mapnum].old_relname,
+						 maps[mapnum].new_nspname, maps[mapnum].new_relname);
+
+			pg_free(namelist[numFiles]);
+		}
+
+		pg_free(namelist);
+	}
+}
+
+
+/*
+ * transfer_relfile()
+ *
+ * Copy or link file from old cluster to new one.
+ */
+static void
+transfer_relfile(migratorContext *ctx, pageCnvCtx *pageConverter, const char *oldfile,
+		 const char *newfile, const char *oldnspname, const char *oldrelname,
+				 const char *newnspname, const char *newrelname)
+{
+	const char *msg;
+
+	if ((ctx->transfer_mode == TRANSFER_MODE_LINK) && (pageConverter != NULL))
+		pg_log(ctx, PG_FATAL, "this migration requires page-by-page conversion, "
+			   "you must use copy-mode instead of link-mode\n");
+
+	if (ctx->transfer_mode == TRANSFER_MODE_COPY)
+	{
+		pg_log(ctx, PG_INFO, "copying %s to %s\n", oldfile, newfile);
+
+		if ((msg = copyAndUpdateFile(ctx, pageConverter, oldfile, newfile, true)) != NULL)
+			pg_log(ctx, PG_FATAL, "error while copying %s.%s(%s) to %s.%s(%s): %s\n",
+				   oldnspname, oldrelname, oldfile, newnspname, newrelname, newfile, msg);
+	}
+	else
+	{
+		pg_log(ctx, PG_INFO, "linking %s to %s\n", newfile, oldfile);
+
+		if ((msg = linkAndUpdateFile(ctx, pageConverter, oldfile, newfile)) != NULL)
+			pg_log(ctx, PG_FATAL,
+			   "error while creating link from %s.%s(%s) to %s.%s(%s): %s\n",
+				   oldnspname, oldrelname, oldfile, newnspname, newrelname,
+				   newfile, msg);
+	}
+	return;
+}
diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c
new file mode 100644
index 0000000000..a9243ab75a
--- /dev/null
+++ b/contrib/pg_upgrade/server.c
@@ -0,0 +1,339 @@
+/*
+ *	server.c
+ *
+ *	database server functions
+ *
+ *	Copyright (c) 2010, PostgreSQL Global Development Group
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/server.c,v 1.8 2010/07/06 19:18:55 momjian Exp $
+ */
+
+#include "pg_upgrade.h"
+
+#define POSTMASTER_UPTIME 20
+
+#define STARTUP_WARNING_TRIES 2
+
+
+static pgpid_t get_postmaster_pid(migratorContext *ctx, const char *datadir);
+static bool test_server_conn(migratorContext *ctx, int timeout,
+				 Cluster whichCluster);
+
+
+/*
+ * connectToServer()
+ *
+ *	Connects to the desired database on the designated server.
+ *	If the connection attempt fails, this function logs an error
+ *	message and calls exit_nicely() to kill the program.
+ */
+PGconn *
+connectToServer(migratorContext *ctx, const char *db_name,
+				Cluster whichCluster)
+{
+	char		connectString[MAXPGPATH];
+	unsigned short port = (whichCluster == CLUSTER_OLD) ?
+	ctx->old.port : ctx->new.port;
+	PGconn	   *conn;
+
+	snprintf(connectString, sizeof(connectString),
+			 "dbname = '%s' user = '%s' port = %d", db_name, ctx->user, port);
+
+	conn = PQconnectdb(connectString);
+
+	if (conn == NULL || PQstatus(conn) != CONNECTION_OK)
+	{
+		pg_log(ctx, PG_REPORT, "Connection to database failed: %s\n",
+			   PQerrorMessage(conn));
+
+		if (conn)
+			PQfinish(conn);
+
+		exit_nicely(ctx, true);
+	}
+
+	return conn;
+}
+
+
+/*
+ * executeQueryOrDie()
+ *
+ *	Formats a query string from the given arguments and executes the
+ *	resulting query.  If the query fails, this function logs an error
+ *	message and calls exit_nicely() to kill the program.
+ */
+PGresult *
+executeQueryOrDie(migratorContext *ctx, PGconn *conn, const char *fmt,...)
+{
+	static char command[8192];
+	va_list		args;
+	PGresult   *result;
+	ExecStatusType status;
+
+	va_start(args, fmt);
+	vsnprintf(command, sizeof(command), fmt, args);
+	va_end(args);
+
+	pg_log(ctx, PG_DEBUG, "executing: %s\n", command);
+	result = PQexec(conn, command);
+	status = PQresultStatus(result);
+
+	if ((status != PGRES_TUPLES_OK) && (status != PGRES_COMMAND_OK))
+	{
+		pg_log(ctx, PG_REPORT, "DB command failed\n%s\n%s\n", command,
+			   PQerrorMessage(conn));
+		PQclear(result);
+		PQfinish(conn);
+		exit_nicely(ctx, true);
+		return NULL;			/* Never get here, but keeps compiler happy */
+	}
+	else
+		return result;
+}
+
+
+/*
+ * get_postmaster_pid()
+ *
+ * Returns the pid of the postmaster running on datadir. pid is retrieved
+ * from the postmaster.pid file
+ */
+static pgpid_t
+get_postmaster_pid(migratorContext *ctx, const char *datadir)
+{
+	FILE	   *pidf;
+	long		pid;
+	char		pid_file[MAXPGPATH];
+
+	snprintf(pid_file, sizeof(pid_file), "%s/postmaster.pid", datadir);
+	pidf = fopen(pid_file, "r");
+
+	if (pidf == NULL)
+		return (pgpid_t) 0;
+
+	if (fscanf(pidf, "%ld", &pid) != 1)
+	{
+		fclose(pidf);
+		pg_log(ctx, PG_FATAL, "%s: invalid data in PID file \"%s\"\n",
+			   ctx->progname, pid_file);
+	}
+
+	fclose(pidf);
+
+	return (pgpid_t) pid;
+}
+
+
+/*
+ * get_major_server_version()
+ *
+ * gets the version (in unsigned int form) for the given "datadir". Assumes
+ * that datadir is an absolute path to a valid pgdata directory. The version
+ * is retrieved by reading the PG_VERSION file.
+ */
+uint32
+get_major_server_version(migratorContext *ctx, char **verstr, Cluster whichCluster)
+{
+	const char *datadir = whichCluster == CLUSTER_OLD ?
+	ctx->old.pgdata : ctx->new.pgdata;
+	FILE	   *version_fd;
+	char		ver_file[MAXPGPATH];
+	int			integer_version = 0;
+	int			fractional_version = 0;
+
+	*verstr = pg_malloc(ctx, 64);
+
+	snprintf(ver_file, sizeof(ver_file), "%s/PG_VERSION", datadir);
+	if ((version_fd = fopen(ver_file, "r")) == NULL)
+		return 0;
+
+	if (fscanf(version_fd, "%63s", *verstr) == 0 ||
+		sscanf(*verstr, "%d.%d", &integer_version, &fractional_version) != 2)
+	{
+		pg_log(ctx, PG_FATAL, "could not get version from %s\n", datadir);
+		fclose(version_fd);
+		return 0;
+	}
+
+	return (100 * integer_version + fractional_version) * 100;
+}
+
+
+void
+start_postmaster(migratorContext *ctx, Cluster whichCluster, bool quiet)
+{
+	char		cmd[MAXPGPATH];
+	const char *bindir;
+	const char *datadir;
+	unsigned short port;
+
+	if (whichCluster == CLUSTER_OLD)
+	{
+		bindir = ctx->old.bindir;
+		datadir = ctx->old.pgdata;
+		port = ctx->old.port;
+	}
+	else
+	{
+		bindir = ctx->new.bindir;
+		datadir = ctx->new.pgdata;
+		port = ctx->new.port;
+	}
+
+	/*
+	 * On Win32, we can't send both server output and pg_ctl output to the
+	 * same file because we get the error: "The process cannot access the file
+	 * because it is being used by another process." so we have to send pg_ctl
+	 * output to 'nul'.
+	 */
+	snprintf(cmd, sizeof(cmd),
+			 SYSTEMQUOTE "\"%s/pg_ctl\" -l \"%s\" -D \"%s\" "
+			 "-o \"-p %d -c autovacuum=off "
+			 "-c autovacuum_freeze_max_age=2000000000\" "
+			 "start >> \"%s\" 2>&1" SYSTEMQUOTE,
+			 bindir, ctx->logfile, datadir, port,
+#ifndef WIN32
+			 ctx->logfile);
+#else
+			 DEVNULL);
+#endif
+	exec_prog(ctx, true, "%s", cmd);
+
+	/* wait for the server to start properly */
+
+	if (test_server_conn(ctx, POSTMASTER_UPTIME, whichCluster) == false)
+		pg_log(ctx, PG_FATAL, " Unable to start %s postmaster with the command: %s\nPerhaps pg_hba.conf was not set to \"trust\".",
+			   CLUSTERNAME(whichCluster), cmd);
+
+	if ((ctx->postmasterPID = get_postmaster_pid(ctx, datadir)) == 0)
+		pg_log(ctx, PG_FATAL, " Unable to get postmaster pid\n");
+	ctx->running_cluster = whichCluster;
+}
+
+
+void
+stop_postmaster(migratorContext *ctx, bool fast, bool quiet)
+{
+	char		cmd[MAXPGPATH];
+	const char *bindir;
+	const char *datadir;
+
+	if (ctx->running_cluster == CLUSTER_OLD)
+	{
+		bindir = ctx->old.bindir;
+		datadir = ctx->old.pgdata;
+	}
+	else if (ctx->running_cluster == CLUSTER_NEW)
+	{
+		bindir = ctx->new.bindir;
+		datadir = ctx->new.pgdata;
+	}
+	else
+		return;					/* no cluster running */
+
+	/* See comment in start_postmaster() about why win32 output is ignored. */
+	snprintf(cmd, sizeof(cmd),
+			 SYSTEMQUOTE "\"%s/pg_ctl\" -l \"%s\" -D \"%s\" %s stop >> "
+			 "\"%s\" 2>&1" SYSTEMQUOTE,
+			 bindir, ctx->logfile, datadir, fast ? "-m fast" : "",
+#ifndef WIN32
+			 ctx->logfile);
+#else
+			 DEVNULL);
+#endif
+	exec_prog(ctx, fast ? false : true, "%s", cmd);
+
+	ctx->postmasterPID = 0;
+	ctx->running_cluster = NONE;
+}
+
+
+/*
+ * test_server_conn()
+ *
+ * tests whether postmaster is running or not by trying to connect
+ * to it. If connection is unsuccessfull we do a sleep of 1 sec and then
+ * try the connection again. This process continues "timeout" times.
+ *
+ * Returns true if the connection attempt was successfull, false otherwise.
+ */
+static bool
+test_server_conn(migratorContext *ctx, int timeout, Cluster whichCluster)
+{
+	PGconn	   *conn = NULL;
+	char		con_opts[MAX_STRING];
+	int			tries;
+	unsigned short port = (whichCluster == CLUSTER_OLD) ?
+	ctx->old.port : ctx->new.port;
+	bool		ret = false;
+
+	snprintf(con_opts, sizeof(con_opts),
+			 "dbname = 'template1' user = '%s' port = %d ", ctx->user, port);
+
+	for (tries = 0; tries < timeout; tries++)
+	{
+		sleep(1);
+		if ((conn = PQconnectdb(con_opts)) != NULL &&
+			PQstatus(conn) == CONNECTION_OK)
+		{
+			PQfinish(conn);
+			ret = true;
+			break;
+		}
+
+		if (tries == STARTUP_WARNING_TRIES)
+			prep_status(ctx, "Trying to start %s server ",
+						CLUSTERNAME(whichCluster));
+		else if (tries > STARTUP_WARNING_TRIES)
+			pg_log(ctx, PG_REPORT, ".");
+	}
+
+	if (tries > STARTUP_WARNING_TRIES)
+		check_ok(ctx);
+
+	return ret;
+}
+
+
+/*
+ * check_for_libpq_envvars()
+ *
+ * tests whether any libpq environment variables are set.
+ * Since pg_upgrade connects to both the old and the new server,
+ * it is potentially dangerous to have any of these set.
+ *
+ * If any are found, will log them and cancel.
+ */
+void
+check_for_libpq_envvars(migratorContext *ctx)
+{
+	PQconninfoOption *option;
+	PQconninfoOption *start;
+	bool		found = false;
+
+	/* Get valid libpq env vars from the PQconndefaults function */
+
+	start = option = PQconndefaults();
+
+	while (option->keyword != NULL)
+	{
+		const char *value;
+
+		if (option->envvar && (value = getenv(option->envvar)) && strlen(value) > 0)
+		{
+			found = true;
+
+			pg_log(ctx, PG_WARNING,
+				   "libpq env var %-20s is currently set to: %s\n", option->envvar, value);
+		}
+
+		option++;
+	}
+
+	/* Free the memory that libpq allocated on our behalf */
+	PQconninfoFree(start);
+
+	if (found)
+		pg_log(ctx, PG_FATAL,
+			   "libpq env vars have been found and listed above, please unset them for pg_upgrade\n");
+}
diff --git a/contrib/pg_upgrade/tablespace.c b/contrib/pg_upgrade/tablespace.c
new file mode 100644
index 0000000000..11caaa3e89
--- /dev/null
+++ b/contrib/pg_upgrade/tablespace.c
@@ -0,0 +1,90 @@
+/*
+ *	tablespace.c
+ *
+ *	tablespace functions
+ *
+ *	Copyright (c) 2010, PostgreSQL Global Development Group
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/tablespace.c,v 1.6 2010/07/06 19:18:55 momjian Exp $
+ */
+
+#include "pg_upgrade.h"
+
+static void get_tablespace_paths(migratorContext *ctx);
+static void set_tablespace_directory_suffix(migratorContext *ctx,
+								Cluster whichCluster);
+
+
+void
+init_tablespaces(migratorContext *ctx)
+{
+	get_tablespace_paths(ctx);
+
+	set_tablespace_directory_suffix(ctx, CLUSTER_OLD);
+	set_tablespace_directory_suffix(ctx, CLUSTER_NEW);
+
+	if (ctx->num_tablespaces > 0 &&
+		strcmp(ctx->old.tablespace_suffix, ctx->new.tablespace_suffix) == 0)
+		pg_log(ctx, PG_FATAL,
+			   "Cannot migrate to/from the same system catalog version when\n"
+			   "using tablespaces.\n");
+}
+
+
+/*
+ * get_tablespace_paths()
+ *
+ * Scans pg_tablespace and returns a malloc'ed array of all tablespace
+ * paths. Its the caller's responsibility to free the array.
+ */
+static void
+get_tablespace_paths(migratorContext *ctx)
+{
+	PGconn	   *conn = connectToServer(ctx, "template1", CLUSTER_OLD);
+	PGresult   *res;
+	int			tblnum;
+	int			i_spclocation;
+
+	res = executeQueryOrDie(ctx, conn,
+							"SELECT	spclocation "
+							"FROM	pg_catalog.pg_tablespace "
+							"WHERE	spcname != 'pg_default' AND "
+							"		spcname != 'pg_global'");
+
+	if ((ctx->num_tablespaces = PQntuples(res)) != 0)
+		ctx->tablespaces = (char **) pg_malloc(ctx,
+									  ctx->num_tablespaces * sizeof(char *));
+	else
+		ctx->tablespaces = NULL;
+
+	i_spclocation = PQfnumber(res, "spclocation");
+
+	for (tblnum = 0; tblnum < ctx->num_tablespaces; tblnum++)
+		ctx->tablespaces[tblnum] = pg_strdup(ctx,
+									 PQgetvalue(res, tblnum, i_spclocation));
+
+	PQclear(res);
+
+	PQfinish(conn);
+
+	return;
+}
+
+
+static void
+set_tablespace_directory_suffix(migratorContext *ctx, Cluster whichCluster)
+{
+	ClusterInfo *cluster = (whichCluster == CLUSTER_OLD) ? &ctx->old : &ctx->new;
+
+	if (GET_MAJOR_VERSION(cluster->major_version) <= 804)
+		cluster->tablespace_suffix = pg_strdup(ctx, "");
+	else
+	{
+		/* This cluster has a version-specific subdirectory */
+		cluster->tablespace_suffix = pg_malloc(ctx, 4 + strlen(cluster->major_version_str) +
+											   10 /* OIDCHARS */ + 1);
+
+		/* The leading slash is needed to start a new directory. */
+		sprintf(cluster->tablespace_suffix, "/PG_%s_%d", cluster->major_version_str,
+				cluster->controldata.cat_ver);
+	}
+}
diff --git a/contrib/pg_upgrade/util.c b/contrib/pg_upgrade/util.c
new file mode 100644
index 0000000000..24fc08ef70
--- /dev/null
+++ b/contrib/pg_upgrade/util.c
@@ -0,0 +1,261 @@
+/*
+ *	util.c
+ *
+ *	utility functions
+ *
+ *	Copyright (c) 2010, PostgreSQL Global Development Group
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/util.c,v 1.5 2010/07/06 19:18:55 momjian Exp $
+ */
+
+#include "pg_upgrade.h"
+
+#include <signal.h>
+
+
+/*
+ * report_status()
+ *
+ *	Displays the result of an operation (ok, failed, error message,...)
+ */
+void
+report_status(migratorContext *ctx, eLogType type, const char *fmt,...)
+{
+	va_list		args;
+	char		message[MAX_STRING];
+
+	va_start(args, fmt);
+	vsnprintf(message, sizeof(message), fmt, args);
+	va_end(args);
+
+	pg_log(ctx, type, "%s\n", message);
+}
+
+
+/*
+ * prep_status(&ctx, )
+ *
+ *	Displays a message that describes an operation we are about to begin.
+ *	We pad the message out to MESSAGE_WIDTH characters so that all of the "ok" and
+ *	"failed" indicators line up nicely.
+ *
+ *	A typical sequence would look like this:
+ *		prep_status(&ctx,  "about to flarb the next %d files", fileCount );
+ *
+ *		if(( message = flarbFiles(fileCount)) == NULL)
+ *		  report_status(ctx, PG_REPORT, "ok" );
+ *		else
+ *		  pg_log(ctx, PG_FATAL, "failed - %s", message );
+ */
+void
+prep_status(migratorContext *ctx, const char *fmt,...)
+{
+	va_list		args;
+	char		message[MAX_STRING];
+
+	va_start(args, fmt);
+	vsnprintf(message, sizeof(message), fmt, args);
+	va_end(args);
+
+	if (strlen(message) > 0 && message[strlen(message) - 1] == '\n')
+		pg_log(ctx, PG_REPORT, "%s", message);
+	else
+		pg_log(ctx, PG_REPORT, "%-" MESSAGE_WIDTH "s", message);
+}
+
+
+void
+pg_log(migratorContext *ctx, eLogType type, char *fmt,...)
+{
+	va_list		args;
+	char		message[MAX_STRING];
+
+	va_start(args, fmt);
+	vsnprintf(message, sizeof(message), fmt, args);
+	va_end(args);
+
+	if (ctx->log_fd != NULL)
+	{
+		fwrite(message, strlen(message), 1, ctx->log_fd);
+		/* if we are using OVERWRITE_MESSAGE, add newline */
+		if (strchr(message, '\r') != NULL)
+			fwrite("\n", 1, 1, ctx->log_fd);
+		fflush(ctx->log_fd);
+	}
+
+	switch (type)
+	{
+		case PG_INFO:
+			if (ctx->verbose)
+				printf("%s", _(message));
+			break;
+
+		case PG_REPORT:
+		case PG_WARNING:
+			printf("%s", _(message));
+			break;
+
+		case PG_FATAL:
+			printf("%s", "\n");
+			printf("%s", _(message));
+			exit_nicely(ctx, true);
+			break;
+
+		case PG_DEBUG:
+			if (ctx->debug)
+				fprintf(ctx->debug_fd, "%s\n", _(message));
+			break;
+
+		default:
+			break;
+	}
+	fflush(stdout);
+}
+
+
+void
+check_ok(migratorContext *ctx)
+{
+	/* all seems well */
+	report_status(ctx, PG_REPORT, "ok");
+	fflush(stdout);
+}
+
+
+/*
+ * quote_identifier()
+ *		Properly double-quote a SQL identifier.
+ *
+ * The result should be pg_free'd, but most callers don't bother because
+ * memory leakage is not a big deal in this program.
+ */
+char *
+quote_identifier(migratorContext *ctx, const char *s)
+{
+	char	   *result = pg_malloc(ctx, strlen(s) * 2 + 3);
+	char	   *r = result;
+
+	*r++ = '"';
+	while (*s)
+	{
+		if (*s == '"')
+			*r++ = *s;
+		*r++ = *s;
+		s++;
+	}
+	*r++ = '"';
+	*r++ = '\0';
+
+	return result;
+}
+
+
+/*
+ * get_user_info()
+ * (copied from initdb.c) find the current user
+ */
+int
+get_user_info(migratorContext *ctx, char **user_name)
+{
+	int			user_id;
+
+#ifndef WIN32
+	struct passwd *pw = getpwuid(geteuid());
+
+	user_id = geteuid();
+#else							/* the windows code */
+	struct passwd_win32
+	{
+		int			pw_uid;
+		char		pw_name[128];
+	}			pass_win32;
+	struct passwd_win32 *pw = &pass_win32;
+	DWORD		pwname_size = sizeof(pass_win32.pw_name) - 1;
+
+	GetUserName(pw->pw_name, &pwname_size);
+
+	user_id = 1;
+#endif
+
+	*user_name = pg_strdup(ctx, pw->pw_name);
+
+	return user_id;
+}
+
+
+void
+exit_nicely(migratorContext *ctx, bool need_cleanup)
+{
+	stop_postmaster(ctx, true, true);
+
+	pg_free(ctx->logfile);
+
+	if (ctx->log_fd)
+		fclose(ctx->log_fd);
+
+	if (ctx->debug_fd)
+		fclose(ctx->debug_fd);
+
+	/* terminate any running instance of postmaster */
+	if (ctx->postmasterPID != 0)
+		kill(ctx->postmasterPID, SIGTERM);
+
+	if (need_cleanup)
+	{
+		/*
+		 * FIXME must delete intermediate files
+		 */
+		exit(1);
+	}
+	else
+		exit(0);
+}
+
+
+void *
+pg_malloc(migratorContext *ctx, int n)
+{
+	void	   *p = malloc(n);
+
+	if (p == NULL)
+		pg_log(ctx, PG_FATAL, "%s: out of memory\n", ctx->progname);
+
+	return p;
+}
+
+
+void
+pg_free(void *p)
+{
+	if (p != NULL)
+		free(p);
+}
+
+
+char *
+pg_strdup(migratorContext *ctx, const char *s)
+{
+	char	   *result = strdup(s);
+
+	if (result == NULL)
+		pg_log(ctx, PG_FATAL, "%s: out of memory\n", ctx->progname);
+
+	return result;
+}
+
+
+/*
+ * getErrorText()
+ *
+ *	Returns the text of the error message for the given error number
+ *
+ *	This feature is factored into a separate function because it is
+ *	system-dependent.
+ */
+const char *
+getErrorText(int errNum)
+{
+#ifdef WIN32
+	_dosmaperr(GetLastError());
+#endif
+	return strdup(strerror(errNum));
+}
diff --git a/contrib/pg_upgrade/version.c b/contrib/pg_upgrade/version.c
new file mode 100644
index 0000000000..59e61767fc
--- /dev/null
+++ b/contrib/pg_upgrade/version.c
@@ -0,0 +1,93 @@
+/*
+ *	version.c
+ *
+ *	Postgres-version-specific routines
+ *
+ *	Copyright (c) 2010, PostgreSQL Global Development Group
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/version.c,v 1.5 2010/07/03 16:33:14 momjian Exp $
+ */
+
+#include "pg_upgrade.h"
+
+#include "access/transam.h"
+
+
+/*
+ * new_9_0_populate_pg_largeobject_metadata()
+ *	new >= 9.0, old <= 8.4
+ *	9.0 has a new pg_largeobject permission table
+ */
+void
+new_9_0_populate_pg_largeobject_metadata(migratorContext *ctx, bool check_mode,
+										 Cluster whichCluster)
+{
+	ClusterInfo *active_cluster = (whichCluster == CLUSTER_OLD) ?
+	&ctx->old : &ctx->new;
+	int			dbnum;
+	FILE	   *script = NULL;
+	bool		found = false;
+	char		output_path[MAXPGPATH];
+
+	prep_status(ctx, "Checking for large objects");
+
+	snprintf(output_path, sizeof(output_path), "%s/pg_largeobject.sql",
+			 ctx->cwd);
+
+	for (dbnum = 0; dbnum < active_cluster->dbarr.ndbs; dbnum++)
+	{
+		PGresult   *res;
+		int			i_count;
+		DbInfo	   *active_db = &active_cluster->dbarr.dbs[dbnum];
+		PGconn	   *conn = connectToServer(ctx, active_db->db_name, whichCluster);
+
+		/* find if there are any large objects */
+		res = executeQueryOrDie(ctx, conn,
+								"SELECT count(*) "
+								"FROM	pg_catalog.pg_largeobject ");
+
+		i_count = PQfnumber(res, "count");
+		if (atoi(PQgetvalue(res, 0, i_count)) != 0)
+		{
+			found = true;
+			if (!check_mode)
+			{
+				if (script == NULL && (script = fopen(output_path, "w")) == NULL)
+					pg_log(ctx, PG_FATAL, "Could not create necessary file:  %s\n", output_path);
+				fprintf(script, "\\connect %s\n",
+						quote_identifier(ctx, active_db->db_name));
+				fprintf(script,
+						"SELECT pg_catalog.lo_create(t.loid)\n"
+						"FROM (SELECT DISTINCT loid FROM pg_catalog.pg_largeobject) AS t;\n");
+			}
+		}
+
+		PQclear(res);
+		PQfinish(conn);
+	}
+
+	if (found)
+	{
+		if (!check_mode)
+			fclose(script);
+		report_status(ctx, PG_WARNING, "warning");
+		if (check_mode)
+			pg_log(ctx, PG_WARNING, "\n"
+				   "| Your installation contains large objects.\n"
+				   "| The new database has an additional large object\n"
+				   "| permission table.  After migration, you will be\n"
+				   "| given a command to populate the pg_largeobject\n"
+				   "| permission table with default permissions.\n\n");
+		else
+			pg_log(ctx, PG_WARNING, "\n"
+				   "| Your installation contains large objects.\n"
+				   "| The new database has an additional large object\n"
+				   "| permission table so default permissions must be\n"
+				   "| defined for all large objects.  The file:\n"
+				   "| \t%s\n"
+				   "| when executed by psql by the database super-user\n"
+				   "| will define the default permissions.\n\n",
+				   output_path);
+	}
+	else
+		check_ok(ctx);
+}
diff --git a/contrib/pg_upgrade/version_old_8_3.c b/contrib/pg_upgrade/version_old_8_3.c
new file mode 100644
index 0000000000..824c968054
--- /dev/null
+++ b/contrib/pg_upgrade/version_old_8_3.c
@@ -0,0 +1,793 @@
+/*
+ *	version.c
+ *
+ *	Postgres-version-specific routines
+ *
+ *	Copyright (c) 2010, PostgreSQL Global Development Group
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/version_old_8_3.c,v 1.6 2010/07/03 16:33:14 momjian Exp $
+ */
+
+#include "pg_upgrade.h"
+
+#include "access/transam.h"
+
+
+/*
+ * old_8_3_check_for_name_data_type_usage()
+ *	8.3 -> 8.4
+ *	Alignment for the 'name' data type changed to 'char' in 8.4;
+ *	checks tables and indexes.
+ */
+void
+old_8_3_check_for_name_data_type_usage(migratorContext *ctx, Cluster whichCluster)
+{
+	ClusterInfo *active_cluster = (whichCluster == CLUSTER_OLD) ?
+	&ctx->old : &ctx->new;
+	int			dbnum;
+	FILE	   *script = NULL;
+	bool		found = false;
+	char		output_path[MAXPGPATH];
+
+	prep_status(ctx, "Checking for invalid 'name' user columns");
+
+	snprintf(output_path, sizeof(output_path), "%s/tables_using_name.txt",
+			 ctx->cwd);
+
+	for (dbnum = 0; dbnum < active_cluster->dbarr.ndbs; dbnum++)
+	{
+		PGresult   *res;
+		bool		db_used = false;
+		int			ntups;
+		int			rowno;
+		int			i_nspname,
+					i_relname,
+					i_attname;
+		DbInfo	   *active_db = &active_cluster->dbarr.dbs[dbnum];
+		PGconn	   *conn = connectToServer(ctx, active_db->db_name, whichCluster);
+
+		/*
+		 * With a smaller alignment in 8.4, 'name' cannot be used in a
+		 * non-pg_catalog table, except as the first column. (We could tighten
+		 * that condition with enough analysis, but it seems not worth the
+		 * trouble.)
+		 */
+		res = executeQueryOrDie(ctx, conn,
+								"SELECT n.nspname, c.relname, a.attname "
+								"FROM	pg_catalog.pg_class c, "
+								"		pg_catalog.pg_namespace n, "
+								"		pg_catalog.pg_attribute a "
+								"WHERE	c.oid = a.attrelid AND "
+								"		a.attnum > 1 AND "
+								"		NOT a.attisdropped AND "
+								"		a.atttypid = 'pg_catalog.name'::pg_catalog.regtype AND "
+								"		c.relnamespace = n.oid AND "
+							  "		n.nspname != 'pg_catalog' AND "
+						 "		n.nspname != 'information_schema'");
+
+		ntups = PQntuples(res);
+		i_nspname = PQfnumber(res, "nspname");
+		i_relname = PQfnumber(res, "relname");
+		i_attname = PQfnumber(res, "attname");
+		for (rowno = 0; rowno < ntups; rowno++)
+		{
+			found = true;
+			if (script == NULL && (script = fopen(output_path, "w")) == NULL)
+				pg_log(ctx, PG_FATAL, "Could not create necessary file:  %s\n", output_path);
+			if (!db_used)
+			{
+				fprintf(script, "Database:  %s\n", active_db->db_name);
+				db_used = true;
+			}
+			fprintf(script, "  %s.%s.%s\n",
+					PQgetvalue(res, rowno, i_nspname),
+					PQgetvalue(res, rowno, i_relname),
+					PQgetvalue(res, rowno, i_attname));
+		}
+
+		PQclear(res);
+
+		PQfinish(conn);
+	}
+
+	if (found)
+	{
+		fclose(script);
+		pg_log(ctx, PG_REPORT, "fatal\n");
+		pg_log(ctx, PG_FATAL,
+			   "| Your installation uses the \"name\" data type in\n"
+			   "| user tables.  This data type changed its internal\n"
+			   "| alignment between your old and new clusters so this\n"
+			   "| cluster cannot currently be upgraded.  You can\n"
+			   "| remove the problem tables and restart the migration.\n"
+			   "| A list of the problem columns is in the file:\n"
+			   "| \t%s\n\n", output_path);
+	}
+	else
+		check_ok(ctx);
+}
+
+
+/*
+ * old_8_3_check_for_tsquery_usage()
+ *	8.3 -> 8.4
+ *	A new 'prefix' field was added to the 'tsquery' data type in 8.4
+ *	so migration of such fields is impossible.
+ */
+void
+old_8_3_check_for_tsquery_usage(migratorContext *ctx, Cluster whichCluster)
+{
+	ClusterInfo *active_cluster = (whichCluster == CLUSTER_OLD) ?
+	&ctx->old : &ctx->new;
+	int			dbnum;
+	FILE	   *script = NULL;
+	bool		found = false;
+	char		output_path[MAXPGPATH];
+
+	prep_status(ctx, "Checking for tsquery user columns");
+
+	snprintf(output_path, sizeof(output_path), "%s/tables_using_tsquery.txt",
+			 ctx->cwd);
+
+	for (dbnum = 0; dbnum < active_cluster->dbarr.ndbs; dbnum++)
+	{
+		PGresult   *res;
+		bool		db_used = false;
+		int			ntups;
+		int			rowno;
+		int			i_nspname,
+					i_relname,
+					i_attname;
+		DbInfo	   *active_db = &active_cluster->dbarr.dbs[dbnum];
+		PGconn	   *conn = connectToServer(ctx, active_db->db_name, whichCluster);
+
+		/* Find any user-defined tsquery columns */
+		res = executeQueryOrDie(ctx, conn,
+								"SELECT n.nspname, c.relname, a.attname "
+								"FROM	pg_catalog.pg_class c, "
+								"		pg_catalog.pg_namespace n, "
+								"		pg_catalog.pg_attribute a "
+								"WHERE	c.relkind = 'r' AND "
+								"		c.oid = a.attrelid AND "
+								"		NOT a.attisdropped AND "
+								"		a.atttypid = 'pg_catalog.tsquery'::pg_catalog.regtype AND "
+								"		c.relnamespace = n.oid AND "
+							  "		n.nspname != 'pg_catalog' AND "
+						 "		n.nspname != 'information_schema'");
+
+		ntups = PQntuples(res);
+		i_nspname = PQfnumber(res, "nspname");
+		i_relname = PQfnumber(res, "relname");
+		i_attname = PQfnumber(res, "attname");
+		for (rowno = 0; rowno < ntups; rowno++)
+		{
+			found = true;
+			if (script == NULL && (script = fopen(output_path, "w")) == NULL)
+				pg_log(ctx, PG_FATAL, "Could not create necessary file:  %s\n", output_path);
+			if (!db_used)
+			{
+				fprintf(script, "Database:  %s\n", active_db->db_name);
+				db_used = true;
+			}
+			fprintf(script, "  %s.%s.%s\n",
+					PQgetvalue(res, rowno, i_nspname),
+					PQgetvalue(res, rowno, i_relname),
+					PQgetvalue(res, rowno, i_attname));
+		}
+
+		PQclear(res);
+
+		PQfinish(conn);
+	}
+
+	if (found)
+	{
+		fclose(script);
+		pg_log(ctx, PG_REPORT, "fatal\n");
+		pg_log(ctx, PG_FATAL,
+			   "| Your installation uses the \"tsquery\" data type.\n"
+			   "| This data type added a new internal field between\n"
+			   "| your old and new clusters so this cluster cannot\n"
+			   "| currently be upgraded.  You can remove the problem\n"
+			   "| columns and restart the migration.  A list of the\n"
+			   "| problem columns is in the file:\n"
+			   "| \t%s\n\n", output_path);
+	}
+	else
+		check_ok(ctx);
+}
+
+
+/*
+ * old_8_3_check_for_isn_and_int8_passing_mismatch()
+ *	8.3 -> 8.4
+ *	/contrib/isn relies on data type int8, and in 8.4 int8 is now passed
+ *	by value.  The schema dumps the CREATE TYPE PASSEDBYVALUE setting so
+ *	it must match for the old and new servers.
+ */
+void
+old_8_3_check_for_isn_and_int8_passing_mismatch(migratorContext *ctx, Cluster whichCluster)
+{
+	ClusterInfo *active_cluster = (whichCluster == CLUSTER_OLD) ?
+	&ctx->old : &ctx->new;
+	int			dbnum;
+	FILE	   *script = NULL;
+	bool		found = false;
+	char		output_path[MAXPGPATH];
+
+	prep_status(ctx, "Checking for /contrib/isn with bigint-passing mismatch");
+
+	if (ctx->old.controldata.float8_pass_by_value ==
+		ctx->new.controldata.float8_pass_by_value)
+	{
+		/* no mismatch */
+		check_ok(ctx);
+		return;
+	}
+
+	snprintf(output_path, sizeof(output_path), "%s/contrib_isn_and_int8_pass_by_value.txt",
+			 ctx->cwd);
+
+	for (dbnum = 0; dbnum < active_cluster->dbarr.ndbs; dbnum++)
+	{
+		PGresult   *res;
+		bool		db_used = false;
+		int			ntups;
+		int			rowno;
+		int			i_nspname,
+					i_proname;
+		DbInfo	   *active_db = &active_cluster->dbarr.dbs[dbnum];
+		PGconn	   *conn = connectToServer(ctx, active_db->db_name, whichCluster);
+
+		/* Find any functions coming from contrib/isn */
+		res = executeQueryOrDie(ctx, conn,
+								"SELECT n.nspname, p.proname "
+								"FROM	pg_catalog.pg_proc p, "
+								"		pg_catalog.pg_namespace n "
+								"WHERE	p.pronamespace = n.oid AND "
+								"		p.probin = '$libdir/isn'");
+
+		ntups = PQntuples(res);
+		i_nspname = PQfnumber(res, "nspname");
+		i_proname = PQfnumber(res, "proname");
+		for (rowno = 0; rowno < ntups; rowno++)
+		{
+			found = true;
+			if (script == NULL && (script = fopen(output_path, "w")) == NULL)
+				pg_log(ctx, PG_FATAL, "Could not create necessary file:  %s\n", output_path);
+			if (!db_used)
+			{
+				fprintf(script, "Database:  %s\n", active_db->db_name);
+				db_used = true;
+			}
+			fprintf(script, "  %s.%s\n",
+					PQgetvalue(res, rowno, i_nspname),
+					PQgetvalue(res, rowno, i_proname));
+		}
+
+		PQclear(res);
+
+		PQfinish(conn);
+	}
+
+	if (found)
+	{
+		fclose(script);
+		pg_log(ctx, PG_REPORT, "fatal\n");
+		pg_log(ctx, PG_FATAL,
+			   "| Your installation uses \"/contrib/isn\" functions\n"
+			   "| which rely on the bigint data type.  Your old and\n"
+			   "| new clusters pass bigint values differently so this\n"
+			   "| cluster cannot currently be upgraded.  You can\n"
+			   "| manually migrate data that use \"/contrib/isn\"\n"
+			   "| facilities and remove \"/contrib/isn\" from the\n"
+			   "| old cluster and restart the migration.  A list\n"
+			   "| of the problem functions is in the file:\n"
+			   "| \t%s\n\n", output_path);
+	}
+	else
+		check_ok(ctx);
+}
+
+
+/*
+ * old_8_3_rebuild_tsvector_tables()
+ *	8.3 -> 8.4
+ * 8.3 sorts lexemes by its length and if lengths are the same then it uses
+ * alphabetic order;  8.4 sorts lexemes in lexicographical order, e.g.
+ *
+ * => SELECT 'c bb aaa'::tsvector;
+ *	   tsvector
+ * ----------------
+ *	'aaa' 'bb' 'c'		   -- 8.4
+ *	'c' 'bb' 'aaa'		   -- 8.3
+ */
+void
+old_8_3_rebuild_tsvector_tables(migratorContext *ctx, bool check_mode,
+								Cluster whichCluster)
+{
+	ClusterInfo *active_cluster = (whichCluster == CLUSTER_OLD) ?
+	&ctx->old : &ctx->new;
+	int			dbnum;
+	FILE	   *script = NULL;
+	bool		found = false;
+	char		output_path[MAXPGPATH];
+
+	prep_status(ctx, "Checking for tsvector user columns");
+
+	snprintf(output_path, sizeof(output_path), "%s/rebuild_tsvector_tables.sql",
+			 ctx->cwd);
+
+	for (dbnum = 0; dbnum < active_cluster->dbarr.ndbs; dbnum++)
+	{
+		PGresult   *res;
+		bool		db_used = false;
+		char		old_nspname[NAMEDATALEN] = "",
+					old_relname[NAMEDATALEN] = "";
+		int			ntups;
+		int			rowno;
+		int			i_nspname,
+					i_relname,
+					i_attname;
+		DbInfo	   *active_db = &active_cluster->dbarr.dbs[dbnum];
+		PGconn	   *conn = connectToServer(ctx, active_db->db_name, whichCluster);
+
+		/* Find any user-defined tsvector columns */
+		res = executeQueryOrDie(ctx, conn,
+								"SELECT n.nspname, c.relname, a.attname "
+								"FROM	pg_catalog.pg_class c, "
+								"		pg_catalog.pg_namespace n, "
+								"		pg_catalog.pg_attribute a "
+								"WHERE	c.relkind = 'r' AND "
+								"		c.oid = a.attrelid AND "
+								"		NOT a.attisdropped AND "
+								"		a.atttypid = 'pg_catalog.tsvector'::pg_catalog.regtype AND "
+								"		c.relnamespace = n.oid AND "
+							  "		n.nspname != 'pg_catalog' AND "
+						 "		n.nspname != 'information_schema'");
+
+/*
+ *	This macro is used below to avoid reindexing indexes already rebuilt
+ *	because of tsvector columns.
+ */
+#define SKIP_TSVECTOR_TABLES \
+								"i.indrelid NOT IN ( "					\
+								"SELECT DISTINCT c.oid "				\
+								"FROM	pg_catalog.pg_class c, "		\
+								"		pg_catalog.pg_namespace n, "	\
+								"		pg_catalog.pg_attribute a "		\
+								"WHERE	c.relkind = 'r' AND "			\
+								"		c.oid = a.attrelid AND "		\
+								"		NOT a.attisdropped AND "		\
+								"		a.atttypid = 'pg_catalog.tsvector'::pg_catalog.regtype AND " \
+								"		c.relnamespace = n.oid AND "	\
+								"		n.nspname != 'pg_catalog' AND " \
+								"		n.nspname != 'information_schema') "
+
+		ntups = PQntuples(res);
+		i_nspname = PQfnumber(res, "nspname");
+		i_relname = PQfnumber(res, "relname");
+		i_attname = PQfnumber(res, "attname");
+		for (rowno = 0; rowno < ntups; rowno++)
+		{
+			found = true;
+			if (!check_mode)
+			{
+				if (script == NULL && (script = fopen(output_path, "w")) == NULL)
+					pg_log(ctx, PG_FATAL, "Could not create necessary file:  %s\n", output_path);
+				if (!db_used)
+				{
+					fprintf(script, "\\connect %s\n\n",
+							quote_identifier(ctx, active_db->db_name));
+					db_used = true;
+				}
+
+				/* Rebuild all tsvector collumns with one ALTER TABLE command */
+				if (strcmp(PQgetvalue(res, rowno, i_nspname), old_nspname) != 0 ||
+				 strcmp(PQgetvalue(res, rowno, i_relname), old_relname) != 0)
+				{
+					if (strlen(old_nspname) != 0 || strlen(old_relname) != 0)
+						fprintf(script, ";\n\n");
+					fprintf(script, "ALTER TABLE %s.%s\n",
+					quote_identifier(ctx, PQgetvalue(res, rowno, i_nspname)),
+					quote_identifier(ctx, PQgetvalue(res, rowno, i_relname)));
+				}
+				else
+					fprintf(script, ",\n");
+				strlcpy(old_nspname, PQgetvalue(res, rowno, i_nspname), sizeof(old_nspname));
+				strlcpy(old_relname, PQgetvalue(res, rowno, i_relname), sizeof(old_relname));
+
+				fprintf(script, "ALTER COLUMN %s "
+				/* This could have been a custom conversion function call. */
+						"TYPE pg_catalog.tsvector USING %s::pg_catalog.text::pg_catalog.tsvector",
+					quote_identifier(ctx, PQgetvalue(res, rowno, i_attname)),
+				   quote_identifier(ctx, PQgetvalue(res, rowno, i_attname)));
+			}
+		}
+		if (strlen(old_nspname) != 0 || strlen(old_relname) != 0)
+			fprintf(script, ";\n\n");
+
+		PQclear(res);
+
+		/* XXX Mark tables as not accessable somehow */
+
+		PQfinish(conn);
+	}
+
+	if (found)
+	{
+		if (!check_mode)
+			fclose(script);
+		report_status(ctx, PG_WARNING, "warning");
+		if (check_mode)
+			pg_log(ctx, PG_WARNING, "\n"
+				   "| Your installation contains tsvector columns.\n"
+				   "| The tsvector internal storage format changed\n"
+				   "| between your old and new clusters so the tables\n"
+				   "| must be rebuilt.  After migration, you will be\n"
+				   "| given instructions.\n\n");
+		else
+			pg_log(ctx, PG_WARNING, "\n"
+				   "| Your installation contains tsvector columns.\n"
+				   "| The tsvector internal storage format changed\n"
+				   "| between your old and new clusters so the tables\n"
+				   "| must be rebuilt.  The file:\n"
+				   "| \t%s\n"
+				   "| when executed by psql by the database super-user\n"
+				   "| will rebuild all tables with tsvector columns.\n\n",
+				   output_path);
+	}
+	else
+		check_ok(ctx);
+}
+
+
+/*
+ * old_8_3_invalidate_hash_gin_indexes()
+ *	8.3 -> 8.4
+ *	Hash, Gin, and GiST index binary format has changes from 8.3->8.4
+ */
+void
+old_8_3_invalidate_hash_gin_indexes(migratorContext *ctx, bool check_mode,
+									Cluster whichCluster)
+{
+	ClusterInfo *active_cluster = (whichCluster == CLUSTER_OLD) ?
+	&ctx->old : &ctx->new;
+	int			dbnum;
+	FILE	   *script = NULL;
+	bool		found = false;
+	char		output_path[MAXPGPATH];
+
+	prep_status(ctx, "Checking for hash and gin indexes");
+
+	snprintf(output_path, sizeof(output_path), "%s/reindex_hash_and_gin.sql",
+			 ctx->cwd);
+
+	for (dbnum = 0; dbnum < active_cluster->dbarr.ndbs; dbnum++)
+	{
+		PGresult   *res;
+		bool		db_used = false;
+		int			ntups;
+		int			rowno;
+		int			i_nspname,
+					i_relname;
+		DbInfo	   *active_db = &active_cluster->dbarr.dbs[dbnum];
+		PGconn	   *conn = connectToServer(ctx, active_db->db_name, whichCluster);
+
+		/* find hash and gin indexes */
+		res = executeQueryOrDie(ctx, conn,
+								"SELECT n.nspname, c.relname "
+								"FROM 	pg_catalog.pg_class c, "
+								"		pg_catalog.pg_index i, "
+								"		pg_catalog.pg_am a, "
+								"		pg_catalog.pg_namespace n "
+								"WHERE 	i.indexrelid = c.oid AND "
+								"		c.relam = a.oid AND "
+								"		c.relnamespace = n.oid AND "
+							"		a.amname IN ('hash', 'gin') AND "
+								SKIP_TSVECTOR_TABLES);
+
+		ntups = PQntuples(res);
+		i_nspname = PQfnumber(res, "nspname");
+		i_relname = PQfnumber(res, "relname");
+		for (rowno = 0; rowno < ntups; rowno++)
+		{
+			found = true;
+			if (!check_mode)
+			{
+				if (script == NULL && (script = fopen(output_path, "w")) == NULL)
+					pg_log(ctx, PG_FATAL, "Could not create necessary file:  %s\n", output_path);
+				if (!db_used)
+				{
+					fprintf(script, "\\connect %s\n",
+							quote_identifier(ctx, active_db->db_name));
+					db_used = true;
+				}
+				fprintf(script, "REINDEX INDEX %s.%s;\n",
+					quote_identifier(ctx, PQgetvalue(res, rowno, i_nspname)),
+				   quote_identifier(ctx, PQgetvalue(res, rowno, i_relname)));
+			}
+		}
+
+		PQclear(res);
+
+		if (!check_mode && found)
+			/* mark hash and gin indexes as invalid */
+			PQclear(executeQueryOrDie(ctx, conn,
+									  "UPDATE pg_catalog.pg_index i "
+									  "SET	indisvalid = false "
+									  "FROM 	pg_catalog.pg_class c, "
+									  "		pg_catalog.pg_am a, "
+									  "		pg_catalog.pg_namespace n "
+									  "WHERE 	i.indexrelid = c.oid AND "
+									  "		c.relam = a.oid AND "
+									  "		c.relnamespace = n.oid AND "
+									"		a.amname IN ('hash', 'gin')"));
+
+		PQfinish(conn);
+	}
+
+	if (found)
+	{
+		if (!check_mode)
+			fclose(script);
+		report_status(ctx, PG_WARNING, "warning");
+		if (check_mode)
+			pg_log(ctx, PG_WARNING, "\n"
+				   "| Your installation contains hash and/or gin\n"
+				   "| indexes.  These indexes have different\n"
+				   "| internal formats between your old and new\n"
+				   "| clusters so they must be reindexed with the\n"
+				   "| REINDEX command. After migration, you will\n"
+				   "| be given REINDEX instructions.\n\n");
+		else
+			pg_log(ctx, PG_WARNING, "\n"
+				   "| Your installation contains hash and/or gin\n"
+				   "| indexes.  These indexes have different internal\n"
+				   "| formats between your old and new clusters so\n"
+				   "| they must be reindexed with the REINDEX command.\n"
+				   "| The file:\n"
+				   "| \t%s\n"
+				   "| when executed by psql by the database super-user\n"
+				   "| will recreate all invalid indexes; until then,\n"
+				   "| none of these indexes will be used.\n\n",
+				   output_path);
+	}
+	else
+		check_ok(ctx);
+}
+
+
+/*
+ * old_8_3_invalidate_bpchar_pattern_ops_indexes()
+ *	8.3 -> 8.4
+ *	8.4 bpchar_pattern_ops no longer sorts based on trailing spaces
+ */
+void
+old_8_3_invalidate_bpchar_pattern_ops_indexes(migratorContext *ctx, bool check_mode,
+											  Cluster whichCluster)
+{
+	ClusterInfo *active_cluster = (whichCluster == CLUSTER_OLD) ?
+	&ctx->old : &ctx->new;
+	int			dbnum;
+	FILE	   *script = NULL;
+	bool		found = false;
+	char		output_path[MAXPGPATH];
+
+	prep_status(ctx, "Checking for bpchar_pattern_ops indexes");
+
+	snprintf(output_path, sizeof(output_path), "%s/reindex_bpchar_ops.sql",
+			 ctx->cwd);
+
+	for (dbnum = 0; dbnum < active_cluster->dbarr.ndbs; dbnum++)
+	{
+		PGresult   *res;
+		bool		db_used = false;
+		int			ntups;
+		int			rowno;
+		int			i_nspname,
+					i_relname;
+		DbInfo	   *active_db = &active_cluster->dbarr.dbs[dbnum];
+		PGconn	   *conn = connectToServer(ctx, active_db->db_name, whichCluster);
+
+		/* find bpchar_pattern_ops indexes */
+
+		/*
+		 * Do only non-hash, non-gin indexees;	we already invalidated them
+		 * above; no need to reindex twice
+		 */
+		res = executeQueryOrDie(ctx, conn,
+								"SELECT n.nspname, c.relname "
+								"FROM	pg_catalog.pg_index i, "
+								"		pg_catalog.pg_class c, "
+								"		pg_catalog.pg_namespace n "
+								"WHERE	indexrelid = c.oid AND "
+								"		c.relnamespace = n.oid AND "
+								"		( "
+								"			SELECT	o.oid "
+				   "			FROM	pg_catalog.pg_opclass o, "
+				  "					pg_catalog.pg_am a"
+		"			WHERE	a.amname NOT IN ('hash', 'gin') AND "
+			"					a.oid = o.opcmethod AND "
+								"					o.opcname = 'bpchar_pattern_ops') "
+								"		= ANY (i.indclass) AND "
+								SKIP_TSVECTOR_TABLES);
+
+		ntups = PQntuples(res);
+		i_nspname = PQfnumber(res, "nspname");
+		i_relname = PQfnumber(res, "relname");
+		for (rowno = 0; rowno < ntups; rowno++)
+		{
+			found = true;
+			if (!check_mode)
+			{
+				if (script == NULL && (script = fopen(output_path, "w")) == NULL)
+					pg_log(ctx, PG_FATAL, "Could not create necessary file:  %s\n", output_path);
+				if (!db_used)
+				{
+					fprintf(script, "\\connect %s\n",
+							quote_identifier(ctx, active_db->db_name));
+					db_used = true;
+				}
+				fprintf(script, "REINDEX INDEX %s.%s;\n",
+					quote_identifier(ctx, PQgetvalue(res, rowno, i_nspname)),
+				   quote_identifier(ctx, PQgetvalue(res, rowno, i_relname)));
+			}
+		}
+
+		PQclear(res);
+
+		if (!check_mode && found)
+			/* mark bpchar_pattern_ops indexes as invalid */
+			PQclear(executeQueryOrDie(ctx, conn,
+									  "UPDATE pg_catalog.pg_index i "
+									  "SET	indisvalid = false "
+									  "FROM	pg_catalog.pg_class c, "
+									  "		pg_catalog.pg_namespace n "
+									  "WHERE	indexrelid = c.oid AND "
+									  "		c.relnamespace = n.oid AND "
+									  "		( "
+									  "			SELECT	o.oid "
+						 "			FROM	pg_catalog.pg_opclass o, "
+						"					pg_catalog.pg_am a"
+			  "			WHERE	a.amname NOT IN ('hash', 'gin') AND "
+				  "					a.oid = o.opcmethod AND "
+									  "					o.opcname = 'bpchar_pattern_ops') "
+									  "		= ANY (i.indclass)"));
+
+		PQfinish(conn);
+	}
+
+	if (found)
+	{
+		if (!check_mode)
+			fclose(script);
+		report_status(ctx, PG_WARNING, "warning");
+		if (check_mode)
+			pg_log(ctx, PG_WARNING, "\n"
+				   "| Your installation contains indexes using\n"
+				   "| \"bpchar_pattern_ops\".  These indexes have\n"
+				   "| different internal formats between your old and\n"
+				   "| new clusters so they must be reindexed with the\n"
+				   "| REINDEX command.  After migration, you will be\n"
+				   "| given REINDEX instructions.\n\n");
+		else
+			pg_log(ctx, PG_WARNING, "\n"
+				   "| Your installation contains indexes using\n"
+				   "| \"bpchar_pattern_ops\".  These indexes have\n"
+				   "| different internal formats between your old and\n"
+				   "| new clusters so they must be reindexed with the\n"
+				   "| REINDEX command.  The file:\n"
+				   "| \t%s\n"
+				   "| when executed by psql by the database super-user\n"
+				   "| will recreate all invalid indexes; until then,\n"
+				   "| none of these indexes will be used.\n\n",
+				   output_path);
+	}
+	else
+		check_ok(ctx);
+}
+
+
+/*
+ * old_8_3_create_sequence_script()
+ *	8.3 -> 8.4
+ *	8.4 added the column "start_value" to all sequences.  For this reason,
+ *	we don't transfer sequence files but instead use the CREATE SEQUENCE
+ *	command from the schema dump, and use setval() to restore the sequence
+ *	value and 'is_called' from the old database.  This is safe to run
+ *	by pg_upgrade because sequence files are not transfered from the old
+ *	server, even in link mode.
+ */
+char *
+old_8_3_create_sequence_script(migratorContext *ctx, Cluster whichCluster)
+{
+	ClusterInfo *active_cluster = (whichCluster == CLUSTER_OLD) ?
+	&ctx->old : &ctx->new;
+	int			dbnum;
+	FILE	   *script = NULL;
+	bool		found = false;
+	char	   *output_path = pg_malloc(ctx, MAXPGPATH);
+
+	snprintf(output_path, MAXPGPATH, "%s/adjust_sequences.sql", ctx->cwd);
+
+	prep_status(ctx, "Creating script to adjust sequences");
+
+	for (dbnum = 0; dbnum < active_cluster->dbarr.ndbs; dbnum++)
+	{
+		PGresult   *res;
+		bool		db_used = false;
+		int			ntups;
+		int			rowno;
+		int			i_nspname,
+					i_relname;
+		DbInfo	   *active_db = &active_cluster->dbarr.dbs[dbnum];
+		PGconn	   *conn = connectToServer(ctx, active_db->db_name, whichCluster);
+
+		/* Find any sequences */
+		res = executeQueryOrDie(ctx, conn,
+								"SELECT n.nspname, c.relname "
+								"FROM	pg_catalog.pg_class c, "
+								"		pg_catalog.pg_namespace n "
+								"WHERE	c.relkind = 'S' AND "
+								"		c.relnamespace = n.oid AND "
+							  "		n.nspname != 'pg_catalog' AND "
+						 "		n.nspname != 'information_schema'");
+
+		ntups = PQntuples(res);
+		i_nspname = PQfnumber(res, "nspname");
+		i_relname = PQfnumber(res, "relname");
+		for (rowno = 0; rowno < ntups; rowno++)
+		{
+			PGresult   *seq_res;
+			int			i_last_value,
+						i_is_called;
+			const char *nspname = PQgetvalue(res, rowno, i_nspname);
+			const char *relname = PQgetvalue(res, rowno, i_relname);
+
+			found = true;
+
+			if (script == NULL && (script = fopen(output_path, "w")) == NULL)
+				pg_log(ctx, PG_FATAL, "Could not create necessary file:  %s\n", output_path);
+			if (!db_used)
+			{
+				fprintf(script, "\\connect %s\n\n",
+						quote_identifier(ctx, active_db->db_name));
+				db_used = true;
+			}
+
+			/* Find the desired sequence */
+			seq_res = executeQueryOrDie(ctx, conn,
+										"SELECT s.last_value, s.is_called "
+										"FROM	%s.%s s",
+										quote_identifier(ctx, nspname),
+										quote_identifier(ctx, relname));
+
+			assert(PQntuples(seq_res) == 1);
+			i_last_value = PQfnumber(seq_res, "last_value");
+			i_is_called = PQfnumber(seq_res, "is_called");
+
+			fprintf(script, "SELECT setval('%s.%s', %s, '%s');\n",
+			  quote_identifier(ctx, nspname), quote_identifier(ctx, relname),
+					PQgetvalue(seq_res, 0, i_last_value), PQgetvalue(seq_res, 0, i_is_called));
+			PQclear(seq_res);
+		}
+		if (db_used)
+			fprintf(script, "\n");
+
+		PQclear(res);
+
+		PQfinish(conn);
+	}
+	if (found)
+		fclose(script);
+
+	check_ok(ctx);
+
+	if (found)
+		return output_path;
+	else
+	{
+		pg_free(output_path);
+		return NULL;
+	}
+}
diff --git a/contrib/pg_upgrade_support/Makefile b/contrib/pg_upgrade_support/Makefile
new file mode 100644
index 0000000000..bd43c5093e
--- /dev/null
+++ b/contrib/pg_upgrade_support/Makefile
@@ -0,0 +1,19 @@
+#
+# Makefile for pg_upgrade_support
+#
+# $PostgreSQL: pgsql/contrib/pg_upgrade_support/Makefile,v 1.3 2010/07/03 14:23:14 momjian Exp $
+
+PGFILEDESC = "pg_upgrade_support - server-side functions for pg_upgrade"
+
+MODULES = pg_upgrade_support
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/pg_upgrade_support
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
diff --git a/contrib/pg_upgrade_support/pg_upgrade_support.c b/contrib/pg_upgrade_support/pg_upgrade_support.c
new file mode 100644
index 0000000000..08050ac6e8
--- /dev/null
+++ b/contrib/pg_upgrade_support/pg_upgrade_support.c
@@ -0,0 +1,124 @@
+/*
+ *	pg_upgrade_sysoids.c
+ *
+ *	server-side functions to set backend global variables
+ *	to control oid and relfilenode assignment
+ *
+ *	Copyright (c) 2010, PostgreSQL Global Development Group
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade_support/pg_upgrade_support.c,v 1.5 2010/07/06 19:18:55 momjian Exp $
+ */
+
+#include "postgres.h"
+
+#include "fmgr.h"
+#include "catalog/dependency.h"
+#include "catalog/pg_class.h"
+
+/* THIS IS USED ONLY FOR PG >= 9.0 */
+
+/*
+ * Cannot include "catalog/pg_enum.h" here because we might
+ * not be compiling against PG 9.0.
+ */
+extern void EnumValuesCreate(Oid enumTypeOid, List *vals,
+				 Oid binary_upgrade_next_pg_enum_oid);
+
+#ifdef PG_MODULE_MAGIC
+PG_MODULE_MAGIC;
+#endif
+
+extern PGDLLIMPORT Oid binary_upgrade_next_pg_type_oid;
+extern PGDLLIMPORT Oid binary_upgrade_next_pg_type_array_oid;
+extern PGDLLIMPORT Oid binary_upgrade_next_pg_type_toast_oid;
+extern PGDLLIMPORT Oid binary_upgrade_next_heap_relfilenode;
+extern PGDLLIMPORT Oid binary_upgrade_next_toast_relfilenode;
+extern PGDLLIMPORT Oid binary_upgrade_next_index_relfilenode;
+
+Datum		set_next_pg_type_oid(PG_FUNCTION_ARGS);
+Datum		set_next_pg_type_array_oid(PG_FUNCTION_ARGS);
+Datum		set_next_pg_type_toast_oid(PG_FUNCTION_ARGS);
+Datum		set_next_heap_relfilenode(PG_FUNCTION_ARGS);
+Datum		set_next_toast_relfilenode(PG_FUNCTION_ARGS);
+Datum		set_next_index_relfilenode(PG_FUNCTION_ARGS);
+Datum		add_pg_enum_label(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(set_next_pg_type_oid);
+PG_FUNCTION_INFO_V1(set_next_pg_type_array_oid);
+PG_FUNCTION_INFO_V1(set_next_pg_type_toast_oid);
+PG_FUNCTION_INFO_V1(set_next_heap_relfilenode);
+PG_FUNCTION_INFO_V1(set_next_toast_relfilenode);
+PG_FUNCTION_INFO_V1(set_next_index_relfilenode);
+PG_FUNCTION_INFO_V1(add_pg_enum_label);
+
+Datum
+set_next_pg_type_oid(PG_FUNCTION_ARGS)
+{
+	Oid			typoid = PG_GETARG_OID(0);
+
+	binary_upgrade_next_pg_type_oid = typoid;
+
+	PG_RETURN_VOID();
+}
+
+Datum
+set_next_pg_type_array_oid(PG_FUNCTION_ARGS)
+{
+	Oid			typoid = PG_GETARG_OID(0);
+
+	binary_upgrade_next_pg_type_array_oid = typoid;
+
+	PG_RETURN_VOID();
+}
+
+Datum
+set_next_pg_type_toast_oid(PG_FUNCTION_ARGS)
+{
+	Oid			typoid = PG_GETARG_OID(0);
+
+	binary_upgrade_next_pg_type_toast_oid = typoid;
+
+	PG_RETURN_VOID();
+}
+
+Datum
+set_next_heap_relfilenode(PG_FUNCTION_ARGS)
+{
+	Oid			relfilenode = PG_GETARG_OID(0);
+
+	binary_upgrade_next_heap_relfilenode = relfilenode;
+
+	PG_RETURN_VOID();
+}
+
+Datum
+set_next_toast_relfilenode(PG_FUNCTION_ARGS)
+{
+	Oid			relfilenode = PG_GETARG_OID(0);
+
+	binary_upgrade_next_toast_relfilenode = relfilenode;
+
+	PG_RETURN_VOID();
+}
+
+Datum
+set_next_index_relfilenode(PG_FUNCTION_ARGS)
+{
+	Oid			relfilenode = PG_GETARG_OID(0);
+
+	binary_upgrade_next_index_relfilenode = relfilenode;
+
+	PG_RETURN_VOID();
+}
+
+Datum
+add_pg_enum_label(PG_FUNCTION_ARGS)
+{
+	Oid			enumoid = PG_GETARG_OID(0);
+	Oid			typoid = PG_GETARG_OID(1);
+	Name		label = PG_GETARG_NAME(2);
+
+	EnumValuesCreate(typoid, list_make1(makeString(NameStr(*label))),
+					 enumoid);
+
+	PG_RETURN_VOID();
+}
diff --git a/contrib/pgbench/Makefile b/contrib/pgbench/Makefile
index d13cb7405a..786ba10fd9 100644
--- a/contrib/pgbench/Makefile
+++ b/contrib/pgbench/Makefile
@@ -1,10 +1,13 @@
-# $PostgreSQL: pgsql/contrib/pgbench/Makefile,v 1.16 2007/11/10 23:59:51 momjian Exp $
+# $PostgreSQL: pgsql/contrib/pgbench/Makefile,v 1.18 2010/05/12 11:33:08 momjian Exp $
+
+PGFILEDESC = "pgbench - a simple program for running benchmark tests"
+PGAPPICON=win32
 
 PROGRAM = pgbench
 OBJS	= pgbench.o
 
 PG_CPPFLAGS = -I$(libpq_srcdir)
-PG_LIBS = $(libpq_pgport)
+PG_LIBS = $(libpq_pgport) $(PTHREAD_LIBS)
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
@@ -16,3 +19,7 @@ top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
+
+ifneq ($(PORTNAME), win32)
+override CFLAGS += $(PTHREAD_CFLAGS)
+endif
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
index c2aaeec529..1ca58d4c2f 100644
--- a/contrib/pgbench/pgbench.c
+++ b/contrib/pgbench/pgbench.c
@@ -4,8 +4,8 @@
  * A simple benchmark program for PostgreSQL
  * Originally written by Tatsuo Ishii and enhanced by many contributors.
  *
- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.87 2009/06/11 14:48:51 momjian Exp $
- * Copyright (c) 2000-2009, PostgreSQL Global Development Group
+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.99 2010/07/06 19:18:55 momjian Exp $
+ * Copyright (c) 2000-2010, PostgreSQL Global Development Group
  * ALL RIGHTS RESERVED;
  *
  * Permission to use, copy, modify, and distribute this software and its
@@ -26,19 +26,20 @@
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
  */
+
+#ifdef WIN32
+#define FD_SETSIZE 1024			/* set before winsock2.h is included */
+#endif   /* ! WIN32 */
+
 #include "postgres_fe.h"
 
 #include "libpq-fe.h"
-#include "pqsignal.h"
+#include "libpq/pqsignal.h"
+#include "portability/instr_time.h"
 
 #include <ctype.h>
 
-#ifdef WIN32
-#undef FD_SETSIZE
-#define FD_SETSIZE 1024
-#include <win32.h>
-#else
-#include <signal.h>
+#ifndef WIN32
 #include <sys/time.h>
 #include <unistd.h>
 #endif   /* ! WIN32 */
@@ -55,6 +56,41 @@
 #include <sys/resource.h>		/* for getrlimit */
 #endif
 
+#ifndef INT64_MAX
+#define INT64_MAX	INT64CONST(0x7FFFFFFFFFFFFFFF)
+#endif
+
+/*
+ * Multi-platform pthread implementations
+ */
+
+#ifdef WIN32
+/* Use native win32 threads on Windows */
+typedef struct win32_pthread *pthread_t;
+typedef int pthread_attr_t;
+
+static int	pthread_create(pthread_t *thread, pthread_attr_t *attr, void *(*start_routine) (void *), void *arg);
+static int	pthread_join(pthread_t th, void **thread_return);
+#elif defined(ENABLE_THREAD_SAFETY)
+/* Use platform-dependent pthread capability */
+#include <pthread.h>
+#else
+/* Use emulation with fork. Rename pthread identifiers to avoid conflicts */
+
+#include <sys/wait.h>
+
+#define pthread_t				pg_pthread_t
+#define pthread_attr_t			pg_pthread_attr_t
+#define pthread_create			pg_pthread_create
+#define pthread_join			pg_pthread_join
+
+typedef struct fork_pthread *pthread_t;
+typedef int pthread_attr_t;
+
+static int	pthread_create(pthread_t *thread, pthread_attr_t *attr, void *(*start_routine) (void *), void *arg);
+static int	pthread_join(pthread_t th, void **thread_return);
+#endif
+
 extern char *optarg;
 extern int	optind;
 
@@ -71,7 +107,6 @@ extern int	optind;
 
 #define DEFAULT_NXACTS	10		/* default nxacts */
 
-int			nclients = 1;		/* default number of simulated clients */
 int			nxacts = 0;			/* number of transactions per client */
 int			duration = 0;		/* duration in seconds */
 
@@ -91,20 +126,17 @@ int			fillfactor = 100;
  * end of configurable parameters
  *********************************************************************/
 
-#define nbranches	1
+#define nbranches	1			/* Makes little sense to change this.  Change
+								 * -s instead */
 #define ntellers	10
 #define naccounts	100000
 
-FILE	   *LOGFILE = NULL;
-
 #ifdef PGXC
 bool		use_branch = true;	/* use branch id in DDL and DML */
 #endif
 bool		use_log;			/* log transaction latencies to a file */
-
-int			remains;			/* number of remaining clients */
-
-int			is_connect;			/* establish connection  for each transaction */
+bool		is_connect;			/* establish connection for each transaction */
+int			main_pid;			/* main process id used in log filename */
 
 char	   *pghost = "";
 char	   *pgport = "";
@@ -123,6 +155,7 @@ typedef struct
 } Variable;
 
 #define MAX_FILES		128		/* max number of SQL script files allowed */
+#define SHELL_COMMAND_SIZE	256 /* maximum size allowed for shell command */
 
 /*
  * structures used in custom query mode
@@ -138,15 +171,35 @@ typedef struct
 	int			listen;			/* 0 indicates that an async query has been
 								 * sent */
 	int			sleeping;		/* 1 indicates that the client is napping */
-	struct timeval until;		/* napping until */
+	int64		until;			/* napping until (usec) */
 	Variable   *variables;		/* array of variable definitions */
 	int			nvariables;
-	struct timeval txn_begin;	/* used for measuring latencies */
+	instr_time	txn_begin;		/* used for measuring latencies */
 	int			use_file;		/* index in sql_files for this client */
 	bool		prepared[MAX_FILES];
 } CState;
 
 /*
+ * Thread state and result
+ */
+typedef struct
+{
+	int			tid;			/* thread id */
+	pthread_t	thread;			/* thread handle */
+	CState	   *state;			/* array of CState */
+	int			nstate;			/* length of state[] */
+	instr_time	start_time;		/* thread start time */
+} TState;
+
+#define INVALID_THREAD		((pthread_t) 0)
+
+typedef struct
+{
+	instr_time	conn_time;
+	int			xacts;
+} TResult;
+
+/*
  * queries read from files
  */
 #define SQL_COMMAND		1
@@ -171,14 +224,15 @@ typedef struct
 	char	   *argv[MAX_ARGS]; /* command list */
 } Command;
 
-Command   **sql_files[MAX_FILES];		/* SQL script files */
-int			num_files;			/* number of script files */
+static Command **sql_files[MAX_FILES];	/* SQL script files */
+static int	num_files;			/* number of script files */
+static int	debug = 0;			/* debug flag */
 
 /* default scenario */
 static char *tpc_b = {
-	"\\set nbranches :scale\n"
-	"\\set ntellers 10 * :scale\n"
-	"\\set naccounts 100000 * :scale\n"
+	"\\set nbranches " CppAsString2(nbranches) " * :scale\n"
+	"\\set ntellers " CppAsString2(ntellers) " * :scale\n"
+	"\\set naccounts " CppAsString2(naccounts) " * :scale\n"
 	"\\setrandom aid 1 :naccounts\n"
 	"\\setrandom bid 1 :nbranches\n"
 	"\\setrandom tid 1 :ntellers\n"
@@ -214,9 +268,9 @@ static char *tpc_b_bid = {
 
 /* -N case */
 static char *simple_update = {
-	"\\set nbranches :scale\n"
-	"\\set ntellers 10 * :scale\n"
-	"\\set naccounts 100000 * :scale\n"
+	"\\set nbranches " CppAsString2(nbranches) " * :scale\n"
+	"\\set ntellers " CppAsString2(ntellers) " * :scale\n"
+	"\\set naccounts " CppAsString2(naccounts) " * :scale\n"
 	"\\setrandom aid 1 :naccounts\n"
 	"\\setrandom bid 1 :nbranches\n"
 	"\\setrandom tid 1 :ntellers\n"
@@ -247,49 +301,14 @@ static char *simple_update_bid = {
 
 /* -S case */
 static char *select_only = {
-	"\\set naccounts 100000 * :scale\n"
+	"\\set naccounts " CppAsString2(naccounts) " * :scale\n"
 	"\\setrandom aid 1 :naccounts\n"
 	"SELECT abalance FROM pgbench_accounts WHERE aid = :aid;\n"
 };
 
-/* Connection overhead time */
-static struct timeval conn_total_time = {0, 0};
-
 /* Function prototypes */
 static void setalarm(int seconds);
-
-
-/* Calculate total time */
-static void
-addTime(struct timeval * t1, struct timeval * t2, struct timeval * result)
-{
-	int			sec = t1->tv_sec + t2->tv_sec;
-	int			usec = t1->tv_usec + t2->tv_usec;
-
-	if (usec >= 1000000)
-	{
-		usec -= 1000000;
-		sec++;
-	}
-	result->tv_sec = sec;
-	result->tv_usec = usec;
-}
-
-/* Calculate time difference */
-static void
-diffTime(struct timeval * t1, struct timeval * t2, struct timeval * result)
-{
-	int			sec = t1->tv_sec - t2->tv_sec;
-	int			usec = t1->tv_usec - t2->tv_usec;
-
-	if (usec < 0)
-	{
-		usec += 1000000;
-		sec--;
-	}
-	result->tv_sec = sec;
-	result->tv_usec = usec;
-}
+static void *threadRun(void *arg);
 
 static void
 usage(const char *progname)
@@ -313,6 +332,7 @@ usage(const char *progname)
 #ifdef PGXC
 		   "  -k           query with key only, no branch id (bid)\n"
 #endif
+		   "  -j NUM       number of threads (default: 1)\n"
 		   "  -l           write transaction times to log file\n"
 		   "  -M {simple|extended|prepared}\n"
 		   "               protocol for submitting queries to server (default: simple)\n"
@@ -422,29 +442,6 @@ discard_response(CState *state)
 	} while (res);
 }
 
-/* check to see if the SQL result was good */
-static int
-check(CState *state, PGresult *res, int n)
-{
-	CState	   *st = &state[n];
-
-	switch (PQresultStatus(res))
-	{
-		case PGRES_COMMAND_OK:
-		case PGRES_TUPLES_OK:
-			/* OK */
-			break;
-		default:
-			fprintf(stderr, "Client %d aborted in state %d: %s",
-					n, st->state, PQerrorMessage(st->con));
-			remains--;			/* I've aborted */
-			PQfinish(st->con);
-			st->con = NULL;
-			return (-1);
-	}
-	return (0);					/* OK */
-}
-
 static int
 compareVariables(const void *v1, const void *v2)
 {
@@ -474,8 +471,23 @@ getVariable(CState *st, char *name)
 		return NULL;
 }
 
+/* check whether the name consists of alphabets, numerals and underscores. */
+static bool
+isLegalVariableName(const char *name)
+{
+	int			i;
+
+	for (i = 0; name[i] != '\0'; i++)
+	{
+		if (!isalnum((unsigned char) name[i]) && name[i] != '_')
+			return false;
+	}
+
+	return true;
+}
+
 static int
-putVariable(CState *st, char *name, char *value)
+putVariable(CState *st, const char *context, char *name, char *value)
 {
 	Variable	key,
 			   *var;
@@ -495,6 +507,16 @@ putVariable(CState *st, char *name, char *value)
 	{
 		Variable   *newvars;
 
+		/*
+		 * Check for the name only when declaring a new variable to avoid
+		 * overhead.
+		 */
+		if (!isLegalVariableName(name))
+		{
+			fprintf(stderr, "%s: invalid variable name '%s'\n", context, name);
+			return false;
+		}
+
 		if (st->variables)
 			newvars = (Variable *) realloc(st->variables,
 									(st->nvariables + 1) * sizeof(Variable));
@@ -502,7 +524,7 @@ putVariable(CState *st, char *name, char *value)
 			newvars = (Variable *) malloc(sizeof(Variable));
 
 		if (newvars == NULL)
-			return false;
+			goto out_of_memory;
 
 		st->variables = newvars;
 
@@ -511,8 +533,8 @@ putVariable(CState *st, char *name, char *value)
 		var->name = NULL;
 		var->value = NULL;
 
-		if ((var->name = strdup(name)) == NULL
-			|| (var->value = strdup(value)) == NULL)
+		if ((var->name = strdup(name)) == NULL ||
+			(var->value = strdup(value)) == NULL)
 		{
 			free(var->name);
 			free(var->value);
@@ -536,6 +558,10 @@ putVariable(CState *st, char *name, char *value)
 	}
 
 	return true;
+
+out_of_memory:
+	fprintf(stderr, "%s: out of memory for variable '%s'\n", context, name);
+	return false;
 }
 
 static char *
@@ -634,6 +660,110 @@ getQueryParams(CState *st, const Command *command, const char **params)
 		params[i] = getVariable(st, command->argv[i + 1]);
 }
 
+/*
+ * Run a shell command. The result is assigned to the variable if not NULL.
+ * Return true if succeeded, or false on error.
+ */
+static bool
+runShellCommand(CState *st, char *variable, char **argv, int argc)
+{
+	char		command[SHELL_COMMAND_SIZE];
+	int			i,
+				len = 0;
+	FILE	   *fp;
+	char		res[64];
+	char	   *endptr;
+	int			retval;
+
+	/*
+	 * Join arguments with whilespace separaters. Arguments starting with
+	 * exactly one colon are treated as variables: name - append a string
+	 * "name" :var - append a variable named 'var'. ::name - append a string
+	 * ":name"
+	 */
+	for (i = 0; i < argc; i++)
+	{
+		char	   *arg;
+		int			arglen;
+
+		if (argv[i][0] != ':')
+		{
+			arg = argv[i];		/* a string literal */
+		}
+		else if (argv[i][1] == ':')
+		{
+			arg = argv[i] + 1;	/* a string literal starting with colons */
+		}
+		else if ((arg = getVariable(st, argv[i] + 1)) == NULL)
+		{
+			fprintf(stderr, "%s: undefined variable %s\n", argv[0], argv[i]);
+			return false;
+		}
+
+		arglen = strlen(arg);
+		if (len + arglen + (i > 0 ? 1 : 0) >= SHELL_COMMAND_SIZE - 1)
+		{
+			fprintf(stderr, "%s: too long shell command\n", argv[0]);
+			return false;
+		}
+
+		if (i > 0)
+			command[len++] = ' ';
+		memcpy(command + len, arg, arglen);
+		len += arglen;
+	}
+
+	command[len] = '\0';
+
+	/* Fast path for non-assignment case */
+	if (variable == NULL)
+	{
+		if (system(command))
+		{
+			if (!timer_exceeded)
+				fprintf(stderr, "%s: cannot launch shell command\n", argv[0]);
+			return false;
+		}
+		return true;
+	}
+
+	/* Execute the command with pipe and read the standard output. */
+	if ((fp = popen(command, "r")) == NULL)
+	{
+		fprintf(stderr, "%s: cannot launch shell command\n", argv[0]);
+		return false;
+	}
+	if (fgets(res, sizeof(res), fp) == NULL)
+	{
+		if (!timer_exceeded)
+			fprintf(stderr, "%s: cannot read the result\n", argv[0]);
+		return false;
+	}
+	if (pclose(fp) < 0)
+	{
+		fprintf(stderr, "%s: cannot close shell command\n", argv[0]);
+		return false;
+	}
+
+	/* Check whether the result is an integer and assign it to the variable */
+	retval = (int) strtol(res, &endptr, 10);
+	while (*endptr != '\0' && isspace((unsigned char) *endptr))
+		endptr++;
+	if (*res == '\0' || *endptr != '\0')
+	{
+		fprintf(stderr, "%s: must return an integer ('%s' returned)\n", argv[0], res);
+		return false;
+	}
+	snprintf(res, sizeof(res), "%d", retval);
+	if (!putVariable(st, "setshell", variable, res))
+		return false;
+
+#ifdef DEBUG
+	printf("shell parameter name: %s, value: %s\n", argv[1], res);
+#endif
+	return true;
+}
+
 #define MAX_PREPARE_NAME		32
 static void
 preparedStatementName(char *buffer, int file, int state)
@@ -641,11 +771,24 @@ preparedStatementName(char *buffer, int file, int state)
 	sprintf(buffer, "P%d_%d", file, state);
 }
 
-static void
-doCustom(CState *state, int n, int debug)
+static bool
+clientDone(CState *st, bool ok)
+{
+	(void) ok;					/* unused */
+
+	if (st->con != NULL)
+	{
+		PQfinish(st->con);
+		st->con = NULL;
+	}
+	return false;				/* always false */
+}
+
+/* return false iff client should be disconnected */
+static bool
+doCustom(CState *st, instr_time *conn_time, FILE *logfile)
 {
 	PGresult   *res;
-	CState	   *st = &state[n];
 	Command   **commands;
 
 top:
@@ -653,16 +796,13 @@ top:
 
 	if (st->sleeping)
 	{							/* are we sleeping? */
-		int			usec;
-		struct timeval now;
+		instr_time	now;
 
-		gettimeofday(&now, NULL);
-		usec = (st->until.tv_sec - now.tv_sec) * 1000000 +
-			st->until.tv_usec - now.tv_usec;
-		if (usec <= 0)
+		INSTR_TIME_SET_CURRENT(now);
+		if (st->until <= INSTR_TIME_GET_MICROSEC(now))
 			st->sleeping = 0;	/* Done sleeping, go ahead with next command */
 		else
-			return;				/* Still sleeping, nothing to do here */
+			return true;		/* Still sleeping, nothing to do here */
 	}
 
 	if (st->listen)
@@ -670,43 +810,55 @@ top:
 		if (commands[st->state]->type == SQL_COMMAND)
 		{
 			if (debug)
-				fprintf(stderr, "client %d receiving\n", n);
+				fprintf(stderr, "client %d receiving\n", st->id);
 			if (!PQconsumeInput(st->con))
 			{					/* there's something wrong */
-				fprintf(stderr, "Client %d aborted in state %d. Probably the backend died while processing.\n", n, st->state);
-				remains--;		/* I've aborted */
-				PQfinish(st->con);
-				st->con = NULL;
-				return;
+				fprintf(stderr, "Client %d aborted in state %d. Probably the backend died while processing.\n", st->id, st->state);
+				return clientDone(st, false);
 			}
 			if (PQisBusy(st->con))
-				return;			/* don't have the whole result yet */
+				return true;	/* don't have the whole result yet */
 		}
 
 		/*
 		 * transaction finished: record the time it took in the log
 		 */
-		if (use_log && commands[st->state + 1] == NULL)
+		if (logfile && commands[st->state + 1] == NULL)
 		{
-			double		diff;
-			struct timeval now;
+			instr_time	now;
+			instr_time	diff;
+			double		usec;
 
-			gettimeofday(&now, NULL);
-			diff = (int) (now.tv_sec - st->txn_begin.tv_sec) * 1000000.0 +
-				(int) (now.tv_usec - st->txn_begin.tv_usec);
+			INSTR_TIME_SET_CURRENT(now);
+			diff = now;
+			INSTR_TIME_SUBTRACT(diff, st->txn_begin);
+			usec = (double) INSTR_TIME_GET_MICROSEC(diff);
 
-			fprintf(LOGFILE, "%d %d %.0f %d %ld %ld\n",
-					st->id, st->cnt, diff, st->use_file,
+#ifndef WIN32
+			/* This is more than we really ought to know about instr_time */
+			fprintf(logfile, "%d %d %.0f %d %ld %ld\n",
+					st->id, st->cnt, usec, st->use_file,
 					(long) now.tv_sec, (long) now.tv_usec);
+#else
+			/* On Windows, instr_time doesn't provide a timestamp anyway */
+			fprintf(logfile, "%d %d %.0f %d 0 0\n",
+					st->id, st->cnt, usec, st->use_file);
+#endif
 		}
 
 		if (commands[st->state]->type == SQL_COMMAND)
 		{
 			res = PQgetResult(st->con);
-			if (check(state, res, n))
+			switch (PQresultStatus(res))
 			{
-				PQclear(res);
-				return;
+				case PGRES_COMMAND_OK:
+				case PGRES_TUPLES_OK:
+					break;		/* OK */
+				default:
+					fprintf(stderr, "Client %d aborted in state %d: %s",
+							st->id, st->state, PQerrorMessage(st->con));
+					PQclear(res);
+					return clientDone(st, false);
 			}
 			PQclear(res);
 			discard_response(st);
@@ -722,15 +874,7 @@ top:
 
 			++st->cnt;
 			if ((st->cnt >= nxacts && duration <= 0) || timer_exceeded)
-			{
-				remains--;		/* I've done */
-				if (st->con != NULL)
-				{
-					PQfinish(st->con);
-					st->con = NULL;
-				}
-				return;
-			}
+				return clientDone(st, true);	/* exit success */
 		}
 
 		/* increment state counter */
@@ -745,27 +889,21 @@ top:
 
 	if (st->con == NULL)
 	{
-		struct timeval t1,
-					t2,
-					t3;
+		instr_time	start,
+					end;
 
-		gettimeofday(&t1, NULL);
+		INSTR_TIME_SET_CURRENT(start);
 		if ((st->con = doConnect()) == NULL)
 		{
-			fprintf(stderr, "Client %d aborted in establishing connection.\n",
-					n);
-			remains--;			/* I've aborted */
-			PQfinish(st->con);
-			st->con = NULL;
-			return;
+			fprintf(stderr, "Client %d aborted in establishing connection.\n", st->id);
+			return clientDone(st, false);
 		}
-		gettimeofday(&t2, NULL);
-		diffTime(&t2, &t1, &t3);
-		addTime(&conn_total_time, &t3, &conn_total_time);
+		INSTR_TIME_SET_CURRENT(end);
+		INSTR_TIME_ACCUM_DIFF(*conn_time, end, start);
 	}
 
-	if (use_log && st->state == 0)
-		gettimeofday(&(st->txn_begin), NULL);
+	if (logfile && st->state == 0)
+		INSTR_TIME_SET_CURRENT(st->txn_begin);
 
 	if (commands[st->state]->type == SQL_COMMAND)
 	{
@@ -781,11 +919,11 @@ top:
 			{
 				fprintf(stderr, "out of memory\n");
 				st->ecnt++;
-				return;
+				return true;
 			}
 
 			if (debug)
-				fprintf(stderr, "client %d sending %s\n", n, sql);
+				fprintf(stderr, "client %d sending %s\n", st->id, sql);
 			r = PQsendQuery(st->con, sql);
 			free(sql);
 		}
@@ -797,7 +935,7 @@ top:
 			getQueryParams(st, command, params);
 
 			if (debug)
-				fprintf(stderr, "client %d sending %s\n", n, sql);
+				fprintf(stderr, "client %d sending %s\n", st->id, sql);
 			r = PQsendQueryParams(st->con, sql, command->argc - 1,
 								  NULL, params, NULL, NULL, 0);
 		}
@@ -831,7 +969,7 @@ top:
 			preparedStatementName(name, st->use_file, st->state);
 
 			if (debug)
-				fprintf(stderr, "client %d sending %s\n", n, name);
+				fprintf(stderr, "client %d sending %s\n", st->id, name);
 			r = PQsendQueryPrepared(st->con, name, command->argc - 1,
 									params, NULL, NULL, 0);
 		}
@@ -841,7 +979,7 @@ top:
 		if (r == 0)
 		{
 			if (debug)
-				fprintf(stderr, "client %d cannot send %s\n", n, command->argv[0]);
+				fprintf(stderr, "client %d cannot send %s\n", st->id, command->argv[0]);
 			st->ecnt++;
 		}
 		else
@@ -855,7 +993,7 @@ top:
 
 		if (debug)
 		{
-			fprintf(stderr, "client %d executing \\%s", n, argv[0]);
+			fprintf(stderr, "client %d executing \\%s", st->id, argv[0]);
 			for (i = 1; i < argc; i++)
 				fprintf(stderr, " %s", argv[i]);
 			fprintf(stderr, "\n");
@@ -874,7 +1012,7 @@ top:
 				{
 					fprintf(stderr, "%s: undefined variable %s\n", argv[0], argv[2]);
 					st->ecnt++;
-					return;
+					return true;
 				}
 				min = atoi(var);
 			}
@@ -896,7 +1034,7 @@ top:
 				{
 					fprintf(stderr, "%s: undefined variable %s\n", argv[0], argv[3]);
 					st->ecnt++;
-					return;
+					return true;
 				}
 				max = atoi(var);
 			}
@@ -907,7 +1045,7 @@ top:
 			{
 				fprintf(stderr, "%s: invalid maximum number %d\n", argv[0], max);
 				st->ecnt++;
-				return;
+				return true;
 			}
 
 #ifdef DEBUG
@@ -915,11 +1053,10 @@ top:
 #endif
 			snprintf(res, sizeof(res), "%d", getrand(min, max));
 
-			if (putVariable(st, argv[1], res) == false)
+			if (!putVariable(st, argv[0], argv[1], res))
 			{
-				fprintf(stderr, "%s: out of memory\n", argv[0]);
 				st->ecnt++;
-				return;
+				return true;
 			}
 
 			st->listen = 1;
@@ -937,7 +1074,7 @@ top:
 				{
 					fprintf(stderr, "%s: undefined variable %s\n", argv[0], argv[2]);
 					st->ecnt++;
-					return;
+					return true;
 				}
 				ope1 = atoi(var);
 			}
@@ -954,7 +1091,7 @@ top:
 					{
 						fprintf(stderr, "%s: undefined variable %s\n", argv[0], argv[4]);
 						st->ecnt++;
-						return;
+						return true;
 					}
 					ope2 = atoi(var);
 				}
@@ -973,7 +1110,7 @@ top:
 					{
 						fprintf(stderr, "%s: division by zero\n", argv[0]);
 						st->ecnt++;
-						return;
+						return true;
 					}
 					snprintf(res, sizeof(res), "%d", ope1 / ope2);
 				}
@@ -981,15 +1118,14 @@ top:
 				{
 					fprintf(stderr, "%s: unsupported operator %s\n", argv[0], argv[3]);
 					st->ecnt++;
-					return;
+					return true;
 				}
 			}
 
-			if (putVariable(st, argv[1], res) == false)
+			if (!putVariable(st, argv[0], argv[1], res))
 			{
-				fprintf(stderr, "%s: out of memory\n", argv[0]);
 				st->ecnt++;
-				return;
+				return true;
 			}
 
 			st->listen = 1;
@@ -998,7 +1134,7 @@ top:
 		{
 			char	   *var;
 			int			usec;
-			struct timeval now;
+			instr_time	now;
 
 			if (*argv[1] == ':')
 			{
@@ -1006,7 +1142,7 @@ top:
 				{
 					fprintf(stderr, "%s: undefined variable %s\n", argv[0], argv[1]);
 					st->ecnt++;
-					return;
+					return true;
 				}
 				usec = atoi(var);
 			}
@@ -1023,28 +1159,59 @@ top:
 			else
 				usec *= 1000000;
 
-			gettimeofday(&now, NULL);
-			st->until.tv_sec = now.tv_sec + (now.tv_usec + usec) / 1000000;
-			st->until.tv_usec = (now.tv_usec + usec) % 1000000;
+			INSTR_TIME_SET_CURRENT(now);
+			st->until = INSTR_TIME_GET_MICROSEC(now) + usec;
 			st->sleeping = 1;
 
 			st->listen = 1;
 		}
+		else if (pg_strcasecmp(argv[0], "setshell") == 0)
+		{
+			bool		ret = runShellCommand(st, argv[1], argv + 2, argc - 2);
+
+			if (timer_exceeded) /* timeout */
+				return clientDone(st, true);
+			else if (!ret)		/* on error */
+			{
+				st->ecnt++;
+				return true;
+			}
+			else	/* succeeded */
+				st->listen = 1;
+		}
+		else if (pg_strcasecmp(argv[0], "shell") == 0)
+		{
+			bool		ret = runShellCommand(st, NULL, argv + 1, argc - 1);
 
+			if (timer_exceeded) /* timeout */
+				return clientDone(st, true);
+			else if (!ret)		/* on error */
+			{
+				st->ecnt++;
+				return true;
+			}
+			else	/* succeeded */
+				st->listen = 1;
+		}
 		goto top;
 	}
+
+	return true;
 }
 
 /* discard connections */
 static void
-disconnect_all(CState *state)
+disconnect_all(CState *state, int length)
 {
 	int			i;
 
-	for (i = 0; i < nclients; i++)
+	for (i = 0; i < length; i++)
 	{
 		if (state[i].con)
+		{
 			PQfinish(state[i].con);
+			state[i].con = NULL;
+		}
 	}
 }
 
@@ -1176,8 +1343,8 @@ init(void)
 
 	for (i = 0; i < ntellers * scale; i++)
 	{
-		snprintf(sql, 256, "insert into pgbench_tellers(tid,bid,tbalance) values (%d,%d,0)"
-				 ,i + 1, i / ntellers + 1);
+		snprintf(sql, 256, "insert into pgbench_tellers(tid,bid,tbalance) values (%d,%d,0)",
+				 i + 1, i / ntellers + 1);
 		executeStatement(con, sql);
 	}
 
@@ -1386,6 +1553,26 @@ process_commands(char *buf)
 				return NULL;
 			}
 
+			/*
+			 * Split argument into number and unit to allow "sleep 1ms" etc.
+			 * We don't have to terminate the number argument with null
+			 * because it will be parsed with atoi, which ignores trailing
+			 * non-digit characters.
+			 */
+			if (my_commands->argv[1][0] != ':')
+			{
+				char	   *c = my_commands->argv[1];
+
+				while (isdigit((unsigned char) *c))
+					c++;
+				if (*c)
+				{
+					my_commands->argv[2] = c;
+					if (my_commands->argc < 3)
+						my_commands->argc = 3;
+				}
+			}
+
 			if (my_commands->argc >= 3)
 			{
 				if (pg_strcasecmp(my_commands->argv[2], "us") != 0 &&
@@ -1402,6 +1589,22 @@ process_commands(char *buf)
 				fprintf(stderr, "%s: extra argument \"%s\" ignored\n",
 						my_commands->argv[0], my_commands->argv[j]);
 		}
+		else if (pg_strcasecmp(my_commands->argv[0], "setshell") == 0)
+		{
+			if (my_commands->argc < 3)
+			{
+				fprintf(stderr, "%s: missing argument\n", my_commands->argv[0]);
+				return NULL;
+			}
+		}
+		else if (pg_strcasecmp(my_commands->argv[0], "shell") == 0)
+		{
+			if (my_commands->argc < 1)
+			{
+				fprintf(stderr, "%s: missing command\n", my_commands->argv[0]);
+				return NULL;
+			}
+		}
 		else
 		{
 			fprintf(stderr, "Invalid command %s\n", my_commands->argv[0]);
@@ -1572,25 +1775,18 @@ process_builtin(char *tb)
 
 /* print out results */
 static void
-printResults(
-			 int ttype, CState *state,
-			 struct timeval * start_time, struct timeval * end_time)
+printResults(int ttype, int normal_xacts, int nclients, int nthreads,
+			 instr_time total_time, instr_time conn_total_time)
 {
-	double		t1,
-				t2;
-	int			i;
-	int			normal_xacts = 0;
+	double		time_include,
+				tps_include,
+				tps_exclude;
 	char	   *s;
 
-	for (i = 0; i < nclients; i++)
-		normal_xacts += state[i].cnt;
-
-	t1 = (end_time->tv_sec - start_time->tv_sec) * 1000000.0 + (end_time->tv_usec - start_time->tv_usec);
-	t1 = normal_xacts * 1000000.0 / t1;
-
-	t2 = (end_time->tv_sec - start_time->tv_sec - conn_total_time.tv_sec) * 1000000.0 +
-		(end_time->tv_usec - start_time->tv_usec - conn_total_time.tv_usec);
-	t2 = normal_xacts * 1000000.0 / t2;
+	time_include = INSTR_TIME_GET_DOUBLE(total_time);
+	tps_include = normal_xacts / time_include;
+	tps_exclude = normal_xacts / (time_include -
+						(INSTR_TIME_GET_DOUBLE(conn_total_time) / nthreads));
 
 	if (ttype == 0)
 		s = "TPC-B (sort of)";
@@ -1605,6 +1801,7 @@ printResults(
 	printf("scaling factor: %d\n", scale);
 	printf("query mode: %s\n", QUERYMODE[querymode]);
 	printf("number of clients: %d\n", nclients);
+	printf("number of threads: %d\n", nthreads);
 	if (duration <= 0)
 	{
 		printf("number of transactions per client: %d\n", nxacts);
@@ -1617,8 +1814,8 @@ printResults(
 		printf("number of transactions actually processed: %d\n",
 			   normal_xacts);
 	}
-	printf("tps = %f (including connections establishing)\n", t1);
-	printf("tps = %f (excluding connections establishing)\n", t2);
+	printf("tps = %f (including connections establishing)\n", tps_include);
+	printf("tps = %f (excluding connections establishing)\n", tps_exclude);
 }
 
 
@@ -1626,29 +1823,26 @@ int
 main(int argc, char **argv)
 {
 	int			c;
+	int			nclients = 1;	/* default number of simulated clients */
+	int			nthreads = 1;	/* default number of threads */
 	int			is_init_mode = 0;		/* initialize mode? */
 	int			is_no_vacuum = 0;		/* no vacuum at all before testing? */
 	int			do_vacuum_accounts = 0; /* do vacuum accounts before testing? */
-	int			debug = 0;		/* debug flag */
 	int			ttype = 0;		/* transaction type. 0: TPC-B, 1: SELECT only,
 								 * 2: skip update of branches and tellers */
 	char	   *filename = NULL;
 	bool		scale_given = false;
 
 	CState	   *state;			/* status of clients */
+	TState	   *threads;		/* array of thread */
 
-	struct timeval start_time;	/* start up time */
-	struct timeval end_time;	/* end time */
+	instr_time	start_time;		/* start up time */
+	instr_time	total_time;
+	instr_time	conn_total_time;
+	int			total_xacts;
 
 	int			i;
 
-	fd_set		input_mask;
-	int			nsocks;			/* return from select(2) */
-	int			maxsock;		/* max socket number to be waited */
-	struct timeval now;
-	struct timeval timeout;
-	int			min_usec;
-
 #ifdef HAVE_GETRLIMIT
 	struct rlimit rlim;
 #endif
@@ -1699,9 +1893,9 @@ main(int argc, char **argv)
 	memset(state, 0, sizeof(*state));
 
 #ifdef PGXC
-	while ((c = getopt(argc, argv, "ih:knvp:dSNc:Cs:t:T:U:lf:D:F:M:")) != -1)
+	while ((c = getopt(argc, argv, "ih:knvp:dSNc:Cs:t:T:U:lf:D:F:M:j:")) != -1)
 #else
-	while ((c = getopt(argc, argv, "ih:nvp:dSNc:Cs:t:T:U:lf:D:F:M:")) != -1)
+	while ((c = getopt(argc, argv, "ih:nvp:dSNc:Cs:t:T:U:lf:D:F:M:j:")) != -1)
 #endif
 	{
 		switch (c)
@@ -1760,8 +1954,16 @@ main(int argc, char **argv)
 				}
 #endif   /* HAVE_GETRLIMIT */
 				break;
+			case 'j':			/* jobs */
+				nthreads = atoi(optarg);
+				if (nthreads <= 0)
+				{
+					fprintf(stderr, "invalid number of threads: %d\n", nthreads);
+					exit(1);
+				}
+				break;
 			case 'C':
-				is_connect = 1;
+				is_connect = true;
 				break;
 			case 's':
 				scale_given = true;
@@ -1821,11 +2023,8 @@ main(int argc, char **argv)
 					}
 
 					*p++ = '\0';
-					if (putVariable(&state[0], optarg, p) == false)
-					{
-						fprintf(stderr, "Couldn't allocate memory for variable\n");
+					if (!putVariable(&state[0], "option", optarg, p))
 						exit(1);
-					}
 				}
 				break;
 			case 'F':
@@ -1880,7 +2079,17 @@ main(int argc, char **argv)
 	if (nxacts <= 0 && duration <= 0)
 		nxacts = DEFAULT_NXACTS;
 
-	remains = nclients;
+	if (nclients % nthreads != 0)
+	{
+		fprintf(stderr, "number of clients (%d) must be a multiple of number of threads (%d)\n", nclients, nthreads);
+		exit(1);
+	}
+
+	/*
+	 * save main process id in the global variable because process id will be
+	 * changed after fork.
+	 */
+	main_pid = (int) getpid();
 
 	if (nclients > 1)
 	{
@@ -1898,31 +2107,15 @@ main(int argc, char **argv)
 		{
 			int			j;
 
+			state[i].id = i;
 			for (j = 0; j < state[0].nvariables; j++)
 			{
-				if (putVariable(&state[i], state[0].variables[j].name, state[0].variables[j].value) == false)
-				{
-					fprintf(stderr, "Couldn't allocate memory for variable\n");
+				if (!putVariable(&state[i], "startup", state[0].variables[j].name, state[0].variables[j].value))
 					exit(1);
-				}
 			}
 		}
 	}
 
-	if (use_log)
-	{
-		char		logpath[64];
-
-		snprintf(logpath, 64, "pgbench_log.%d", (int) getpid());
-		LOGFILE = fopen(logpath, "w");
-
-		if (LOGFILE == NULL)
-		{
-			fprintf(stderr, "Couldn't open logfile \"%s\": %s", logpath, strerror(errno));
-			exit(1);
-		}
-	}
-
 	if (debug)
 	{
 		if (duration <= 0)
@@ -1984,11 +2177,8 @@ main(int argc, char **argv)
 		snprintf(val, sizeof(val), "%d", scale);
 		for (i = 0; i < nclients; i++)
 		{
-			if (putVariable(&state[i], "scale", val) == false)
-			{
-				fprintf(stderr, "Couldn't allocate memory for variable\n");
+			if (!putVariable(&state[i], "startup", "scale", val))
 				exit(1);
-			}
 		}
 	}
 
@@ -2010,35 +2200,10 @@ main(int argc, char **argv)
 	PQfinish(con);
 
 	/* set random seed */
-	gettimeofday(&start_time, NULL);
-	srandom((unsigned int) start_time.tv_usec);
-
-	/* get start up time */
-	gettimeofday(&start_time, NULL);
-
-	/* set alarm if duration is specified. */
-	if (duration > 0)
-		setalarm(duration);
-
-	if (is_connect == 0)
-	{
-		struct timeval t,
-					now;
+	INSTR_TIME_SET_CURRENT(start_time);
+	srandom((unsigned int) INSTR_TIME_GET_MICROSEC(start_time));
 
-		/* make connections to the database */
-		for (i = 0; i < nclients; i++)
-		{
-			state[i].id = i;
-			if ((state[i].con = doConnect()) == NULL)
-				exit(1);
-		}
-		/* time after connections set up */
-		gettimeofday(&now, NULL);
-		diffTime(&now, &start_time, &t);
-		addTime(&conn_total_time, &t, &conn_total_time);
-	}
-
-	/* process bultin SQL scripts */
+	/* process builtin SQL scripts */
 	switch (ttype)
 	{
 		case 0:
@@ -2070,140 +2235,253 @@ main(int argc, char **argv)
 			break;
 	}
 
+	/* get start up time */
+	INSTR_TIME_SET_CURRENT(start_time);
+
+	/* set alarm if duration is specified. */
+	if (duration > 0)
+		setalarm(duration);
+
+	/* start threads */
+	threads = (TState *) malloc(sizeof(TState) * nthreads);
+	for (i = 0; i < nthreads; i++)
+	{
+		threads[i].tid = i;
+		threads[i].state = &state[nclients / nthreads * i];
+		threads[i].nstate = nclients / nthreads;
+		INSTR_TIME_SET_CURRENT(threads[i].start_time);
+
+		/* the first thread (i = 0) is executed by main thread */
+		if (i > 0)
+		{
+			int			err = pthread_create(&threads[i].thread, NULL, threadRun, &threads[i]);
+
+			if (err != 0 || threads[i].thread == INVALID_THREAD)
+			{
+				fprintf(stderr, "cannot create thread: %s\n", strerror(err));
+				exit(1);
+			}
+		}
+		else
+		{
+			threads[i].thread = INVALID_THREAD;
+		}
+	}
+
+	/* wait for threads and accumulate results */
+	total_xacts = 0;
+	INSTR_TIME_SET_ZERO(conn_total_time);
+	for (i = 0; i < nthreads; i++)
+	{
+		void	   *ret = NULL;
+
+		if (threads[i].thread == INVALID_THREAD)
+			ret = threadRun(&threads[i]);
+		else
+			pthread_join(threads[i].thread, &ret);
+
+		if (ret != NULL)
+		{
+			TResult    *r = (TResult *) ret;
+
+			total_xacts += r->xacts;
+			INSTR_TIME_ADD(conn_total_time, r->conn_time);
+			free(ret);
+		}
+	}
+	disconnect_all(state, nclients);
+
+	/* get end time */
+	INSTR_TIME_SET_CURRENT(total_time);
+	INSTR_TIME_SUBTRACT(total_time, start_time);
+	printResults(ttype, total_xacts, nclients, nthreads, total_time, conn_total_time);
+
+	return 0;
+}
+
+static void *
+threadRun(void *arg)
+{
+	TState	   *thread = (TState *) arg;
+	CState	   *state = thread->state;
+	TResult    *result;
+	FILE	   *logfile = NULL; /* per-thread log file */
+	instr_time	start,
+				end;
+	int			nstate = thread->nstate;
+	int			remains = nstate;		/* number of remaining clients */
+	int			i;
+
+	result = malloc(sizeof(TResult));
+	INSTR_TIME_SET_ZERO(result->conn_time);
+
+	/* open log file if requested */
+	if (use_log)
+	{
+		char		logpath[64];
+
+		if (thread->tid == 0)
+			snprintf(logpath, sizeof(logpath), "pgbench_log.%d", main_pid);
+		else
+			snprintf(logpath, sizeof(logpath), "pgbench_log.%d.%d", main_pid, thread->tid);
+		logfile = fopen(logpath, "w");
+
+		if (logfile == NULL)
+		{
+			fprintf(stderr, "Couldn't open logfile \"%s\": %s", logpath, strerror(errno));
+			goto done;
+		}
+	}
+
+	if (!is_connect)
+	{
+		/* make connections to the database */
+		for (i = 0; i < nstate; i++)
+		{
+			if ((state[i].con = doConnect()) == NULL)
+				goto done;
+		}
+	}
+
+	/* time after thread and connections set up */
+	INSTR_TIME_SET_CURRENT(result->conn_time);
+	INSTR_TIME_SUBTRACT(result->conn_time, thread->start_time);
+
 	/* send start up queries in async manner */
-	for (i = 0; i < nclients; i++)
+	for (i = 0; i < nstate; i++)
 	{
-		Command   **commands = sql_files[state[i].use_file];
-		int			prev_ecnt = state[i].ecnt;
+		CState	   *st = &state[i];
+		Command   **commands = sql_files[st->use_file];
+		int			prev_ecnt = st->ecnt;
 
-		state[i].use_file = getrand(0, num_files - 1);
-		doCustom(state, i, debug);
+		st->use_file = getrand(0, num_files - 1);
+		if (!doCustom(st, &result->conn_time, logfile))
+			remains--;			/* I've aborted */
 
-		if (state[i].ecnt > prev_ecnt && commands[state[i].state]->type == META_COMMAND)
+		if (st->ecnt > prev_ecnt && commands[st->state]->type == META_COMMAND)
 		{
-			fprintf(stderr, "Client %d aborted in state %d. Execution meta-command failed.\n", i, state[i].state);
+			fprintf(stderr, "Client %d aborted in state %d. Execution meta-command failed.\n", i, st->state);
 			remains--;			/* I've aborted */
-			PQfinish(state[i].con);
-			state[i].con = NULL;
+			PQfinish(st->con);
+			st->con = NULL;
 		}
 	}
 
-	for (;;)
+	while (remains > 0)
 	{
-		if (remains <= 0)
-		{						/* all done ? */
-			disconnect_all(state);
-			/* get end time */
-			gettimeofday(&end_time, NULL);
-			printResults(ttype, state, &start_time, &end_time);
-			if (LOGFILE)
-				fclose(LOGFILE);
-			exit(0);
-		}
+		fd_set		input_mask;
+		int			maxsock;	/* max socket number to be waited */
+		int64		now_usec = 0;
+		int64		min_usec;
 
 		FD_ZERO(&input_mask);
 
 		maxsock = -1;
-		min_usec = -1;
-		for (i = 0; i < nclients; i++)
+		min_usec = INT64_MAX;
+		for (i = 0; i < nstate; i++)
 		{
-			Command   **commands = sql_files[state[i].use_file];
+			CState	   *st = &state[i];
+			Command   **commands = sql_files[st->use_file];
+			int			sock;
 
-			if (state[i].sleeping)
+			if (st->sleeping)
 			{
 				int			this_usec;
-				int			sock = PQsocket(state[i].con);
 
-				if (min_usec < 0)
+				if (min_usec == INT64_MAX)
 				{
-					gettimeofday(&now, NULL);
-					min_usec = 0;
-				}
+					instr_time	now;
 
-				this_usec = (state[i].until.tv_sec - now.tv_sec) * 1000000 +
-					state[i].until.tv_usec - now.tv_usec;
+					INSTR_TIME_SET_CURRENT(now);
+					now_usec = INSTR_TIME_GET_MICROSEC(now);
+				}
 
-				if (this_usec > 0 && (min_usec == 0 || this_usec < min_usec))
+				this_usec = st->until - now_usec;
+				if (min_usec > this_usec)
 					min_usec = this_usec;
-
-				FD_SET		(sock, &input_mask);
-
-				if (maxsock < sock)
-					maxsock = sock;
 			}
-			else if (state[i].con && commands[state[i].state]->type != META_COMMAND)
+			else if (st->con == NULL)
 			{
-				int			sock = PQsocket(state[i].con);
-
-				if (sock < 0)
-				{
-					disconnect_all(state);
-					exit(1);
-				}
-				FD_SET		(sock, &input_mask);
+				continue;
+			}
+			else if (commands[st->state]->type == META_COMMAND)
+			{
+				min_usec = 0;	/* the connection is ready to run */
+				break;
+			}
 
-				if (maxsock < sock)
-					maxsock = sock;
+			sock = PQsocket(st->con);
+			if (sock < 0)
+			{
+				fprintf(stderr, "bad socket: %s\n", strerror(errno));
+				goto done;
 			}
+
+			FD_SET(sock, &input_mask);
+
+			if (maxsock < sock)
+				maxsock = sock;
 		}
 
-		if (maxsock != -1)
+		if (min_usec > 0 && maxsock != -1)
 		{
-			if (min_usec >= 0)
+			int			nsocks; /* return from select(2) */
+
+			if (min_usec != INT64_MAX)
 			{
+				struct timeval timeout;
+
 				timeout.tv_sec = min_usec / 1000000;
 				timeout.tv_usec = min_usec % 1000000;
-
-				nsocks = select(maxsock + 1, &input_mask, (fd_set *) NULL,
-								(fd_set *) NULL, &timeout);
+				nsocks = select(maxsock + 1, &input_mask, NULL, NULL, &timeout);
 			}
 			else
-				nsocks = select(maxsock + 1, &input_mask, (fd_set *) NULL,
-								(fd_set *) NULL, (struct timeval *) NULL);
+				nsocks = select(maxsock + 1, &input_mask, NULL, NULL, NULL);
 			if (nsocks < 0)
 			{
 				if (errno == EINTR)
 					continue;
 				/* must be something wrong */
-				disconnect_all(state);
 				fprintf(stderr, "select failed: %s\n", strerror(errno));
-				exit(1);
+				goto done;
 			}
-#ifdef NOT_USED
-			else if (nsocks == 0)
-			{					/* timeout */
-				fprintf(stderr, "select timeout\n");
-				for (i = 0; i < nclients; i++)
-				{
-					fprintf(stderr, "client %d:state %d cnt %d ecnt %d listen %d\n",
-							i, state[i].state, state[i].cnt, state[i].ecnt, state[i].listen);
-				}
-				exit(0);
-			}
-#endif
 		}
 
 		/* ok, backend returns reply */
-		for (i = 0; i < nclients; i++)
+		for (i = 0; i < nstate; i++)
 		{
-			Command   **commands = sql_files[state[i].use_file];
-			int			prev_ecnt = state[i].ecnt;
+			CState	   *st = &state[i];
+			Command   **commands = sql_files[st->use_file];
+			int			prev_ecnt = st->ecnt;
 
-			if (state[i].con && (FD_ISSET(PQsocket(state[i].con), &input_mask)
-						  || commands[state[i].state]->type == META_COMMAND))
+			if (st->con && (FD_ISSET(PQsocket(st->con), &input_mask)
+							|| commands[st->state]->type == META_COMMAND))
 			{
-				doCustom(state, i, debug);
+				if (!doCustom(st, &result->conn_time, logfile))
+					remains--;	/* I've aborted */
 			}
 
-			if (state[i].ecnt > prev_ecnt && commands[state[i].state]->type == META_COMMAND)
+			if (st->ecnt > prev_ecnt && commands[st->state]->type == META_COMMAND)
 			{
-				fprintf(stderr, "Client %d aborted in state %d. Execution of meta-command failed.\n", i, state[i].state);
+				fprintf(stderr, "Client %d aborted in state %d. Execution of meta-command failed.\n", i, st->state);
 				remains--;		/* I've aborted */
-				PQfinish(state[i].con);
-				state[i].con = NULL;
+				PQfinish(st->con);
+				st->con = NULL;
 			}
 		}
 	}
+
+done:
+	INSTR_TIME_SET_CURRENT(start);
+	disconnect_all(state, nstate);
+	result->xacts = 0;
+	for (i = 0; i < nstate; i++)
+		result->xacts += state[i].cnt;
+	INSTR_TIME_SET_CURRENT(end);
+	INSTR_TIME_ACCUM_DIFF(result->conn_time, end, start);
+	if (logfile)
+		fclose(logfile);
+	return result;
 }
 
 
@@ -2225,6 +2503,97 @@ setalarm(int seconds)
 	pqsignal(SIGALRM, handle_sig_alarm);
 	alarm(seconds);
 }
+
+#ifndef ENABLE_THREAD_SAFETY
+
+/*
+ * implements pthread using fork.
+ */
+
+typedef struct fork_pthread
+{
+	pid_t		pid;
+	int			pipes[2];
+}	fork_pthread;
+
+static int
+pthread_create(pthread_t *thread,
+			   pthread_attr_t *attr,
+			   void *(*start_routine) (void *),
+			   void *arg)
+{
+	fork_pthread *th;
+	void	   *ret;
+	instr_time	start_time;
+
+	th = (fork_pthread *) malloc(sizeof(fork_pthread));
+	pipe(th->pipes);
+
+	th->pid = fork();
+	if (th->pid == -1)			/* error */
+	{
+		free(th);
+		return errno;
+	}
+	if (th->pid != 0)			/* in parent process */
+	{
+		close(th->pipes[1]);
+		*thread = th;
+		return 0;
+	}
+
+	/* in child process */
+	close(th->pipes[0]);
+
+	/* set alarm again because the child does not inherit timers */
+	if (duration > 0)
+		setalarm(duration);
+
+	/*
+	 * Set a different random seed in each child process.  Otherwise they all
+	 * inherit the parent's state and generate the same "random" sequence. (In
+	 * the threaded case, the different threads will obtain subsets of the
+	 * output of a single random() sequence, which should be okay for our
+	 * purposes.)
+	 */
+	INSTR_TIME_SET_CURRENT(start_time);
+	srandom(((unsigned int) INSTR_TIME_GET_MICROSEC(start_time)) +
+			((unsigned int) getpid()));
+
+	ret = start_routine(arg);
+	write(th->pipes[1], ret, sizeof(TResult));
+	close(th->pipes[1]);
+	free(th);
+	exit(0);
+}
+
+static int
+pthread_join(pthread_t th, void **thread_return)
+{
+	int			status;
+
+	while (waitpid(th->pid, &status, 0) != th->pid)
+	{
+		if (errno != EINTR)
+			return errno;
+	}
+
+	if (thread_return != NULL)
+	{
+		/* assume result is TResult */
+		*thread_return = malloc(sizeof(TResult));
+		if (read(th->pipes[0], *thread_return, sizeof(TResult)) != sizeof(TResult))
+		{
+			free(*thread_return);
+			*thread_return = NULL;
+		}
+	}
+	close(th->pipes[0]);
+
+	free(th);
+	return 0;
+}
+#endif
 #else							/* WIN32 */
 
 static VOID CALLBACK
@@ -2251,4 +2620,70 @@ setalarm(int seconds)
 	}
 }
 
+/* partial pthread implementation for Windows */
+
+typedef struct win32_pthread
+{
+	HANDLE		handle;
+	void	   *(*routine) (void *);
+	void	   *arg;
+	void	   *result;
+}	win32_pthread;
+
+static unsigned __stdcall
+win32_pthread_run(void *arg)
+{
+	win32_pthread *th = (win32_pthread *) arg;
+
+	th->result = th->routine(th->arg);
+
+	return 0;
+}
+
+static int
+pthread_create(pthread_t *thread,
+			   pthread_attr_t *attr,
+			   void *(*start_routine) (void *),
+			   void *arg)
+{
+	int			save_errno;
+	win32_pthread *th;
+
+	th = (win32_pthread *) malloc(sizeof(win32_pthread));
+	th->routine = start_routine;
+	th->arg = arg;
+	th->result = NULL;
+
+	th->handle = (HANDLE) _beginthreadex(NULL, 0, win32_pthread_run, th, 0, NULL);
+	if (th->handle == NULL)
+	{
+		save_errno = errno;
+		free(th);
+		return save_errno;
+	}
+
+	*thread = th;
+	return 0;
+}
+
+static int
+pthread_join(pthread_t th, void **thread_return)
+{
+	if (th == NULL || th->handle == NULL)
+		return errno = EINVAL;
+
+	if (WaitForSingleObject(th->handle, INFINITE) != WAIT_OBJECT_0)
+	{
+		_dosmaperr(GetLastError());
+		return errno;
+	}
+
+	if (thread_return)
+		*thread_return = th->result;
+
+	CloseHandle(th->handle);
+	free(th);
+	return 0;
+}
+
 #endif   /* WIN32 */
diff --git a/contrib/pgcrypto/expected/3des.out b/contrib/pgcrypto/expected/3des.out
index 3e6a88e8bf..8983a73b8a 100644
--- a/contrib/pgcrypto/expected/3des.out
+++ b/contrib/pgcrypto/expected/3des.out
@@ -1,6 +1,8 @@
 --
 -- 3DES cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 -- test vector from somewhere
 SELECT encode(encrypt(
 decode('80 00 00 00 00 00 00 00', 'hex'),
diff --git a/contrib/pgcrypto/expected/blowfish.out b/contrib/pgcrypto/expected/blowfish.out
index 5c09cf5cd9..86c3244cec 100644
--- a/contrib/pgcrypto/expected/blowfish.out
+++ b/contrib/pgcrypto/expected/blowfish.out
@@ -1,6 +1,8 @@
 --
 -- Blowfish cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 -- some standard Blowfish testvalues
 SELECT encode(encrypt(
 decode('0000000000000000', 'hex'),
diff --git a/contrib/pgcrypto/expected/cast5.out b/contrib/pgcrypto/expected/cast5.out
index 4ca824e2f8..c1ecd9197f 100644
--- a/contrib/pgcrypto/expected/cast5.out
+++ b/contrib/pgcrypto/expected/cast5.out
@@ -1,6 +1,8 @@
 --
 -- Cast5 cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 -- test vectors from RFC2144
 -- 128 bit key
 SELECT encode(encrypt(
diff --git a/contrib/pgcrypto/expected/crypt-blowfish.out b/contrib/pgcrypto/expected/crypt-blowfish.out
index 329d78f625..8a8b007181 100644
--- a/contrib/pgcrypto/expected/crypt-blowfish.out
+++ b/contrib/pgcrypto/expected/crypt-blowfish.out
@@ -17,7 +17,7 @@ CREATE TABLE ctest (data text, res text, salt text);
 INSERT INTO ctest VALUES ('password', '', '');
 UPDATE ctest SET salt = gen_salt('bf', 8);
 UPDATE ctest SET res = crypt(data, salt);
-SELECT res = crypt(data, res) AS "worked"
+SELECT res = crypt(data, res) AS "worked" 
 FROM ctest;
  worked 
 --------
diff --git a/contrib/pgcrypto/expected/des.out b/contrib/pgcrypto/expected/des.out
index 00513c4e6a..d0fd0041ca 100644
--- a/contrib/pgcrypto/expected/des.out
+++ b/contrib/pgcrypto/expected/des.out
@@ -1,6 +1,8 @@
 --
 -- DES cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 -- no official test vectors atm
 -- from blowfish.sql
 SELECT encode(encrypt(
diff --git a/contrib/pgcrypto/expected/init.out b/contrib/pgcrypto/expected/init.out
index 6a5710d5a1..4cb1081997 100644
--- a/contrib/pgcrypto/expected/init.out
+++ b/contrib/pgcrypto/expected/init.out
@@ -8,6 +8,8 @@
 SET client_min_messages = warning;
 \set ECHO none
 RESET client_min_messages;
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 -- check for encoding fn's
 SELECT encode('foo', 'hex');
  encode 
diff --git a/contrib/pgcrypto/expected/pgp-armor.out b/contrib/pgcrypto/expected/pgp-armor.out
index 1655f13318..c95549412e 100644
--- a/contrib/pgcrypto/expected/pgp-armor.out
+++ b/contrib/pgcrypto/expected/pgp-armor.out
@@ -1,50 +1,52 @@
 --
 -- PGP Armor
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 select armor('');
             armor            
 -----------------------------
- -----BEGIN PGP MESSAGE-----
-                            
- =twTO                      
- -----END PGP MESSAGE-----  
-                            
+ -----BEGIN PGP MESSAGE-----+
+                            +
+ =twTO                      +
+ -----END PGP MESSAGE-----  +
+ 
 (1 row)
 
 select armor('test');
             armor            
 -----------------------------
- -----BEGIN PGP MESSAGE-----
-                            
- dGVzdA==                   
- =+G7Q                      
- -----END PGP MESSAGE-----  
-                            
+ -----BEGIN PGP MESSAGE-----+
+                            +
+ dGVzdA==                   +
+ =+G7Q                      +
+ -----END PGP MESSAGE-----  +
+ 
 (1 row)
 
 select dearmor(armor(''));
  dearmor 
 ---------
-        
+ 
 (1 row)
 
 select dearmor(armor('zooka'));
  dearmor 
 ---------
- zooka  
+ zooka
 (1 row)
 
 select armor('0123456789abcdef0123456789abcdef0123456789abcdef
 0123456789abcdef0123456789abcdef0123456789abcdef');
                                     armor                                     
 ------------------------------------------------------------------------------
- -----BEGIN PGP MESSAGE-----                                                 
-                                                                             
- MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWYwMTIzNDU2Nzg5YWJjZGVmCjAxMjM0NTY3
- ODlhYmNkZWYwMTIzNDU2Nzg5YWJjZGVmMDEyMzQ1Njc4OWFiY2RlZg==                    
- =JFw5                                                                       
- -----END PGP MESSAGE-----                                                   
-                                                                             
+ -----BEGIN PGP MESSAGE-----                                                 +
+                                                                             +
+ MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWYwMTIzNDU2Nzg5YWJjZGVmCjAxMjM0NTY3+
+ ODlhYmNkZWYwMTIzNDU2Nzg5YWJjZGVmMDEyMzQ1Njc4OWFiY2RlZg==                    +
+ =JFw5                                                                       +
+ -----END PGP MESSAGE-----                                                   +
+ 
 (1 row)
 
 -- lots formatting
@@ -60,7 +62,7 @@ em9va2E=
 -----END PGP MESSAGE-----');
  dearmor 
 ---------
- zooka  
+ zooka
 (1 row)
 
 -- lots messages
@@ -88,7 +90,7 @@ d3Jvbmc=
 ');
  dearmor 
 ---------
- right  
+ right
 (1 row)
 
 -- bad crc
diff --git a/contrib/pgcrypto/expected/pgp-decrypt.out b/contrib/pgcrypto/expected/pgp-decrypt.out
index 8ecb56f009..859f4d681b 100644
--- a/contrib/pgcrypto/expected/pgp-decrypt.out
+++ b/contrib/pgcrypto/expected/pgp-decrypt.out
@@ -11,7 +11,7 @@ yA6Ce1QTMK3KdL2MPfamsTUSAML8huCJMwYQFfE=
 =JcP+
 -----END PGP MESSAGE-----
 '), 'foobar');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
@@ -25,7 +25,7 @@ UTAsG35A1vYs02VARKzGz6xI2UHwFUirP+brPBg3Ee7muOx8pA==
 =XtrP
 -----END PGP MESSAGE-----
 '), 'foobar');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
@@ -39,7 +39,7 @@ jA0ECAMCI7YQpWqp3D1g0kQBCjB7GlX7+SQeXNleXeXQ78ZAPNliquGDq9u378zI
 =rCZt
 -----END PGP MESSAGE-----
 '), 'foobar');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
@@ -53,7 +53,7 @@ lceMfQdbAg6oTFyJpk/wH18GzRDphCofg0X8uLgkAKMrpcmgog==
 =fB6S
 -----END PGP MESSAGE-----
 '), 'foobar');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
@@ -68,7 +68,7 @@ u9YkgfJfsuRJmgQ9tmo=
 =60ui
 -----END PGP MESSAGE-----
 '), 'foobar');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
@@ -82,7 +82,7 @@ jA0EBwMCEeP3idNjQ1Bg0kQBf4G0wX+2QNzLh2YNwYkQgQkfYhn/hLXjV4nK9nsE
 =moGf
 -----END PGP MESSAGE-----
 '), 'foobar');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
@@ -97,7 +97,7 @@ KyRrHf7zEBuZiZ2AG34jNVMOLToj1jJUg5zTSdecUzQVCykWTA==
 =NyLk
 -----END PGP MESSAGE-----
 '), 'foobar');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
@@ -111,7 +111,7 @@ jA0EBwMCApbdlrURoWJg0kQBzHM/E0o7djY82bNuspjxjAcPFrrtp0uvDdMQ4z2m
 =FxbQ
 -----END PGP MESSAGE-----
 '), 'foobar');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
@@ -126,7 +126,7 @@ Ah9GXjGS1TVALzTImJbz1uHUZRfhJlFbc5yGQw==
 =YvkV
 -----END PGP MESSAGE-----
 '), 'foobar');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
@@ -140,7 +140,7 @@ jAwEBwEC/QTByBLI3b/SRAHPxKzI6SZBo5lAEOD+EsvKQWO4adL9tDY+++Iqy1xK
 =dbXm
 -----END PGP MESSAGE-----
 '), 'foobar');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
@@ -154,7 +154,7 @@ z+9ZaA/XdSx5ZiFnMym8P6r8uY9rLjjNptvvRHlxIReF+p9MNg==
 =VJKg
 -----END PGP MESSAGE-----
 '), 'foobar');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
@@ -168,7 +168,7 @@ Cr3i2M7TgVZ0M4jp4QL0adG1lpN5iK7aQeOwMw==
 =cg+i
 -----END PGP MESSAGE-----
 '), 'foobar');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
@@ -182,7 +182,7 @@ jAwECAECruOfyNDFiTnSRAEVoGXm4A9UZKkWljdzjEO/iaE7mIraltIpQMkiqCh9
 =aHmC
 -----END PGP MESSAGE-----
 '), 'foobar');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
@@ -196,7 +196,7 @@ q6eF6859ZVnli3BFSDSk3a4e/pXhglxmDYCfjAXkozKNYLo6yw==
 =K0LS
 -----END PGP MESSAGE-----
 '), 'foobar');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
@@ -210,7 +210,7 @@ rQr3WbdKdY9ufjOE5+mXI+EFkSPrF9rL9NCq6w==
 =RGts
 -----END PGP MESSAGE-----
 '), 'foobar');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
@@ -224,7 +224,7 @@ jAwECQECKHhrou7ZOIXSRAHWIVP+xjVQcjAVBTt+qh9SNzYe248xFTwozkwev3mO
 =SUrU
 -----END PGP MESSAGE-----
 '), 'foobar');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
@@ -238,7 +238,7 @@ jA0ECQMCjc8lwZu8Fz1g0kQBkEzjImi21liep5jj+3dAJ2aZFfUkohi8b3n9z+7+
 =XZrG
 -----END PGP MESSAGE-----
 '), 'foobar');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
@@ -253,7 +253,7 @@ tTGup1mMz6Cfh1uDRErUuXpx9A0gdMu7zX0o5XjrL7WGDAZdSw==
 =XKKG
 -----END PGP MESSAGE-----
 '), '0123456789abcdefghij');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
@@ -267,7 +267,7 @@ CMxFKadf144H/vpoV9GA0f22keQgCl0EsTE4V4lweVOPTKCMJg==
 =gWDh
 -----END PGP MESSAGE-----
 '), '0123456789abcdefghij2jk4h5g2j54khg23h54g2kh54g2khj54g23hj54');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
@@ -281,7 +281,7 @@ FwsDabdQUz5O7bgNSnxfmyw1OifGF+W2bIn/8W+0rDf8u3+O+Q==
 =OxOF
 -----END PGP MESSAGE-----
 '), 'x');
-   pgp_sym_decrypt   
+ pgp_sym_decrypt 
 -----------------
  Secret message.
 (1 row)
diff --git a/contrib/pgcrypto/expected/pgp-encrypt.out b/contrib/pgcrypto/expected/pgp-encrypt.out
index 637b473837..8ef3875fd6 100644
--- a/contrib/pgcrypto/expected/pgp-encrypt.out
+++ b/contrib/pgcrypto/expected/pgp-encrypt.out
@@ -1,6 +1,8 @@
 --
 -- PGP encrypt
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 select pgp_sym_decrypt(pgp_sym_encrypt('Secret.', 'key'), 'key');
  pgp_sym_decrypt 
 -----------------
diff --git a/contrib/pgcrypto/expected/pgp-pubkey-encrypt.out b/contrib/pgcrypto/expected/pgp-pubkey-encrypt.out
index e222541c24..df2756c4d0 100644
--- a/contrib/pgcrypto/expected/pgp-pubkey-encrypt.out
+++ b/contrib/pgcrypto/expected/pgp-pubkey-encrypt.out
@@ -1,6 +1,8 @@
 --
 -- PGP Public Key Encryption
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 -- successful encrypt/decrypt
 select pgp_pub_decrypt(
 	pgp_pub_encrypt('Secret msg', dearmor(pubkey)),
diff --git a/contrib/pgcrypto/expected/rijndael.out b/contrib/pgcrypto/expected/rijndael.out
index cb336e335d..106181ef22 100644
--- a/contrib/pgcrypto/expected/rijndael.out
+++ b/contrib/pgcrypto/expected/rijndael.out
@@ -1,6 +1,8 @@
 --
 -- AES / Rijndael-128 cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 -- some standard Rijndael testvalues
 SELECT encode(encrypt(
 decode('00112233445566778899aabbccddeeff', 'hex'),
diff --git a/contrib/pgcrypto/imath.c b/contrib/pgcrypto/imath.c
index 35dc652d43..51f1f00e30 100644
--- a/contrib/pgcrypto/imath.c
+++ b/contrib/pgcrypto/imath.c
@@ -2,7 +2,7 @@
 /*
   Name:		imath.c
   Purpose:	Arbitrary precision integer arithmetic routines.
-  Author:	M. J. Fromberger <http://www.dartmouth.edu/~sting/>
+  Author:	M. J. Fromberger <http://spinning-yarns.org/michael/sw/>
   Info:		Id: imath.c 21 2006-04-02 18:58:36Z sting
 
   Copyright (C) 2002 Michael J. Fromberger, All Rights Reserved.
@@ -27,7 +27,7 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   SOFTWARE.
  */
-/* $PostgreSQL: pgsql/contrib/pgcrypto/imath.c,v 1.8 2009/06/11 14:48:52 momjian Exp $ */
+/* $PostgreSQL: pgsql/contrib/pgcrypto/imath.c,v 1.9 2010/04/02 15:21:20 mha Exp $ */
 
 #include "postgres.h"
 #include "px.h"
diff --git a/contrib/pgcrypto/imath.h b/contrib/pgcrypto/imath.h
index 09d0e3e818..c7b29cf3a5 100644
--- a/contrib/pgcrypto/imath.h
+++ b/contrib/pgcrypto/imath.h
@@ -1,7 +1,7 @@
 /*
   Name:		imath.h
   Purpose:	Arbitrary precision integer arithmetic routines.
-  Author:	M. J. Fromberger <http://www.dartmouth.edu/~sting/>
+  Author:	M. J. Fromberger <http://spinning-yarns.org/michael/sw/>
   Info:		Id: imath.h 21 2006-04-02 18:58:36Z sting
 
   Copyright (C) 2002 Michael J. Fromberger, All Rights Reserved.
@@ -26,7 +26,7 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   SOFTWARE.
  */
-/* $PostgreSQL: pgsql/contrib/pgcrypto/imath.h,v 1.7 2009/06/11 14:48:52 momjian Exp $ */
+/* $PostgreSQL: pgsql/contrib/pgcrypto/imath.h,v 1.8 2010/04/02 15:21:20 mha Exp $ */
 
 #ifndef IMATH_H_
 #define IMATH_H_
diff --git a/contrib/pgcrypto/sha1.c b/contrib/pgcrypto/sha1.c
index 45339a1235..94849a78c5 100644
--- a/contrib/pgcrypto/sha1.c
+++ b/contrib/pgcrypto/sha1.c
@@ -28,11 +28,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $PostgreSQL: pgsql/contrib/pgcrypto/sha1.c,v 1.17 2007/04/06 05:36:50 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pgcrypto/sha1.c,v 1.18 2010/04/02 15:21:20 mha Exp $
  */
 /*
  * FIPS pub 180-1: Secure Hash Algorithm (SHA-1)
- * based on: http://csrc.nist.gov/fips/fip180-1.txt
+ * based on: http://www.itl.nist.gov/fipspubs/fip180-1.htm
  * implemented by Jun-ichiro itojun Itoh <[email protected]>
  */
 
diff --git a/contrib/pgcrypto/sha1.h b/contrib/pgcrypto/sha1.h
index ae830fccad..ccd925b75e 100644
--- a/contrib/pgcrypto/sha1.h
+++ b/contrib/pgcrypto/sha1.h
@@ -1,4 +1,4 @@
-/*	$PostgreSQL: pgsql/contrib/pgcrypto/sha1.h,v 1.9 2003/11/29 22:39:28 pgsql Exp $ */
+/*	$PostgreSQL: pgsql/contrib/pgcrypto/sha1.h,v 1.10 2010/04/02 15:21:20 mha Exp $ */
 /*	   $KAME: sha1.h,v 1.4 2000/02/22 14:01:18 itojun Exp $    */
 
 /*
@@ -31,7 +31,7 @@
  */
 /*
  * FIPS pub 180-1: Secure Hash Algorithm (SHA-1)
- * based on: http://csrc.nist.gov/fips/fip180-1.txt
+ * based on: http://www.itl.nist.gov/fipspubs/fip180-1.htm
  * implemented by Jun-ichiro itojun Itoh <[email protected]>
  */
 
diff --git a/contrib/pgcrypto/sha2.c b/contrib/pgcrypto/sha2.c
index 9cd58a08ab..d65995456c 100644
--- a/contrib/pgcrypto/sha2.c
+++ b/contrib/pgcrypto/sha2.c
@@ -33,7 +33,7 @@
  *
  * $From: sha2.c,v 1.1 2001/11/08 00:01:51 adg Exp adg $
  *
- * $PostgreSQL: pgsql/contrib/pgcrypto/sha2.c,v 1.11 2009/06/11 14:48:52 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/pgcrypto/sha2.c,v 1.13 2010/07/06 19:18:55 momjian Exp $
  */
 
 #include "postgres.h"
@@ -98,8 +98,8 @@
  *
  *	 NOTE:	The naming of R and S appears backwards here (R is a SHIFT and
  *	 S is a ROTATION) because the SHA-256/384/512 description document
- *	 (see http://csrc.nist.gov/cryptval/shs/sha256-384-512.pdf) uses this
- *	 same "backwards" definition.
+ *	 (see http://www.iwar.org.uk/comsec/resources/cipher/sha256-384-512.pdf)
+ *	 uses this same "backwards" definition.
  */
 /* Shift-right (used in SHA-256, SHA-384, and SHA-512): */
 #define R(b,x)		((x) >> (b))
diff --git a/contrib/pgcrypto/sql/3des.sql b/contrib/pgcrypto/sql/3des.sql
index 99b936fa14..274d7d81f6 100644
--- a/contrib/pgcrypto/sql/3des.sql
+++ b/contrib/pgcrypto/sql/3des.sql
@@ -1,6 +1,8 @@
 --
 -- 3DES cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 
 -- test vector from somewhere
 SELECT encode(encrypt(
diff --git a/contrib/pgcrypto/sql/blowfish.sql b/contrib/pgcrypto/sql/blowfish.sql
index c0383f5421..1a8536d686 100644
--- a/contrib/pgcrypto/sql/blowfish.sql
+++ b/contrib/pgcrypto/sql/blowfish.sql
@@ -1,6 +1,8 @@
 --
 -- Blowfish cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 
 -- some standard Blowfish testvalues
 SELECT encode(encrypt(
diff --git a/contrib/pgcrypto/sql/cast5.sql b/contrib/pgcrypto/sql/cast5.sql
index 0761f34e75..599ee060fa 100644
--- a/contrib/pgcrypto/sql/cast5.sql
+++ b/contrib/pgcrypto/sql/cast5.sql
@@ -1,6 +1,8 @@
 --
 -- Cast5 cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 
 -- test vectors from RFC2144
 
diff --git a/contrib/pgcrypto/sql/des.sql b/contrib/pgcrypto/sql/des.sql
index 179bd83ba9..0b3d339251 100644
--- a/contrib/pgcrypto/sql/des.sql
+++ b/contrib/pgcrypto/sql/des.sql
@@ -1,6 +1,8 @@
 --
 -- DES cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 
 -- no official test vectors atm
 
diff --git a/contrib/pgcrypto/sql/init.sql b/contrib/pgcrypto/sql/init.sql
index a58b3f0144..ee1c231bdc 100644
--- a/contrib/pgcrypto/sql/init.sql
+++ b/contrib/pgcrypto/sql/init.sql
@@ -12,6 +12,9 @@ SET client_min_messages = warning;
 \set ECHO all
 RESET client_min_messages;
 
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
+
 -- check for encoding fn's
 SELECT encode('foo', 'hex');
 SELECT decode('666f6f', 'hex');
diff --git a/contrib/pgcrypto/sql/pgp-armor.sql b/contrib/pgcrypto/sql/pgp-armor.sql
index 040c4ac038..71ffba26a0 100644
--- a/contrib/pgcrypto/sql/pgp-armor.sql
+++ b/contrib/pgcrypto/sql/pgp-armor.sql
@@ -1,6 +1,8 @@
 --
 -- PGP Armor
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 
 select armor('');
 select armor('test');
diff --git a/contrib/pgcrypto/sql/pgp-encrypt.sql b/contrib/pgcrypto/sql/pgp-encrypt.sql
index 03b34c8ad2..218bd419e5 100644
--- a/contrib/pgcrypto/sql/pgp-encrypt.sql
+++ b/contrib/pgcrypto/sql/pgp-encrypt.sql
@@ -1,6 +1,8 @@
 --
 -- PGP encrypt
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 
 select pgp_sym_decrypt(pgp_sym_encrypt('Secret.', 'key'), 'key');
 
diff --git a/contrib/pgcrypto/sql/pgp-pubkey-encrypt.sql b/contrib/pgcrypto/sql/pgp-pubkey-encrypt.sql
index 62dd487c10..2c4e622e5c 100644
--- a/contrib/pgcrypto/sql/pgp-pubkey-encrypt.sql
+++ b/contrib/pgcrypto/sql/pgp-pubkey-encrypt.sql
@@ -1,6 +1,8 @@
 --
 -- PGP Public Key Encryption
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 
 -- successful encrypt/decrypt
 select pgp_pub_decrypt(
diff --git a/contrib/pgcrypto/sql/rijndael.sql b/contrib/pgcrypto/sql/rijndael.sql
index 4d6af0ffaa..428ad1332c 100644
--- a/contrib/pgcrypto/sql/rijndael.sql
+++ b/contrib/pgcrypto/sql/rijndael.sql
@@ -1,6 +1,8 @@
 --
 -- AES / Rijndael-128 cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 
 -- some standard Rijndael testvalues
 SELECT encode(encrypt(
diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c
index 5d6168f77d..994773a9d7 100644
--- a/contrib/pgstattuple/pgstattuple.c
+++ b/contrib/pgstattuple/pgstattuple.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.38 2009/06/11 14:48:52 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.39 2010/04/02 16:16:51 tgl Exp $
  *
  * Copyright (c) 2001,2002	Tatsuo Ishii
  *
@@ -276,6 +276,8 @@ pgstat_heap(Relation rel, FunctionCallInfo fcinfo)
 	/* scan the relation */
 	while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
 	{
+		CHECK_FOR_INTERRUPTS();
+
 		/* must hold a buffer lock to call HeapTupleSatisfiesVisibility */
 		LockBuffer(scan->rs_cbuf, BUFFER_LOCK_SHARE);
 
@@ -302,6 +304,8 @@ pgstat_heap(Relation rel, FunctionCallInfo fcinfo)
 
 		while (block <= tupblock)
 		{
+			CHECK_FOR_INTERRUPTS();
+
 			buffer = ReadBuffer(rel, block);
 			LockBuffer(buffer, BUFFER_LOCK_SHARE);
 			stat.free_space += PageGetHeapFreeSpace((Page) BufferGetPage(buffer));
@@ -313,6 +317,8 @@ pgstat_heap(Relation rel, FunctionCallInfo fcinfo)
 
 	while (block < nblocks)
 	{
+		CHECK_FOR_INTERRUPTS();
+
 		buffer = ReadBuffer(rel, block);
 		LockBuffer(buffer, BUFFER_LOCK_SHARE);
 		stat.free_space += PageGetHeapFreeSpace((Page) BufferGetPage(buffer));
@@ -468,7 +474,11 @@ pgstat_index(Relation rel, BlockNumber start, pgstat_page pagefn,
 		}
 
 		for (; blkno < nblocks; blkno++)
+		{
+			CHECK_FOR_INTERRUPTS();
+
 			pagefn(&stat, rel, blkno);
+		}
 	}
 
 	relation_close(rel, AccessShareLock);
diff --git a/contrib/seg/Makefile b/contrib/seg/Makefile
index 31012da344..c6a5ef4efe 100644
--- a/contrib/seg/Makefile
+++ b/contrib/seg/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/seg/Makefile,v 1.21 2008/08/29 13:02:32 petere Exp $
+# $PostgreSQL: pgsql/contrib/seg/Makefile,v 1.22 2009/08/28 20:26:18 petere Exp $
 
 MODULE_big = seg
 OBJS = seg.o segparse.o
@@ -21,23 +21,23 @@ endif
 
 
 # segscan is compiled as part of segparse
-segparse.o: $(srcdir)/segscan.c
+segparse.o: segscan.c
 
-$(srcdir)/segparse.c: segparse.y
+segparse.c: segparse.y
 ifdef BISON
 	$(BISON) $(BISONFLAGS) -o $@ $<
 else
 	@$(missing) bison $< $@
 endif
 
-$(srcdir)/segscan.c: segscan.l
+segscan.c: segscan.l
 ifdef FLEX
 	$(FLEX) $(FLEXFLAGS) -o'$@' $<
 else
 	@$(missing) flex $< $@
 endif
 
-distprep: $(srcdir)/segparse.c $(srcdir)/segscan.c
+distprep: segparse.c segscan.c
 
 maintainer-clean:
-	rm -f $(srcdir)/segparse.c $(srcdir)/segscan.c
+	rm -f segparse.c segscan.c
diff --git a/contrib/spi/Makefile b/contrib/spi/Makefile
index ed7d551c70..7a078a9b0e 100644
--- a/contrib/spi/Makefile
+++ b/contrib/spi/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/spi/Makefile,v 1.28 2007/12/03 04:22:54 tgl Exp $
+# $PostgreSQL: pgsql/contrib/spi/Makefile,v 1.29 2010/07/05 23:15:56 tgl Exp $
 
 MODULES = autoinc insert_username moddatetime refint timetravel
 DATA_built = $(addsuffix .sql, $(MODULES))
@@ -8,6 +8,8 @@ DOCS = $(addsuffix .example, $(MODULES))
 # comment out if you want a quieter refint package for other uses
 PG_CPPFLAGS = -DREFINT_VERBOSE
 
+LDFLAGS_SL += -L$(top_builddir)/src/port -lpgport
+
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -18,5 +20,3 @@ top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
-
-SHLIB_LINK += -L$(top_builddir)/src/port -lpgport
diff --git a/contrib/start-scripts/freebsd b/contrib/start-scripts/freebsd
index 528fc776c7..e7338c0332 100644
--- a/contrib/start-scripts/freebsd
+++ b/contrib/start-scripts/freebsd
@@ -6,7 +6,7 @@
 # Created through merger of the Linux start script by Ryan Kirkpatrick
 # and the script in the FreeBSD ports collection.
 
-# $PostgreSQL: pgsql/contrib/start-scripts/freebsd,v 1.4 2004/10/01 18:30:21 tgl Exp $
+# $PostgreSQL: pgsql/contrib/start-scripts/freebsd,v 1.7 2010/02/23 22:17:25 momjian Exp $
 
 ## EDIT FROM HERE
 
@@ -27,16 +27,20 @@ PGLOG="$PGDATA/serverlog"
 # The path that is to be used for the script
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
-# What to use to start up the postmaster (we do NOT use pg_ctl for this,
-# as it adds no value and can cause the postmaster to misrecognize a stale
-# lock file)
+# What to use to start up the postmaster.  (If you want the script to wait
+# until the server has started, you could use "pg_ctl start -w" here.
+# But without -w, pg_ctl adds no value.)
 DAEMON="$prefix/bin/postmaster"
 
 # What to use to shut down the postmaster
 PGCTL="$prefix/bin/pg_ctl"
 
 # Only start if we can find the postmaster.
-test -x "$DAEMON" || exit 0
+test -x $DAEMON ||
+{
+	echo "$DAEMON not found"
+	exit 0
+}
 
 case $1 in
     start)
diff --git a/contrib/start-scripts/linux b/contrib/start-scripts/linux
index f1feb34f94..dd73e42d17 100644
--- a/contrib/start-scripts/linux
+++ b/contrib/start-scripts/linux
@@ -24,7 +24,7 @@
 
 # Original author:  Ryan Kirkpatrick <[email protected]>
 
-# $PostgreSQL: pgsql/contrib/start-scripts/linux,v 1.8 2006/07/13 14:44:33 petere Exp $
+# $PostgreSQL: pgsql/contrib/start-scripts/linux,v 1.11 2010/02/23 22:15:35 momjian Exp $
 
 ## EDIT FROM HERE
 
@@ -40,14 +40,22 @@ PGUSER=postgres
 # Where to keep a log file
 PGLOG="$PGDATA/serverlog"
 
+# It's often a good idea to protect the postmaster from being killed by the
+# OOM killer (which will tend to preferentially kill the postmaster because
+# of the way it accounts for shared memory).  Setting the OOM_ADJ value to
+# -17 will disable OOM kill altogether.  If you enable this, you probably want
+# to compile PostgreSQL with "-DLINUX_OOM_ADJ=0", so that individual backends
+# can still be killed by the OOM killer.
+#OOM_ADJ=-17
+
 ## STOP EDITING HERE
 
 # The path that is to be used for the script
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
-# What to use to start up the postmaster (we do NOT use pg_ctl for this,
-# as it adds no value and can cause the postmaster to misrecognize a stale
-# lock file)
+# What to use to start up the postmaster.  (If you want the script to wait
+# until the server has started, you could use "pg_ctl start -w" here.
+# But without -w, pg_ctl adds no value.)
 DAEMON="$prefix/bin/postmaster"
 
 # What to use to shut down the postmaster
@@ -56,12 +64,21 @@ PGCTL="$prefix/bin/pg_ctl"
 set -e
 
 # Only start if we can find the postmaster.
-test -x $DAEMON || exit 0
+test -x $DAEMON ||
+{
+	echo "$DAEMON not found"
+	if [ "$1" = "stop" ]
+	then exit 0
+	else exit 5
+	fi
+}
+
 
 # Parse command line parameters.
 case $1 in
   start)
 	echo -n "Starting PostgreSQL: "
+	test x"$OOM_ADJ" != x && echo "$OOM_ADJ" > /proc/self/oom_adj
 	su - $PGUSER -c "$DAEMON -D '$PGDATA' &" >>$PGLOG 2>&1
 	echo "ok"
 	;;
@@ -73,6 +90,7 @@ case $1 in
   restart)
 	echo -n "Restarting PostgreSQL: "
 	su - $PGUSER -c "$PGCTL stop -D '$PGDATA' -s -m fast -w"
+	test x"$OOM_ADJ" != x && echo "$OOM_ADJ" > /proc/self/oom_adj
 	su - $PGUSER -c "$DAEMON -D '$PGDATA' &" >>$PGLOG 2>&1
 	echo "ok"
 	;;
diff --git a/contrib/start-scripts/osx/PostgreSQL b/contrib/start-scripts/osx/PostgreSQL
index dc826837a3..65150d0fd5 100755
--- a/contrib/start-scripts/osx/PostgreSQL
+++ b/contrib/start-scripts/osx/PostgreSQL
@@ -68,9 +68,9 @@ ROTATESEC="604800"
 # The path that is to be used for the script
 PATH="$prefix/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
 
-# What to use to start up the postmaster (we do NOT use pg_ctl for this,
-# as it adds no value and can cause the postmaster to misrecognize a stale
-# lock file)
+# What to use to start up the postmaster.  (If you want the script to wait
+# until the server has started, you could use "pg_ctl start -w" here.
+# But without -w, pg_ctl adds no value.)
 DAEMON="$prefix/bin/postmaster"
 
 # What to use to shut down the postmaster
@@ -85,7 +85,7 @@ StartService () {
     if [ "${POSTGRESQL:=-NO-}" = "-YES-" ]; then
         ConsoleMessage "Starting PostgreSQL database server"
         if [ "${ROTATELOGS}" = "1" ]; then
-            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' 2>&1 | ${LOGUTIL} '${PGLOG}' ${ROTATESEC} &"
+            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" 2>&1 | ${LOGUTIL} '${PGLOG}' ${ROTATESEC} &
         else
             sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>$PGLOG 2>&1
         fi
@@ -104,7 +104,7 @@ RestartService () {
 	sudo -u $PGUSER $PGCTL stop -D "$PGDATA" -s -m fast
 	# should match StartService:
         if [ "${ROTATELOGS}" = "1" ]; then
-            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' 2>&1 | ${LOGUTIL} '${PGLOG}' ${ROTATESEC} &"
+            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" 2>&1 | ${LOGUTIL} '${PGLOG}' ${ROTATESEC} &
         else
             sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>$PGLOG 2>&1
         fi
diff --git a/contrib/tablefunc/Makefile b/contrib/tablefunc/Makefile
index 94aa740d18..1207c62ef7 100644
--- a/contrib/tablefunc/Makefile
+++ b/contrib/tablefunc/Makefile
@@ -1,11 +1,11 @@
-# $PostgreSQL: pgsql/contrib/tablefunc/Makefile,v 1.9 2007/11/10 23:59:51 momjian Exp $
+# $PostgreSQL: pgsql/contrib/tablefunc/Makefile,v 1.10 2010/07/05 23:15:56 tgl Exp $
 
 MODULES = tablefunc
 DATA_built = tablefunc.sql
 DATA = uninstall_tablefunc.sql
 REGRESS = tablefunc
 
-SHLIB_LINK += $(filter -lm, $(LIBS))
+LDFLAGS_SL += $(filter -lm, $(LIBS))
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c
index 48512bd934..609ab48c7c 100644
--- a/contrib/tablefunc/tablefunc.c
+++ b/contrib/tablefunc/tablefunc.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/tablefunc/tablefunc.c,v 1.60 2009/06/11 14:48:52 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/tablefunc/tablefunc.c,v 1.62 2010/01/02 16:57:32 momjian Exp $
  *
  *
  * tablefunc
@@ -10,7 +10,7 @@
  * And contributors:
  * Nabil Sayegh <[email protected]>
  *
- * Copyright (c) 2002-2009, PostgreSQL Global Development Group
+ * Copyright (c) 2002-2010, PostgreSQL Global Development Group
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation for any purpose, without fee, and without a written agreement
@@ -567,14 +567,9 @@ crosstab(PG_FUNCTION_ARGS)
 		{
 			HeapTuple	tuple;
 
-			/* build the tuple */
+			/* build the tuple and store it */
 			tuple = BuildTupleFromCStrings(attinmeta, values);
-
-			/* switch to appropriate context while storing the tuple */
-			oldcontext = MemoryContextSwitchTo(per_query_ctx);
 			tuplestore_puttuple(tupstore, tuple);
-			MemoryContextSwitchTo(oldcontext);
-
 			heap_freetuple(tuple);
 		}
 
@@ -807,7 +802,6 @@ get_crosstab_tuplestore(char *sql,
 	HeapTuple	tuple;
 	int			ret;
 	int			proc;
-	MemoryContext SPIcontext;
 
 	/* initialize our tuplestore (while still in query context!) */
 	tupstore = tuplestore_begin_heap(randomAccess, false, work_mem);
@@ -907,10 +901,7 @@ get_crosstab_tuplestore(char *sql,
 					/* rowid changed, flush the previous output row */
 					tuple = BuildTupleFromCStrings(attinmeta, values);
 
-					/* switch to appropriate context while storing the tuple */
-					SPIcontext = MemoryContextSwitchTo(per_query_ctx);
 					tuplestore_puttuple(tupstore, tuple);
-					MemoryContextSwitchTo(SPIcontext);
 
 					for (j = 0; j < result_ncols; j++)
 						xpfree(values[j]);
@@ -943,10 +934,7 @@ get_crosstab_tuplestore(char *sql,
 		/* flush the last output row */
 		tuple = BuildTupleFromCStrings(attinmeta, values);
 
-		/* switch to appropriate context while storing the tuple */
-		SPIcontext = MemoryContextSwitchTo(per_query_ctx);
 		tuplestore_puttuple(tupstore, tuple);
-		MemoryContextSwitchTo(SPIcontext);
 	}
 
 	if (SPI_finish() != SPI_OK_FINISH)
@@ -1232,7 +1220,6 @@ build_tuplestore_recursively(char *key_fld,
 							 Tuplestorestate *tupstore)
 {
 	TupleDesc	tupdesc = attinmeta->tupdesc;
-	MemoryContext oldcontext;
 	int			ret;
 	int			proc;
 	int			serial_column;
@@ -1310,15 +1297,9 @@ build_tuplestore_recursively(char *key_fld,
 		/* construct the tuple */
 		tuple = BuildTupleFromCStrings(attinmeta, values);
 
-		/* switch to long lived context while storing the tuple */
-		oldcontext = MemoryContextSwitchTo(per_query_ctx);
-
 		/* now store it */
 		tuplestore_puttuple(tupstore, tuple);
 
-		/* now reset the context */
-		MemoryContextSwitchTo(oldcontext);
-
 		/* increment level */
 		level++;
 	}
@@ -1404,15 +1385,9 @@ build_tuplestore_recursively(char *key_fld,
 			xpfree(current_key);
 			xpfree(current_key_parent);
 
-			/* switch to long lived context while storing the tuple */
-			oldcontext = MemoryContextSwitchTo(per_query_ctx);
-
 			/* store the tuple for later use */
 			tuplestore_puttuple(tupstore, tuple);
 
-			/* now reset the context */
-			MemoryContextSwitchTo(oldcontext);
-
 			heap_freetuple(tuple);
 
 			/* recurse using current_key_parent as the new start_with */
diff --git a/contrib/tablefunc/tablefunc.h b/contrib/tablefunc/tablefunc.h
index f884b55c33..2870299bd4 100644
--- a/contrib/tablefunc/tablefunc.h
+++ b/contrib/tablefunc/tablefunc.h
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/tablefunc/tablefunc.h,v 1.16 2009/06/11 14:48:52 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/tablefunc/tablefunc.h,v 1.17 2010/01/02 16:57:32 momjian Exp $
  *
  *
  * tablefunc
@@ -10,7 +10,7 @@
  * And contributors:
  * Nabil Sayegh <[email protected]>
  *
- * Copyright (c) 2002-2009, PostgreSQL Global Development Group
+ * Copyright (c) 2002-2010, PostgreSQL Global Development Group
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation for any purpose, without fee, and without a written agreement
diff --git a/contrib/test_parser/test_parser.c b/contrib/test_parser/test_parser.c
index 2317f25d0f..da4f9be781 100644
--- a/contrib/test_parser/test_parser.c
+++ b/contrib/test_parser/test_parser.c
@@ -3,10 +3,10 @@
  * test_parser.c
  *	  Simple example of a text search parser
  *
- * Copyright (c) 2007-2009, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2010, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/contrib/test_parser/test_parser.c,v 1.6 2009/06/11 14:48:52 momjian Exp $
+ *	  $PostgreSQL: pgsql/contrib/test_parser/test_parser.c,v 1.7 2010/01/02 16:57:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/contrib/tsearch2/expected/tsearch2.out b/contrib/tsearch2/expected/tsearch2.out
index d5623e1cdb..8674337e52 100644
--- a/contrib/tsearch2/expected/tsearch2.out
+++ b/contrib/tsearch2/expected/tsearch2.out
@@ -685,8 +685,10 @@ select * from parse('default', '345 [email protected] '' http://www.com/ http://aew.werc
      6 | 4aew.werc.ewr
     12 |  
     14 | http://
+     5 | 5aew.werc.ewr:8100/?
      6 | 5aew.werc.ewr:8100
-    12 | /?  
+    18 | /?
+    12 |   
      1 | ad
     12 | =
      1 | qwe
@@ -742,8 +744,8 @@ select * from parse('default', '345 [email protected] '' http://www.com/ http://aew.werc
      3 | ewri2
     12 |  
     13 | <a href="qwe<qwe>">
-    12 | 
-       : 
+    12 |                                     +
+       | 
     19 | /usr/local/fff
     12 |  
     19 | /awdf/dwqe/4325
@@ -775,8 +777,8 @@ select * from parse('default', '345 [email protected] '' http://www.com/ http://aew.werc
     20 | -4.2
     12 | . 
     22 | 234
-    12 |  
-       : 
+    12 |                                     +
+       | 
     12 | <
      1 | i
     12 |  
@@ -789,14 +791,14 @@ select * from parse('default', '345 [email protected] '' http://www.com/ http://aew.werc
     12 |  
     12 | <> 
      1 | qwerty
-(131 rows)
+(133 rows)
 
 SELECT to_tsvector('english', '345 [email protected] '' http://www.com/ http://aew.werc.ewr/?ad=qwe&dw 1aew.werc.ewr/?ad=qwe&dw 2aew.werc.ewr http://3aew.werc.ewr/?ad=qwe&dw http://4aew.werc.ewr http://5aew.werc.ewr:8100/?  ad=qwe&dw 6aew.werc.ewr:8100/?ad=qwe&dw 7aew.werc.ewr:8100/?ad=qwe&dw=%20%32 +4.0e-10 qwe qwe qwqwe 234.435 455 5.005 [email protected] qwe-wer asdf <fr>qwer jf sdjk<we hjwer <werrwe> ewr1> ewri2 <a href="qwe<qwe>">
 /usr/local/fff /awdf/dwqe/4325 rewt/ewr wefjn /wqe-324/ewr gist.h gist.h.c gist.c. readline 4.2 4.2. 4.2, readline-4.2 readline-4.2. 234 
 <i <b> wow  < jqw <> qwerty');
-                                                                                                                                                                                                                                                                                                                                                                                                                      to_tsvector                                                                                                                                                                                                                                                                                                                                                                                                                       
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- '+4.0e-10':26 '-4.2':58,60 '/?ad=qwe&dw':7,10,14,22 '/?ad=qwe&dw=%20%32':25 '/awdf/dwqe/4325':46 '/usr/local/fff':45 '/wqe-324/ewr':49 '1aew.werc.ewr':9 '1aew.werc.ewr/?ad=qwe&dw':8 '234':61 '234.435':30 '2aew.werc.ewr':11 '345':1 '3aew.werc.ewr':13 '3aew.werc.ewr/?ad=qwe&dw':12 '4.2':54,55,56 '455':31 '4aew.werc.ewr':15 '5.005':32 '5aew.werc.ewr:8100':16 '6aew.werc.ewr:8100':21 '6aew.werc.ewr:8100/?ad=qwe&dw':20 '7aew.werc.ewr:8100':24 '7aew.werc.ewr:8100/?ad=qwe&dw=%20%32':23 'ad':17 'aew.werc.ewr':6 'aew.werc.ewr/?ad=qwe&dw':5 'asdf':37 'dw':19 'efd.r':3 'ewr1':43 'ewri2':44 'gist.c':52 'gist.h':50 'gist.h.c':51 'hjwer':42 'jf':39 'jqw':64 'qwe':2,18,27,28,35 'qwe-wer':34 'qwer':38 'qwerti':65 'qwqwe':29 'readlin':53,57,59 'rewt/ewr':47 'sdjk':40 '[email protected]':33 'wefjn':48 'wer':36 'wow':63 'www.com':4
+                                                                                                                                                                                                                                                                                                                                                                                                                                       to_tsvector                                                                                                                                                                                                                                                                                                                                                                                                                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ '+4.0e-10':28 '-4.2':60,62 '/?':18 '/?ad=qwe&dw':7,10,14,24 '/?ad=qwe&dw=%20%32':27 '/awdf/dwqe/4325':48 '/usr/local/fff':47 '/wqe-324/ewr':51 '1aew.werc.ewr':9 '1aew.werc.ewr/?ad=qwe&dw':8 '234':63 '234.435':32 '2aew.werc.ewr':11 '345':1 '3aew.werc.ewr':13 '3aew.werc.ewr/?ad=qwe&dw':12 '4.2':56,57,58 '455':33 '4aew.werc.ewr':15 '5.005':34 '5aew.werc.ewr:8100':17 '5aew.werc.ewr:8100/?':16 '6aew.werc.ewr:8100':23 '6aew.werc.ewr:8100/?ad=qwe&dw':22 '7aew.werc.ewr:8100':26 '7aew.werc.ewr:8100/?ad=qwe&dw=%20%32':25 'ad':19 'aew.werc.ewr':6 'aew.werc.ewr/?ad=qwe&dw':5 'asdf':39 'dw':21 'efd.r':3 'ewr1':45 'ewri2':46 'gist.c':54 'gist.h':52 'gist.h.c':53 'hjwer':44 'jf':41 'jqw':66 'qwe':2,20,29,30,37 'qwe-wer':36 'qwer':40 'qwerti':67 'qwqwe':31 'readlin':55,59,61 'rewt/ewr':49 'sdjk':42 '[email protected]':35 'wefjn':50 'wer':38 'wow':65 'www.com':4
 (1 row)
 
 SELECT length(to_tsvector('english', '345 qw'));
@@ -810,7 +812,7 @@ SELECT length(to_tsvector('english', '345 [email protected] '' http://www.com/ http://ae
 <i <b> wow  < jqw <> qwerty'));
  length 
 --------
-     51
+     53
 (1 row)
 
 select to_tsquery('english', 'qwe & sKies '); 
@@ -2330,8 +2332,8 @@ Upon a woman s face. E.  J.  Pratt  (1882 1964)
 ', to_tsquery('sea&thousand&years'));
                   headline                  
 --------------------------------------------
- <b>sea</b> a <b>thousand</b> <b>years</b>,
- A <b>thousand</b> <b>years</b> to trace
+ <b>sea</b> a <b>thousand</b> <b>years</b>,+
+ A <b>thousand</b> <b>years</b> to trace   +
  The granite features of this cliff
 (1 row)
 
@@ -2347,8 +2349,8 @@ Upon a woman s face. E.  J.  Pratt  (1882 1964)
 ', to_tsquery('granite&sea'));
                  headline                  
 -------------------------------------------
- <b>sea</b> a thousand years,
- A thousand years to trace
+ <b>sea</b> a thousand years,             +
+ A thousand years to trace                +
  The <b>granite</b> features of this cliff
 (1 row)
 
@@ -2364,8 +2366,8 @@ Upon a woman s face. E.  J.  Pratt  (1882 1964)
 ', to_tsquery('sea'));
               headline              
 ------------------------------------
- <b>sea</b> a thousand years,
- A thousand years to trace
+ <b>sea</b> a thousand years,      +
+ A thousand years to trace         +
  The granite features of this cliff
 (1 row)
 
@@ -2384,17 +2386,17 @@ ff-bg
 to_tsquery('sea&foo'), 'HighlightAll=true');
                                   headline                                   
 -----------------------------------------------------------------------------
- 
- <html>
- <!-- some comment -->
- <body>
- <b>Sea</b> view wow <u><b>foo</b> bar</u> <i>qq</i>
- <a href="http://www.google.com/foo.bar.html" target="_blank">YES &nbsp;</a>
-  ff-bg
- <script>
-        document.write(15);
- </script>
- </body>
+                                                                            +
+ <html>                                                                     +
+ <!-- some comment -->                                                      +
+ <body>                                                                     +
+ <b>Sea</b> view wow <u><b>foo</b> bar</u> <i>qq</i>                        +
+ <a href="http://www.google.com/foo.bar.html" target="_blank">YES &nbsp;</a>+
+ ff-bg                                                                      +
+ <script>                                                                   +
+        document.write(15);                                                 +
+ </script>                                                                  +
+ </body>                                                                    +
  </html>
 (1 row)
 
diff --git a/contrib/tsearch2/expected/tsearch2_1.out b/contrib/tsearch2/expected/tsearch2_1.out
index e956b07646..a26c5162d1 100644
--- a/contrib/tsearch2/expected/tsearch2_1.out
+++ b/contrib/tsearch2/expected/tsearch2_1.out
@@ -685,8 +685,10 @@ select * from parse('default', '345 [email protected] '' http://www.com/ http://aew.werc
      6 | 4aew.werc.ewr
     12 |  
     14 | http://
+     5 | 5aew.werc.ewr:8100/?
      6 | 5aew.werc.ewr:8100
-    12 | /?  
+    18 | /?
+    12 |   
      1 | ad
     12 | =
      1 | qwe
@@ -742,8 +744,8 @@ select * from parse('default', '345 [email protected] '' http://www.com/ http://aew.werc
      3 | ewri2
     12 |  
     13 | <a href="qwe<qwe>">
-    12 | 
-       : 
+    12 |                                     +
+       | 
     19 | /usr/local/fff
     12 |  
     19 | /awdf/dwqe/4325
@@ -775,8 +777,8 @@ select * from parse('default', '345 [email protected] '' http://www.com/ http://aew.werc
     20 | -4.2
     12 | . 
     22 | 234
-    12 |  
-       : 
+    12 |                                     +
+       | 
     12 | <
      1 | i
     12 |  
@@ -789,14 +791,14 @@ select * from parse('default', '345 [email protected] '' http://www.com/ http://aew.werc
     12 |  
     12 | <> 
      1 | qwerty
-(131 rows)
+(133 rows)
 
 SELECT to_tsvector('english', '345 [email protected] '' http://www.com/ http://aew.werc.ewr/?ad=qwe&dw 1aew.werc.ewr/?ad=qwe&dw 2aew.werc.ewr http://3aew.werc.ewr/?ad=qwe&dw http://4aew.werc.ewr http://5aew.werc.ewr:8100/?  ad=qwe&dw 6aew.werc.ewr:8100/?ad=qwe&dw 7aew.werc.ewr:8100/?ad=qwe&dw=%20%32 +4.0e-10 qwe qwe qwqwe 234.435 455 5.005 [email protected] qwe-wer asdf <fr>qwer jf sdjk<we hjwer <werrwe> ewr1> ewri2 <a href="qwe<qwe>">
 /usr/local/fff /awdf/dwqe/4325 rewt/ewr wefjn /wqe-324/ewr gist.h gist.h.c gist.c. readline 4.2 4.2. 4.2, readline-4.2 readline-4.2. 234 
 <i <b> wow  < jqw <> qwerty');
-                                                                                                                                                                                                                                                                                                                                                                                                                      to_tsvector                                                                                                                                                                                                                                                                                                                                                                                                                       
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- '+4.0e-10':26 '-4.2':58,60 '/?ad=qwe&dw':7,10,14,22 '/?ad=qwe&dw=%20%32':25 '/awdf/dwqe/4325':46 '/usr/local/fff':45 '/wqe-324/ewr':49 '1aew.werc.ewr':9 '1aew.werc.ewr/?ad=qwe&dw':8 '234':61 '234.435':30 '2aew.werc.ewr':11 '345':1 '3aew.werc.ewr':13 '3aew.werc.ewr/?ad=qwe&dw':12 '4.2':54,55,56 '455':31 '4aew.werc.ewr':15 '5.005':32 '5aew.werc.ewr:8100':16 '6aew.werc.ewr:8100':21 '6aew.werc.ewr:8100/?ad=qwe&dw':20 '7aew.werc.ewr:8100':24 '7aew.werc.ewr:8100/?ad=qwe&dw=%20%32':23 'ad':17 'aew.werc.ewr':6 'aew.werc.ewr/?ad=qwe&dw':5 'asdf':37 'dw':19 'efd.r':3 'ewr1':43 'ewri2':44 'gist.c':52 'gist.h':50 'gist.h.c':51 'hjwer':42 'jf':39 'jqw':64 'qwe':2,18,27,28,35 'qwe-wer':34 'qwer':38 'qwerti':65 'qwqwe':29 'readlin':53,57,59 'rewt/ewr':47 'sdjk':40 '[email protected]':33 'wefjn':48 'wer':36 'wow':63 'www.com':4
+                                                                                                                                                                                                                                                                                                                                                                                                                                       to_tsvector                                                                                                                                                                                                                                                                                                                                                                                                                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ '+4.0e-10':28 '-4.2':60,62 '/?':18 '/?ad=qwe&dw':7,10,14,24 '/?ad=qwe&dw=%20%32':27 '/awdf/dwqe/4325':48 '/usr/local/fff':47 '/wqe-324/ewr':51 '1aew.werc.ewr':9 '1aew.werc.ewr/?ad=qwe&dw':8 '234':63 '234.435':32 '2aew.werc.ewr':11 '345':1 '3aew.werc.ewr':13 '3aew.werc.ewr/?ad=qwe&dw':12 '4.2':56,57,58 '455':33 '4aew.werc.ewr':15 '5.005':34 '5aew.werc.ewr:8100':17 '5aew.werc.ewr:8100/?':16 '6aew.werc.ewr:8100':23 '6aew.werc.ewr:8100/?ad=qwe&dw':22 '7aew.werc.ewr:8100':26 '7aew.werc.ewr:8100/?ad=qwe&dw=%20%32':25 'ad':19 'aew.werc.ewr':6 'aew.werc.ewr/?ad=qwe&dw':5 'asdf':39 'dw':21 'efd.r':3 'ewr1':45 'ewri2':46 'gist.c':54 'gist.h':52 'gist.h.c':53 'hjwer':44 'jf':41 'jqw':66 'qwe':2,20,29,30,37 'qwe-wer':36 'qwer':40 'qwerti':67 'qwqwe':31 'readlin':55,59,61 'rewt/ewr':49 'sdjk':42 '[email protected]':35 'wefjn':50 'wer':38 'wow':65 'www.com':4
 (1 row)
 
 SELECT length(to_tsvector('english', '345 qw'));
@@ -810,7 +812,7 @@ SELECT length(to_tsvector('english', '345 [email protected] '' http://www.com/ http://ae
 <i <b> wow  < jqw <> qwerty'));
  length 
 --------
-     51
+     53
 (1 row)
 
 select to_tsquery('english', 'qwe & sKies '); 
@@ -2330,8 +2332,8 @@ Upon a woman s face. E.  J.  Pratt  (1882 1964)
 ', to_tsquery('sea&thousand&years'));
                   headline                  
 --------------------------------------------
- <b>sea</b> a <b>thousand</b> <b>years</b>,
- A <b>thousand</b> <b>years</b> to trace
+ <b>sea</b> a <b>thousand</b> <b>years</b>,+
+ A <b>thousand</b> <b>years</b> to trace   +
  The granite features of this cliff
 (1 row)
 
@@ -2347,8 +2349,8 @@ Upon a woman s face. E.  J.  Pratt  (1882 1964)
 ', to_tsquery('granite&sea'));
                  headline                  
 -------------------------------------------
- <b>sea</b> a thousand years,
- A thousand years to trace
+ <b>sea</b> a thousand years,             +
+ A thousand years to trace                +
  The <b>granite</b> features of this cliff
 (1 row)
 
@@ -2364,8 +2366,8 @@ Upon a woman s face. E.  J.  Pratt  (1882 1964)
 ', to_tsquery('sea'));
               headline              
 ------------------------------------
- <b>sea</b> a thousand years,
- A thousand years to trace
+ <b>sea</b> a thousand years,      +
+ A thousand years to trace         +
  The granite features of this cliff
 (1 row)
 
@@ -2384,17 +2386,17 @@ ff-bg
 to_tsquery('sea&foo'), 'HighlightAll=true');
                                   headline                                   
 -----------------------------------------------------------------------------
- 
- <html>
- <!-- some comment -->
- <body>
- <b>Sea</b> view wow <u><b>foo</b> bar</u> <i>qq</i>
- <a href="http://www.google.com/foo.bar.html" target="_blank">YES &nbsp;</a>
-  ff-bg
- <script>
-        document.write(15);
- </script>
- </body>
+                                                                            +
+ <html>                                                                     +
+ <!-- some comment -->                                                      +
+ <body>                                                                     +
+ <b>Sea</b> view wow <u><b>foo</b> bar</u> <i>qq</i>                        +
+ <a href="http://www.google.com/foo.bar.html" target="_blank">YES &nbsp;</a>+
+ ff-bg                                                                      +
+ <script>                                                                   +
+        document.write(15);                                                 +
+ </script>                                                                  +
+ </body>                                                                    +
  </html>
 (1 row)
 
diff --git a/contrib/tsearch2/tsearch2.c b/contrib/tsearch2/tsearch2.c
index 2452ec69b4..63fba13329 100644
--- a/contrib/tsearch2/tsearch2.c
+++ b/contrib/tsearch2/tsearch2.c
@@ -3,11 +3,11 @@
  * tsearch2.c
  *		Backwards-compatibility package for old contrib/tsearch2 API
  *
- * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/contrib/tsearch2/tsearch2.c,v 1.10 2009/06/11 14:48:52 momjian Exp $
+ *	  $PostgreSQL: pgsql/contrib/tsearch2/tsearch2.c,v 1.12 2010/02/08 20:39:51 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -422,15 +422,8 @@ tsa_rewrite_accum(PG_FUNCTION_ARGS)
 	MemoryContext aggcontext;
 	MemoryContext oldcontext;
 
-	if (fcinfo->context && IsA(fcinfo->context, AggState))
-		aggcontext = ((AggState *) fcinfo->context)->aggcontext;
-	else if (fcinfo->context && IsA(fcinfo->context, WindowAggState))
-		aggcontext = ((WindowAggState *) fcinfo->context)->wincontext;
-	else
-	{
+	if (!AggCheckCallContext(fcinfo, &aggcontext))
 		elog(ERROR, "tsa_rewrite_accum called in non-aggregate context");
-		aggcontext = NULL;		/* keep compiler quiet */
-	}
 
 	if (PG_ARGISNULL(0) || PG_GETARG_POINTER(0) == NULL)
 	{
diff --git a/contrib/unaccent/Makefile b/contrib/unaccent/Makefile
new file mode 100644
index 0000000000..401f523283
--- /dev/null
+++ b/contrib/unaccent/Makefile
@@ -0,0 +1,23 @@
+# $PostgreSQL: pgsql/contrib/unaccent/Makefile,v 1.2 2009/08/18 15:51:16 tgl Exp $
+
+MODULE_big = unaccent
+OBJS = unaccent.o
+
+DATA_built = unaccent.sql
+DATA = uninstall_unaccent.sql
+DATA_TSEARCH = unaccent.rules
+REGRESS = unaccent
+
+# Adjust REGRESS_OPTS because we need a UTF8 database
+REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB) --multibyte=UTF8 --no-locale 
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/unaccent
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
diff --git a/contrib/unaccent/expected/unaccent.out b/contrib/unaccent/expected/unaccent.out
new file mode 100644
index 0000000000..a09e00fe5b
--- /dev/null
+++ b/contrib/unaccent/expected/unaccent.out
@@ -0,0 +1,65 @@
+SET client_min_messages = warning;
+\set ECHO none
+RESET client_min_messages;
+-- must have a UTF8 database
+SELECT getdatabaseencoding();
+ getdatabaseencoding 
+---------------------
+ UTF8
+(1 row)
+
+SET client_encoding TO 'KOI8';
+SELECT unaccent('foobar');
+ unaccent 
+----------
+ foobar
+(1 row)
+
+SELECT unaccent('����');
+ unaccent 
+----------
+ ����
+(1 row)
+
+SELECT unaccent('����');
+ unaccent 
+----------
+ ����
+(1 row)
+
+SELECT unaccent('unaccent', 'foobar');
+ unaccent 
+----------
+ foobar
+(1 row)
+
+SELECT unaccent('unaccent', '����');
+ unaccent 
+----------
+ ����
+(1 row)
+
+SELECT unaccent('unaccent', '����');
+ unaccent 
+----------
+ ����
+(1 row)
+
+SELECT ts_lexize('unaccent', 'foobar');
+ ts_lexize 
+-----------
+ 
+(1 row)
+
+SELECT ts_lexize('unaccent', '����');
+ ts_lexize 
+-----------
+ {����}
+(1 row)
+
+SELECT ts_lexize('unaccent', '����');
+ ts_lexize 
+-----------
+ {����}
+(1 row)
+
diff --git a/contrib/unaccent/sql/unaccent.sql b/contrib/unaccent/sql/unaccent.sql
new file mode 100644
index 0000000000..ede938d479
--- /dev/null
+++ b/contrib/unaccent/sql/unaccent.sql
@@ -0,0 +1,22 @@
+SET client_min_messages = warning;
+\set ECHO none
+\i unaccent.sql
+\set ECHO all
+RESET client_min_messages;
+
+-- must have a UTF8 database
+SELECT getdatabaseencoding();
+
+SET client_encoding TO 'KOI8';
+
+SELECT unaccent('foobar');
+SELECT unaccent('����');
+SELECT unaccent('����');
+
+SELECT unaccent('unaccent', 'foobar');
+SELECT unaccent('unaccent', '����');
+SELECT unaccent('unaccent', '����');
+
+SELECT ts_lexize('unaccent', 'foobar');
+SELECT ts_lexize('unaccent', '����');
+SELECT ts_lexize('unaccent', '����');
diff --git a/contrib/unaccent/unaccent.c b/contrib/unaccent/unaccent.c
new file mode 100644
index 0000000000..8e012ac172
--- /dev/null
+++ b/contrib/unaccent/unaccent.c
@@ -0,0 +1,320 @@
+/*-------------------------------------------------------------------------
+ *
+ * unaccent.c
+ *	  Text search unaccent dictionary
+ *
+ * Copyright (c) 2009-2010, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/contrib/unaccent/unaccent.c,v 1.5 2010/02/26 02:00:32 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "fmgr.h"
+#include "catalog/namespace.h"
+#include "commands/defrem.h"
+#include "mb/pg_wchar.h"
+#include "tsearch/ts_cache.h"
+#include "tsearch/ts_locale.h"
+#include "tsearch/ts_public.h"
+#include "utils/builtins.h"
+
+PG_MODULE_MAGIC;
+
+/*
+ * Unaccent dictionary uses uncompressed suffix tree to find a
+ * character to replace. Each node of tree is an array of
+ * SuffixChar struct with length = 256 (n-th element of array
+ * corresponds to byte)
+ */
+typedef struct SuffixChar
+{
+	struct SuffixChar *nextChar;
+	char	   *replaceTo;
+	int			replacelen;
+} SuffixChar;
+
+/*
+ * placeChar - put str into tree's structure, byte by byte.
+ */
+static SuffixChar *
+placeChar(SuffixChar *node, unsigned char *str, int lenstr, char *replaceTo, int replacelen)
+{
+	SuffixChar *curnode;
+
+	if (!node)
+	{
+		node = palloc(sizeof(SuffixChar) * 256);
+		memset(node, 0, sizeof(SuffixChar) * 256);
+	}
+
+	curnode = node + *str;
+
+	if (lenstr == 1)
+	{
+		if (curnode->replaceTo)
+			elog(WARNING, "duplicate TO argument, use first one");
+		else
+		{
+			curnode->replacelen = replacelen;
+			curnode->replaceTo = palloc(replacelen);
+			memcpy(curnode->replaceTo, replaceTo, replacelen);
+		}
+	}
+	else
+	{
+		curnode->nextChar = placeChar(curnode->nextChar, str + 1, lenstr - 1, replaceTo, replacelen);
+	}
+
+	return node;
+}
+
+/*
+ * initSuffixTree  - create suffix tree from file. Function converts
+ * UTF8-encoded file into current encoding.
+ */
+static SuffixChar *
+initSuffixTree(char *filename)
+{
+	SuffixChar *volatile rootSuffixTree = NULL;
+	MemoryContext ccxt = CurrentMemoryContext;
+	tsearch_readline_state trst;
+	volatile bool skip;
+
+	filename = get_tsearch_config_filename(filename, "rules");
+	if (!tsearch_readline_begin(&trst, filename))
+		ereport(ERROR,
+				(errcode(ERRCODE_CONFIG_FILE_ERROR),
+				 errmsg("could not open unaccent file \"%s\": %m",
+						filename)));
+
+	do
+	{
+		char		src[4096];
+		char		trg[4096];
+		int			srclen;
+		int			trglen;
+		char	   *line = NULL;
+
+		skip = true;
+
+		PG_TRY();
+		{
+			/*
+			 * pg_do_encoding_conversion() (called by tsearch_readline()) will
+			 * emit exception if it finds untranslatable characters in current
+			 * locale. We just skip such characters.
+			 */
+			while ((line = tsearch_readline(&trst)) != NULL)
+			{
+				if (sscanf(line, "%s\t%s\n", src, trg) != 2)
+					continue;
+
+				srclen = strlen(src);
+				trglen = strlen(trg);
+
+				rootSuffixTree = placeChar(rootSuffixTree,
+										   (unsigned char *) src, srclen,
+										   trg, trglen);
+				skip = false;
+				pfree(line);
+			}
+		}
+		PG_CATCH();
+		{
+			ErrorData  *errdata;
+			MemoryContext ecxt;
+
+			ecxt = MemoryContextSwitchTo(ccxt);
+			errdata = CopyErrorData();
+			if (errdata->sqlerrcode == ERRCODE_UNTRANSLATABLE_CHARACTER)
+			{
+				FlushErrorState();
+			}
+			else
+			{
+				MemoryContextSwitchTo(ecxt);
+				PG_RE_THROW();
+			}
+		}
+		PG_END_TRY();
+	}
+	while (skip);
+
+	tsearch_readline_end(&trst);
+
+	return rootSuffixTree;
+}
+
+/*
+ * findReplaceTo - find multibyte character in tree
+ */
+static SuffixChar *
+findReplaceTo(SuffixChar *node, unsigned char *src, int srclen)
+{
+	while (node)
+	{
+		node = node + *src;
+		if (srclen == 1)
+			return node;
+
+		src++;
+		srclen--;
+		node = node->nextChar;
+	}
+
+	return NULL;
+}
+
+PG_FUNCTION_INFO_V1(unaccent_init);
+Datum		unaccent_init(PG_FUNCTION_ARGS);
+Datum
+unaccent_init(PG_FUNCTION_ARGS)
+{
+	List	   *dictoptions = (List *) PG_GETARG_POINTER(0);
+	SuffixChar *rootSuffixTree = NULL;
+	bool		fileloaded = false;
+	ListCell   *l;
+
+	foreach(l, dictoptions)
+	{
+		DefElem    *defel = (DefElem *) lfirst(l);
+
+		if (pg_strcasecmp("Rules", defel->defname) == 0)
+		{
+			if (fileloaded)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("multiple Rules parameters")));
+			rootSuffixTree = initSuffixTree(defGetString(defel));
+			fileloaded = true;
+		}
+		else
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("unrecognized Unaccent parameter: \"%s\"",
+							defel->defname)));
+		}
+	}
+
+	if (!fileloaded)
+	{
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("missing Rules parameter")));
+	}
+
+	PG_RETURN_POINTER(rootSuffixTree);
+}
+
+PG_FUNCTION_INFO_V1(unaccent_lexize);
+Datum		unaccent_lexize(PG_FUNCTION_ARGS);
+Datum
+unaccent_lexize(PG_FUNCTION_ARGS)
+{
+	SuffixChar *rootSuffixTree = (SuffixChar *) PG_GETARG_POINTER(0);
+	char	   *srcchar = (char *) PG_GETARG_POINTER(1);
+	int32		len = PG_GETARG_INT32(2);
+	char	   *srcstart,
+			   *trgchar = NULL;
+	int			charlen;
+	TSLexeme   *res = NULL;
+	SuffixChar *node;
+
+	srcstart = srcchar;
+	while (srcchar - srcstart < len)
+	{
+		charlen = pg_mblen(srcchar);
+
+		node = findReplaceTo(rootSuffixTree, (unsigned char *) srcchar, charlen);
+		if (node && node->replaceTo)
+		{
+			if (!res)
+			{
+				/* allocate res only it it's needed */
+				res = palloc0(sizeof(TSLexeme) * 2);
+				res->lexeme = trgchar = palloc(len * pg_database_encoding_max_length() + 1 /* \0 */ );
+				res->flags = TSL_FILTER;
+				if (srcchar != srcstart)
+				{
+					memcpy(trgchar, srcstart, srcchar - srcstart);
+					trgchar += (srcchar - srcstart);
+				}
+			}
+			memcpy(trgchar, node->replaceTo, node->replacelen);
+			trgchar += node->replacelen;
+		}
+		else if (res)
+		{
+			memcpy(trgchar, srcchar, charlen);
+			trgchar += charlen;
+		}
+
+		srcchar += charlen;
+	}
+
+	if (res)
+		*trgchar = '\0';
+
+	PG_RETURN_POINTER(res);
+}
+
+/*
+ * Function-like wrapper for dictionary
+ */
+PG_FUNCTION_INFO_V1(unaccent_dict);
+Datum		unaccent_dict(PG_FUNCTION_ARGS);
+Datum
+unaccent_dict(PG_FUNCTION_ARGS)
+{
+	text	   *str;
+	int			strArg;
+	Oid			dictOid;
+	TSDictionaryCacheEntry *dict;
+	TSLexeme   *res;
+
+	if (PG_NARGS() == 1)
+	{
+		dictOid = TSDictionaryGetDictid(stringToQualifiedNameList("unaccent"), false);
+		strArg = 0;
+	}
+	else
+	{
+		dictOid = PG_GETARG_OID(0);
+		strArg = 1;
+	}
+	str = PG_GETARG_TEXT_P(strArg);
+
+	dict = lookup_ts_dictionary_cache(dictOid);
+
+	res = (TSLexeme *) DatumGetPointer(FunctionCall4(&(dict->lexize),
+											 PointerGetDatum(dict->dictData),
+											   PointerGetDatum(VARDATA(str)),
+									  Int32GetDatum(VARSIZE(str) - VARHDRSZ),
+													 PointerGetDatum(NULL)));
+
+	PG_FREE_IF_COPY(str, strArg);
+
+	if (res == NULL)
+	{
+		PG_RETURN_TEXT_P(PG_GETARG_TEXT_P_COPY(strArg));
+	}
+	else if (res->lexeme == NULL)
+	{
+		pfree(res);
+		PG_RETURN_TEXT_P(PG_GETARG_TEXT_P_COPY(strArg));
+	}
+	else
+	{
+		text	   *txt = cstring_to_text(res->lexeme);
+
+		pfree(res->lexeme);
+		pfree(res);
+
+		PG_RETURN_TEXT_P(txt);
+	}
+}
diff --git a/contrib/unaccent/unaccent.rules b/contrib/unaccent/unaccent.rules
new file mode 100644
index 0000000000..cc2f7a6585
--- /dev/null
+++ b/contrib/unaccent/unaccent.rules
@@ -0,0 +1,187 @@
+À	A
+Á	A
+Â	A
+Ã	A
+Ä	A
+Å	A
+Æ	A
+à	a
+á	a
+â	a
+ã	a
+ä	a
+å	a
+æ	a
+Ā	A
+ā	a
+Ă	A
+ă	a
+Ą	A
+ą	a
+Ç	C
+ç	c
+Ć	C
+ć	c
+Ĉ	C
+ĉ	c
+Ċ	C
+ċ	c
+Č	C
+č	c
+Ď	D
+ď	d
+Đ	D
+đ	d
+È	E
+É	E
+Ê	E
+Ë	E
+è	e
+é	e
+ê	e
+ë	e
+Ē	E
+ē	e
+Ĕ	E
+ĕ	e
+Ė	E
+ė	e
+Ę	E
+ę	e
+Ě	E
+ě	e
+Ĝ	G
+ĝ	g
+Ğ	G
+ğ	g
+Ġ	G
+ġ	g
+Ģ	G
+ģ	g
+Ĥ	H
+ĥ	h
+Ħ	H
+ħ	h
+Ĩ	I
+Ì	I
+Í	I
+Î	I
+Ï	I
+ì	i
+í	i
+î	i
+ï	i
+ĩ	i
+Ī	I
+ī	i
+Ĭ	I
+ĭ	i
+Į	I
+į	i
+İ	I
+ı	i
+IJ	I
+ij	i
+Ĵ	J
+ĵ	j
+Ķ	K
+ķ	k
+ĸ	k
+Ĺ	L
+ĺ	l
+Ļ	L
+ļ	l
+Ľ	L
+ľ	l
+Ŀ	L
+ŀ	l
+Ł	L
+ł	l
+Ñ	N
+ñ	n
+Ń	N
+ń	n
+Ņ	N
+ņ	n
+Ň	N
+ň	n
+ʼn	n
+Ŋ	N
+ŋ	n
+Ò	O
+Ó	O
+Ô	O
+Õ	O
+Ö	O
+ò	o
+ó	o
+ô	o
+õ	o
+ö	o
+Ō	O
+ō	o
+Ŏ	O
+ŏ	o
+Ő	O
+ő	o
+Œ	E
+œ	e
+Ø	O
+ø	o
+Ŕ	R
+ŕ	r
+Ŗ	R
+ŗ	r
+Ř	R
+ř	r
+ß	S
+Ś	S
+ś	s
+Ŝ	S
+ŝ	s
+Ş	S
+ş	s
+Š	S
+š	s
+Ţ	T
+ţ	t
+Ť	T
+ť	t
+Ŧ	T
+ŧ	t
+Ù	U
+Ú	U
+Û	U
+Ü	U
+ù	u
+ú	u
+û	u
+ü	u
+Ũ	U
+ũ	u
+Ū	U
+ū	u
+Ŭ	U
+ŭ	u
+Ů	U
+ů	u
+Ű	U
+ű	u
+Ų	U
+ų	u
+Ŵ	W
+ŵ	w
+Ý	Y
+ý	y
+ÿ	y
+Ŷ	Y
+ŷ	y
+Ÿ	Y
+Ź	Z
+ź	z
+Ż	Z
+ż	z
+Ž	Z
+ž	z
+ё	е
+Ё	Е
diff --git a/contrib/unaccent/unaccent.sql.in b/contrib/unaccent/unaccent.sql.in
new file mode 100644
index 0000000000..1f3c3c8a4a
--- /dev/null
+++ b/contrib/unaccent/unaccent.sql.in
@@ -0,0 +1,34 @@
+/* $PostgreSQL: pgsql/contrib/unaccent/unaccent.sql.in,v 1.2 2009/11/14 18:24:32 tgl Exp $ */
+
+-- Adjust this setting to control where the objects get created.
+SET search_path = public;
+
+CREATE OR REPLACE FUNCTION unaccent(regdictionary, text)
+	RETURNS text
+	AS 'MODULE_PATHNAME', 'unaccent_dict'
+	LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION unaccent(text)
+	RETURNS text
+	AS 'MODULE_PATHNAME', 'unaccent_dict'
+	LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION unaccent_init(internal)
+	RETURNS internal
+	AS 'MODULE_PATHNAME', 'unaccent_init'
+	LANGUAGE C;
+
+CREATE OR REPLACE FUNCTION unaccent_lexize(internal,internal,internal,internal)
+	RETURNS internal
+	AS 'MODULE_PATHNAME', 'unaccent_lexize'
+	LANGUAGE C;
+
+CREATE TEXT SEARCH TEMPLATE unaccent (
+	INIT = unaccent_init,
+	LEXIZE = unaccent_lexize
+);
+
+CREATE TEXT SEARCH DICTIONARY unaccent (
+	TEMPLATE = unaccent,
+	RULES    = 'unaccent'
+);
diff --git a/contrib/unaccent/uninstall_unaccent.sql b/contrib/unaccent/uninstall_unaccent.sql
new file mode 100644
index 0000000000..f60ab564da
--- /dev/null
+++ b/contrib/unaccent/uninstall_unaccent.sql
@@ -0,0 +1,11 @@
+/* $PostgreSQL: pgsql/contrib/unaccent/uninstall_unaccent.sql,v 1.2 2009/11/14 18:24:32 tgl Exp $ */
+
+-- Adjust this setting to control where the objects get dropped.
+SET search_path = public;
+
+DROP FUNCTION unaccent(regdictionary, text);
+DROP FUNCTION unaccent(text);
+DROP TEXT SEARCH DICTIONARY unaccent;
+DROP TEXT SEARCH TEMPLATE unaccent;
+DROP FUNCTION unaccent_init(internal);
+DROP FUNCTION unaccent_lexize(internal,internal,internal,internal);
diff --git a/contrib/uuid-ossp/uuid-ossp.c b/contrib/uuid-ossp/uuid-ossp.c
index 71db0ac269..a7d8f509bc 100644
--- a/contrib/uuid-ossp/uuid-ossp.c
+++ b/contrib/uuid-ossp/uuid-ossp.c
@@ -2,9 +2,9 @@
  *
  * UUID generation functions using the OSSP UUID library
  *
- * Copyright (c) 2007-2009, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2010, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/contrib/uuid-ossp/uuid-ossp.c,v 1.11 2009/06/11 14:48:53 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/uuid-ossp/uuid-ossp.c,v 1.12 2010/01/02 16:57:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/contrib/vacuumlo/Makefile b/contrib/vacuumlo/Makefile
index dc1e9524bc..4c68e69578 100644
--- a/contrib/vacuumlo/Makefile
+++ b/contrib/vacuumlo/Makefile
@@ -1,4 +1,7 @@
-# $PostgreSQL: pgsql/contrib/vacuumlo/Makefile,v 1.17 2007/11/10 23:59:52 momjian Exp $
+# $PostgreSQL: pgsql/contrib/vacuumlo/Makefile,v 1.18 2010/05/12 11:33:08 momjian Exp $
+
+PGFILEDESC = "vacuumlo - removes orphaned large objects"
+PGAPPICON=win32
 
 PROGRAM = vacuumlo
 OBJS	= vacuumlo.o
diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
index b26b42cf7a..2ed1cbeb93 100644
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -3,12 +3,12 @@
  * vacuumlo.c
  *	  This removes orphaned large objects from a database.
  *
- * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/contrib/vacuumlo/vacuumlo.c,v 1.41 2009/02/27 09:30:21 petere Exp $
+ *	  $PostgreSQL: pgsql/contrib/vacuumlo/vacuumlo.c,v 1.45 2010/02/17 04:19:37 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -142,7 +142,10 @@ vacuumlo(char *database, struct _param * param)
 	 */
 	buf[0] = '\0';
 	strcat(buf, "CREATE TEMP TABLE vacuum_l AS ");
-	strcat(buf, "SELECT DISTINCT loid AS lo FROM pg_largeobject ");
+	if (PQserverVersion(conn) >= 90000)
+		strcat(buf, "SELECT oid AS lo FROM pg_largeobject_metadata");
+	else
+		strcat(buf, "SELECT DISTINCT loid AS lo FROM pg_largeobject");
 	res = PQexec(conn, buf);
 	if (PQresultStatus(res) != PGRES_COMMAND_OK)
 	{
@@ -155,11 +158,11 @@ vacuumlo(char *database, struct _param * param)
 	PQclear(res);
 
 	/*
-	 * Vacuum the temp table so that planner will generate decent plans for
+	 * Analyze the temp table so that planner will generate decent plans for
 	 * the DELETEs below.
 	 */
 	buf[0] = '\0';
-	strcat(buf, "VACUUM ANALYZE vacuum_l");
+	strcat(buf, "ANALYZE vacuum_l");
 	res = PQexec(conn, buf);
 	if (PQresultStatus(res) != PGRES_COMMAND_OK)
 	{
@@ -216,11 +219,6 @@ vacuumlo(char *database, struct _param * param)
 		if (param->verbose)
 			fprintf(stdout, "Checking %s in %s.%s\n", field, schema, table);
 
-		/*
-		 * The "IN" construct used here was horribly inefficient before
-		 * Postgres 7.4, but should be now competitive if not better than the
-		 * bogus join we used before.
-		 */
 		snprintf(buf, BUFSIZE,
 				 "DELETE FROM vacuum_l "
 				 "WHERE lo IN (SELECT \"%s\" FROM \"%s\".\"%s\")",
diff --git a/contrib/xml2/Makefile b/contrib/xml2/Makefile
index b96defa5d6..dd45a914c9 100644
--- a/contrib/xml2/Makefile
+++ b/contrib/xml2/Makefile
@@ -1,13 +1,14 @@
-# $PostgreSQL: pgsql/contrib/xml2/Makefile,v 1.12 2008/05/08 16:49:37 tgl Exp $
+# $PostgreSQL: pgsql/contrib/xml2/Makefile,v 1.14 2010/03/01 18:07:59 tgl Exp $
 
 MODULE_big = pgxml
 
-OBJS = $(if $(filter -lxslt, $(LIBS)), xpath.o xslt_proc.o, xpath.o)
+OBJS = xpath.o xslt_proc.o
 
 SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS))
 
 DATA_built = pgxml.sql
 DATA = uninstall_pgxml.sql
+REGRESS = xml2
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/xml2/expected/xml2.out b/contrib/xml2/expected/xml2.out
new file mode 100644
index 0000000000..74896b0802
--- /dev/null
+++ b/contrib/xml2/expected/xml2.out
@@ -0,0 +1,147 @@
+--
+-- first, define the functions.  Turn off echoing so that expected file
+-- does not depend on contents of pgxml.sql.
+--
+SET client_min_messages = warning;
+\set ECHO none
+RESET client_min_messages;
+select query_to_xml('select 1 as x',true,false,'');
+                         query_to_xml                          
+---------------------------------------------------------------
+ <table xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">+
+                                                              +
+ <row>                                                        +
+   <x>1</x>                                                   +
+ </row>                                                       +
+                                                              +
+ </table>                                                     +
+ 
+(1 row)
+
+select xslt_process( query_to_xml('select x from generate_series(1,5) as 
+x',true,false,'')::text,
+$$<xsl:stylesheet version="1.0"
+               xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes" />
+<xsl:template match="*">
+  <xsl:copy>
+     <xsl:copy-of select="@*" />
+     <xsl:apply-templates />
+  </xsl:copy>
+</xsl:template>
+<xsl:template match="comment()|processing-instruction()">
+  <xsl:copy />
+</xsl:template>
+</xsl:stylesheet>
+$$::text);
+                         xslt_process                          
+---------------------------------------------------------------
+ <?xml version="1.0"?>                                        +
+ <table xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">+
+                                                              +
+ <row>                                                        +
+   <x>1</x>                                                   +
+ </row>                                                       +
+                                                              +
+ <row>                                                        +
+   <x>2</x>                                                   +
+ </row>                                                       +
+                                                              +
+ <row>                                                        +
+   <x>3</x>                                                   +
+ </row>                                                       +
+                                                              +
+ <row>                                                        +
+   <x>4</x>                                                   +
+ </row>                                                       +
+                                                              +
+ <row>                                                        +
+   <x>5</x>                                                   +
+ </row>                                                       +
+                                                              +
+ </table>                                                     +
+ 
+(1 row)
+
+CREATE TABLE xpath_test (id integer NOT NULL, t xml);
+INSERT INTO xpath_test VALUES (1, '<doc><int>1</int></doc>');
+SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true')
+as t(id int4);
+ id 
+----
+(0 rows)
+
+SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true')
+as t(id int4, doc int4);
+ id | doc 
+----+-----
+  1 |   1
+(1 row)
+
+DROP TABLE xpath_test;
+CREATE TABLE xpath_test (id integer NOT NULL, t text);
+INSERT INTO xpath_test VALUES (1, '<doc><int>1</int></doc>');
+SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true')
+as t(id int4);
+ id 
+----
+(0 rows)
+
+SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true')
+as t(id int4, doc int4);
+ id | doc 
+----+-----
+  1 |   1
+(1 row)
+
+create table articles (article_id integer, article_xml xml, date_entered date);
+insert into articles (article_id, article_xml, date_entered)
+values (2, '<article><author>test</author><pages>37</pages></article>', now());
+SELECT * FROM
+xpath_table('article_id',
+            'article_xml',
+            'articles',
+            '/article/author|/article/pages|/article/title',
+            'date_entered > ''2003-01-01'' ')
+AS t(article_id integer, author text, page_count integer, title text);
+ article_id | author | page_count | title 
+------------+--------+------------+-------
+          2 | test   |         37 | 
+(1 row)
+
+-- this used to fail when invoked a second time
+select xslt_process('<aaa/>',$$<xsl:stylesheet version="1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:template match="@*|node()">
+      <xsl:copy>
+         <xsl:apply-templates select="@*|node()"/>
+      </xsl:copy>
+   </xsl:template>
+</xsl:stylesheet>$$)::xml;
+ xslt_process 
+--------------
+ <aaa/>      +
+ 
+(1 row)
+
+select xslt_process('<aaa/>',$$<xsl:stylesheet version="1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:template match="@*|node()">
+      <xsl:copy>
+         <xsl:apply-templates select="@*|node()"/>
+      </xsl:copy>
+   </xsl:template>
+</xsl:stylesheet>$$)::xml;
+ xslt_process 
+--------------
+ <aaa/>      +
+ 
+(1 row)
+
+create table t1 (id integer, xml_data xml);
+insert into t1 (id, xml_data)
+values
+(1, '<attributes><attribute name="attr_1">Some
+Value</attribute></attributes>');
+create index idx_xpath on t1 ( xpath_string
+('/attributes/attribute[@name="attr_1"]/text()', xml_data::text));
diff --git a/contrib/xml2/expected/xml2_1.out b/contrib/xml2/expected/xml2_1.out
new file mode 100644
index 0000000000..083fc3b2ca
--- /dev/null
+++ b/contrib/xml2/expected/xml2_1.out
@@ -0,0 +1,109 @@
+--
+-- first, define the functions.  Turn off echoing so that expected file
+-- does not depend on contents of pgxml.sql.
+--
+SET client_min_messages = warning;
+\set ECHO none
+RESET client_min_messages;
+select query_to_xml('select 1 as x',true,false,'');
+                         query_to_xml                          
+---------------------------------------------------------------
+ <table xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">+
+                                                              +
+ <row>                                                        +
+   <x>1</x>                                                   +
+ </row>                                                       +
+                                                              +
+ </table>                                                     +
+ 
+(1 row)
+
+select xslt_process( query_to_xml('select x from generate_series(1,5) as 
+x',true,false,'')::text,
+$$<xsl:stylesheet version="1.0"
+               xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes" />
+<xsl:template match="*">
+  <xsl:copy>
+     <xsl:copy-of select="@*" />
+     <xsl:apply-templates />
+  </xsl:copy>
+</xsl:template>
+<xsl:template match="comment()|processing-instruction()">
+  <xsl:copy />
+</xsl:template>
+</xsl:stylesheet>
+$$::text);
+ERROR:  xslt_process() is not available without libxslt
+CREATE TABLE xpath_test (id integer NOT NULL, t xml);
+INSERT INTO xpath_test VALUES (1, '<doc><int>1</int></doc>');
+SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true')
+as t(id int4);
+ id 
+----
+(0 rows)
+
+SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true')
+as t(id int4, doc int4);
+ id | doc 
+----+-----
+  1 |   1
+(1 row)
+
+DROP TABLE xpath_test;
+CREATE TABLE xpath_test (id integer NOT NULL, t text);
+INSERT INTO xpath_test VALUES (1, '<doc><int>1</int></doc>');
+SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true')
+as t(id int4);
+ id 
+----
+(0 rows)
+
+SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true')
+as t(id int4, doc int4);
+ id | doc 
+----+-----
+  1 |   1
+(1 row)
+
+create table articles (article_id integer, article_xml xml, date_entered date);
+insert into articles (article_id, article_xml, date_entered)
+values (2, '<article><author>test</author><pages>37</pages></article>', now());
+SELECT * FROM
+xpath_table('article_id',
+            'article_xml',
+            'articles',
+            '/article/author|/article/pages|/article/title',
+            'date_entered > ''2003-01-01'' ')
+AS t(article_id integer, author text, page_count integer, title text);
+ article_id | author | page_count | title 
+------------+--------+------------+-------
+          2 | test   |         37 | 
+(1 row)
+
+-- this used to fail when invoked a second time
+select xslt_process('<aaa/>',$$<xsl:stylesheet version="1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:template match="@*|node()">
+      <xsl:copy>
+         <xsl:apply-templates select="@*|node()"/>
+      </xsl:copy>
+   </xsl:template>
+</xsl:stylesheet>$$)::xml;
+ERROR:  xslt_process() is not available without libxslt
+select xslt_process('<aaa/>',$$<xsl:stylesheet version="1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:template match="@*|node()">
+      <xsl:copy>
+         <xsl:apply-templates select="@*|node()"/>
+      </xsl:copy>
+   </xsl:template>
+</xsl:stylesheet>$$)::xml;
+ERROR:  xslt_process() is not available without libxslt
+create table t1 (id integer, xml_data xml);
+insert into t1 (id, xml_data)
+values
+(1, '<attributes><attribute name="attr_1">Some
+Value</attribute></attributes>');
+create index idx_xpath on t1 ( xpath_string
+('/attributes/attribute[@name="attr_1"]/text()', xml_data::text));
diff --git a/contrib/xml2/pgxml.sql.in b/contrib/xml2/pgxml.sql.in
index 09957d6ce0..98d8f81b57 100644
--- a/contrib/xml2/pgxml.sql.in
+++ b/contrib/xml2/pgxml.sql.in
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/contrib/xml2/pgxml.sql.in,v 1.11 2007/11/13 04:24:29 momjian Exp $ */
+/* $PostgreSQL: pgsql/contrib/xml2/pgxml.sql.in,v 1.12 2010/03/01 18:07:59 tgl Exp $ */
 
 -- Adjust this setting to control where the objects get created.
 SET search_path = public;
@@ -40,22 +40,17 @@ CREATE OR REPLACE FUNCTION xpath_list(text,text,text) RETURNS text
 AS 'MODULE_PATHNAME'
 LANGUAGE C STRICT IMMUTABLE;
 
-
 CREATE OR REPLACE FUNCTION xpath_list(text,text) RETURNS text
 AS 'SELECT xpath_list($1,$2,'','')'
 LANGUAGE SQL STRICT IMMUTABLE;
 
-
-
 -- Wrapper functions for nodeset where no tags needed
 
-
 CREATE OR REPLACE FUNCTION xpath_nodeset(text,text)
 RETURNS text
 AS 'SELECT xpath_nodeset($1,$2,'''','''')'
 LANGUAGE SQL STRICT IMMUTABLE;
 
-
 CREATE OR REPLACE FUNCTION xpath_nodeset(text,text,text)
 RETURNS text
 AS 'SELECT xpath_nodeset($1,$2,'''',$3)'
@@ -69,9 +64,6 @@ AS 'MODULE_PATHNAME'
 LANGUAGE C STRICT STABLE;
 
 -- XSLT functions
--- Delete from here to the end of the file if you are not compiling with
--- XSLT support.
-
 
 CREATE OR REPLACE FUNCTION xslt_process(text,text,text)
 RETURNS text
@@ -79,7 +71,6 @@ AS 'MODULE_PATHNAME'
 LANGUAGE C STRICT VOLATILE;
 
 -- the function checks for the correct argument count
-
 CREATE OR REPLACE FUNCTION xslt_process(text,text)
 RETURNS text
 AS 'MODULE_PATHNAME'
diff --git a/contrib/xml2/sql/xml2.sql b/contrib/xml2/sql/xml2.sql
new file mode 100644
index 0000000000..73723b6be1
--- /dev/null
+++ b/contrib/xml2/sql/xml2.sql
@@ -0,0 +1,82 @@
+--
+-- first, define the functions.  Turn off echoing so that expected file
+-- does not depend on contents of pgxml.sql.
+--
+SET client_min_messages = warning;
+\set ECHO none
+\i pgxml.sql
+\set ECHO all
+RESET client_min_messages;
+
+select query_to_xml('select 1 as x',true,false,'');
+
+select xslt_process( query_to_xml('select x from generate_series(1,5) as 
+x',true,false,'')::text,
+$$<xsl:stylesheet version="1.0"
+               xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes" />
+<xsl:template match="*">
+  <xsl:copy>
+     <xsl:copy-of select="@*" />
+     <xsl:apply-templates />
+  </xsl:copy>
+</xsl:template>
+<xsl:template match="comment()|processing-instruction()">
+  <xsl:copy />
+</xsl:template>
+</xsl:stylesheet>
+$$::text);
+
+CREATE TABLE xpath_test (id integer NOT NULL, t xml);
+INSERT INTO xpath_test VALUES (1, '<doc><int>1</int></doc>');
+SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true')
+as t(id int4);
+SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true')
+as t(id int4, doc int4);
+
+DROP TABLE xpath_test;
+CREATE TABLE xpath_test (id integer NOT NULL, t text);
+INSERT INTO xpath_test VALUES (1, '<doc><int>1</int></doc>');
+SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true')
+as t(id int4);
+SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true')
+as t(id int4, doc int4);
+
+create table articles (article_id integer, article_xml xml, date_entered date);
+insert into articles (article_id, article_xml, date_entered)
+values (2, '<article><author>test</author><pages>37</pages></article>', now());
+SELECT * FROM
+xpath_table('article_id',
+            'article_xml',
+            'articles',
+            '/article/author|/article/pages|/article/title',
+            'date_entered > ''2003-01-01'' ')
+AS t(article_id integer, author text, page_count integer, title text);
+
+-- this used to fail when invoked a second time
+select xslt_process('<aaa/>',$$<xsl:stylesheet version="1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:template match="@*|node()">
+      <xsl:copy>
+         <xsl:apply-templates select="@*|node()"/>
+      </xsl:copy>
+   </xsl:template>
+</xsl:stylesheet>$$)::xml;
+
+select xslt_process('<aaa/>',$$<xsl:stylesheet version="1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:template match="@*|node()">
+      <xsl:copy>
+         <xsl:apply-templates select="@*|node()"/>
+      </xsl:copy>
+   </xsl:template>
+</xsl:stylesheet>$$)::xml;
+
+create table t1 (id integer, xml_data xml);
+insert into t1 (id, xml_data)
+values
+(1, '<attributes><attribute name="attr_1">Some
+Value</attribute></attributes>');
+
+create index idx_xpath on t1 ( xpath_string
+('/attributes/attribute[@name="attr_1"]/text()', xml_data::text));
diff --git a/contrib/xml2/xpath.c b/contrib/xml2/xpath.c
index 203e53905b..dbf0b76f92 100644
--- a/contrib/xml2/xpath.c
+++ b/contrib/xml2/xpath.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/xml2/xpath.c,v 1.23 2009/06/11 14:48:53 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/xml2/xpath.c,v 1.30 2010/07/06 19:18:55 momjian Exp $
  *
  * Parser interface for DOM-based parser (libxml) rather than
  * stream-based SAX-type parser
@@ -12,6 +12,7 @@
 #include "lib/stringinfo.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
+#include "utils/xml.h"
 
 /* libxml includes */
 
@@ -24,28 +25,7 @@
 
 PG_MODULE_MAGIC;
 
-/* declarations */
-
-static void *pgxml_palloc(size_t size);
-static void *pgxml_repalloc(void *ptr, size_t size);
-static void pgxml_pfree(void *ptr);
-static char *pgxml_pstrdup(const char *string);
-static void pgxml_errorHandler(void *ctxt, const char *msg,...);
-
-void		elog_error(int level, char *explain, int force);
-void		pgxml_parser_init(void);
-
-static xmlChar *pgxmlNodeSetToText(xmlNodeSetPtr nodeset,
-				   xmlChar *toptagname, xmlChar *septagname,
-				   xmlChar *plainsep);
-
-text *pgxml_result_to_text(xmlXPathObjectPtr res, xmlChar *toptag,
-					 xmlChar *septag, xmlChar *plainsep);
-
-xmlChar    *pgxml_texttoxmlchar(text *textstring);
-
-static xmlXPathObjectPtr pgxml_xpath(text *document, xmlChar *xpath);
-
+/* externally accessible functions */
 
 Datum		xml_is_well_formed(PG_FUNCTION_ARGS);
 Datum		xml_encode_special_chars(PG_FUNCTION_ARGS);
@@ -56,111 +36,38 @@ Datum		xpath_bool(PG_FUNCTION_ARGS);
 Datum		xpath_list(PG_FUNCTION_ARGS);
 Datum		xpath_table(PG_FUNCTION_ARGS);
 
-/* Global variables */
-char	   *errbuf;				/* per line error buffer */
-char	   *pgxml_errorMsg = NULL;		/* overall error message */
-
-#define ERRBUF_SIZE 200
-
-/* memory handling passthrough functions (e.g. palloc, pstrdup are
-   currently macros, and the others might become so...) */
+/* exported for use by xslt_proc.c */
 
-static void *
-pgxml_palloc(size_t size)
-{
-/*	elog(DEBUG1,"Alloc %d in CMC %p",size,CurrentMemoryContext); */
-	return palloc(size);
-}
-
-static void *
-pgxml_repalloc(void *ptr, size_t size)
-{
-/*	elog(DEBUG1,"ReAlloc in CMC %p",CurrentMemoryContext);*/
-	return repalloc(ptr, size);
-}
-
-static void
-pgxml_pfree(void *ptr)
-{
-/*	elog(DEBUG1,"Free in CMC %p",CurrentMemoryContext); */
-	pfree(ptr);
-}
+void		pgxml_parser_init(void);
 
-static char *
-pgxml_pstrdup(const char *string)
-{
-	return pstrdup(string);
-}
+/* local declarations */
 
-/* The error handling function. This formats an error message and sets
- * a flag - an ereport will be issued prior to return
- */
+static xmlChar *pgxmlNodeSetToText(xmlNodeSetPtr nodeset,
+				   xmlChar *toptagname, xmlChar *septagname,
+				   xmlChar *plainsep);
 
-static void
-pgxml_errorHandler(void *ctxt, const char *msg,...)
-{
-	va_list		args;
-
-	va_start(args, msg);
-	vsnprintf(errbuf, ERRBUF_SIZE, msg, args);
-	va_end(args);
-	/* Now copy the argument across */
-	if (pgxml_errorMsg == NULL)
-		pgxml_errorMsg = pstrdup(errbuf);
-	else
-	{
-		int32		xsize = strlen(pgxml_errorMsg);
+static text *pgxml_result_to_text(xmlXPathObjectPtr res, xmlChar *toptag,
+					 xmlChar *septag, xmlChar *plainsep);
 
-		pgxml_errorMsg = repalloc(pgxml_errorMsg,
-								  (size_t) (xsize + strlen(errbuf) + 1));
-		strncpy(&pgxml_errorMsg[xsize - 1], errbuf, strlen(errbuf));
-		pgxml_errorMsg[xsize + strlen(errbuf) - 1] = '\0';
+static xmlChar *pgxml_texttoxmlchar(text *textstring);
 
-	}
-	memset(errbuf, 0, ERRBUF_SIZE);
-}
+static xmlXPathObjectPtr pgxml_xpath(text *document, xmlChar *xpath);
 
-/* This function reports the current message at the level specified */
-void
-elog_error(int level, char *explain, int force)
-{
-	if (force || (pgxml_errorMsg != NULL))
-	{
-		if (pgxml_errorMsg == NULL)
-		{
-			ereport(level, (errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
-							errmsg(explain)));
-		}
-		else
-		{
-			ereport(level, (errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
-							errmsg("%s:%s", explain, pgxml_errorMsg)));
-			pfree(pgxml_errorMsg);
-		}
-	}
-}
 
+/*
+ * Initialize for xml parsing.
+ */
 void
-pgxml_parser_init()
+pgxml_parser_init(void)
 {
-	/*
-	 * This code could also set parser settings from  user-supplied info.
-	 * Quite how these settings are made is another matter :)
-	 */
+	/* Set up error handling (we share the core's error handler) */
+	pg_xml_init();
 
-	xmlMemSetup(pgxml_pfree, pgxml_palloc, pgxml_repalloc, pgxml_pstrdup);
+	/* Initialize libxml */
 	xmlInitParser();
 
-	xmlSetGenericErrorFunc(NULL, pgxml_errorHandler);
-
 	xmlSubstituteEntitiesDefault(1);
 	xmlLoadExtDtdDefaultValue = 1;
-
-	pgxml_errorMsg = NULL;
-
-	errbuf = palloc(200);
-	memset(errbuf, 0, 200);
-
 }
 
 
@@ -171,20 +78,15 @@ PG_FUNCTION_INFO_V1(xml_is_well_formed);
 Datum
 xml_is_well_formed(PG_FUNCTION_ARGS)
 {
-	/* called as xml_is_well_formed(document) */
-	xmlDocPtr	doctree;
 	text	   *t = PG_GETARG_TEXT_P(0);		/* document buffer */
 	int32		docsize = VARSIZE(t) - VARHDRSZ;
+	xmlDocPtr	doctree;
 
 	pgxml_parser_init();
 
 	doctree = xmlParseMemory((char *) VARDATA(t), docsize);
 	if (doctree == NULL)
-	{
-		xmlCleanupParser();
 		PG_RETURN_BOOL(false);	/* i.e. not well-formed */
-	}
-	xmlCleanupParser();
 	xmlFreeDoc(doctree);
 	PG_RETURN_BOOL(true);
 }
@@ -215,28 +117,23 @@ xml_encode_special_chars(PG_FUNCTION_ARGS)
 	PG_RETURN_TEXT_P(tout);
 }
 
-static xmlChar
-		   *
+/*
+ * Function translates a nodeset into a text representation
+ *
+ * iterates over each node in the set and calls xmlNodeDump to write it to
+ * an xmlBuffer -from which an xmlChar * string is returned.
+ *
+ * each representation is surrounded by <tagname> ... </tagname>
+ *
+ * plainsep is an ordinary (not tag) separator - if used, then nodes are
+ * cast to string as output method
+ */
+static xmlChar *
 pgxmlNodeSetToText(xmlNodeSetPtr nodeset,
 				   xmlChar *toptagname,
 				   xmlChar *septagname,
 				   xmlChar *plainsep)
 {
-	/* Function translates a nodeset into a text representation */
-
-	/*
-	 * iterates over each node in the set and calls xmlNodeDump to write it to
-	 * an xmlBuffer -from which an xmlChar * string is returned.
-	 */
-
-	/* each representation is surrounded by <tagname> ... </tagname> */
-
-	/*
-	 * plainsep is an ordinary (not tag) seperator - if used, then nodes are
-	 * cast to string as output method
-	 */
-
-
 	xmlBufferPtr buf;
 	xmlChar    *result;
 	int			i;
@@ -253,7 +150,6 @@ pgxmlNodeSetToText(xmlNodeSetPtr nodeset,
 	{
 		for (i = 0; i < nodeset->nodeNr; i++)
 		{
-
 			if (plainsep != NULL)
 			{
 				xmlBufferWriteCHAR(buf,
@@ -265,8 +161,6 @@ pgxmlNodeSetToText(xmlNodeSetPtr nodeset,
 			}
 			else
 			{
-
-
 				if ((septagname != NULL) && (xmlStrlen(septagname) > 0))
 				{
 					xmlBufferWriteChar(buf, "<");
@@ -303,19 +197,18 @@ pgxmlNodeSetToText(xmlNodeSetPtr nodeset,
 /* Translate a PostgreSQL "varlena" -i.e. a variable length parameter
  * into the libxml2 representation
  */
-
-xmlChar *
+static xmlChar *
 pgxml_texttoxmlchar(text *textstring)
 {
 	return (xmlChar *) text_to_cstring(textstring);
 }
 
-/* Public visible XPath functions */
+/* Publicly visible XPath functions */
 
-/* This is a "raw" xpath function. Check that it returns child elements
+/*
+ * This is a "raw" xpath function. Check that it returns child elements
  * properly
  */
-
 PG_FUNCTION_INFO_V1(xpath_nodeset);
 
 Datum
@@ -325,8 +218,7 @@ xpath_nodeset(PG_FUNCTION_ARGS)
 			   *toptag,
 			   *septag;
 	int32		pathsize;
-	text
-			   *xpathsupp,
+	text	   *xpathsupp,
 			   *xpres;
 
 	/* PG_GETARG_TEXT_P(0) is document buffer */
@@ -339,11 +231,9 @@ xpath_nodeset(PG_FUNCTION_ARGS)
 
 	xpath = pgxml_texttoxmlchar(xpathsupp);
 
-	xpres = pgxml_result_to_text(
-								 pgxml_xpath(PG_GETARG_TEXT_P(0), xpath),
+	xpres = pgxml_result_to_text(pgxml_xpath(PG_GETARG_TEXT_P(0), xpath),
 								 toptag, septag, NULL);
 
-	/* xmlCleanupParser(); done by result_to_text routine */
 	pfree(xpath);
 
 	if (xpres == NULL)
@@ -351,9 +241,10 @@ xpath_nodeset(PG_FUNCTION_ARGS)
 	PG_RETURN_TEXT_P(xpres);
 }
 
-/*	The following function is almost identical, but returns the elements in */
-/*	a list. */
-
+/*
+ * The following function is almost identical, but returns the elements in
+ * a list.
+ */
 PG_FUNCTION_INFO_V1(xpath_list);
 
 Datum
@@ -362,8 +253,7 @@ xpath_list(PG_FUNCTION_ARGS)
 	xmlChar    *xpath,
 			   *plainsep;
 	int32		pathsize;
-	text
-			   *xpathsupp,
+	text	   *xpathsupp,
 			   *xpres;
 
 	/* PG_GETARG_TEXT_P(0) is document buffer */
@@ -375,11 +265,9 @@ xpath_list(PG_FUNCTION_ARGS)
 
 	xpath = pgxml_texttoxmlchar(xpathsupp);
 
-	xpres = pgxml_result_to_text(
-								 pgxml_xpath(PG_GETARG_TEXT_P(0), xpath),
+	xpres = pgxml_result_to_text(pgxml_xpath(PG_GETARG_TEXT_P(0), xpath),
 								 NULL, NULL, plainsep);
 
-	/* xmlCleanupParser(); done by result_to_text routine */
 	pfree(xpath);
 
 	if (xpres == NULL)
@@ -395,8 +283,7 @@ xpath_string(PG_FUNCTION_ARGS)
 {
 	xmlChar    *xpath;
 	int32		pathsize;
-	text
-			   *xpathsupp,
+	text	   *xpathsupp,
 			   *xpres;
 
 	/* PG_GETARG_TEXT_P(0) is document buffer */
@@ -416,11 +303,9 @@ xpath_string(PG_FUNCTION_ARGS)
 	xpath[pathsize + 7] = ')';
 	xpath[pathsize + 8] = '\0';
 
-	xpres = pgxml_result_to_text(
-								 pgxml_xpath(PG_GETARG_TEXT_P(0), xpath),
+	xpres = pgxml_result_to_text(pgxml_xpath(PG_GETARG_TEXT_P(0), xpath),
 								 NULL, NULL, NULL);
 
-	xmlCleanupParser();
 	pfree(xpath);
 
 	if (xpres == NULL)
@@ -436,9 +321,7 @@ xpath_number(PG_FUNCTION_ARGS)
 {
 	xmlChar    *xpath;
 	int32		pathsize;
-	text
-			   *xpathsupp;
-
+	text	   *xpathsupp;
 	float4		fRes;
 
 	xmlXPathObjectPtr res;
@@ -454,18 +337,14 @@ xpath_number(PG_FUNCTION_ARGS)
 	pfree(xpath);
 
 	if (res == NULL)
-	{
-		xmlCleanupParser();
 		PG_RETURN_NULL();
-	}
 
 	fRes = xmlXPathCastToNumber(res);
-	xmlCleanupParser();
+
 	if (xmlXPathIsNaN(fRes))
 		PG_RETURN_NULL();
 
 	PG_RETURN_FLOAT4(fRes);
-
 }
 
 
@@ -476,9 +355,7 @@ xpath_bool(PG_FUNCTION_ARGS)
 {
 	xmlChar    *xpath;
 	int32		pathsize;
-	text
-			   *xpathsupp;
-
+	text	   *xpathsupp;
 	int			bRes;
 
 	xmlXPathObjectPtr res;
@@ -494,57 +371,44 @@ xpath_bool(PG_FUNCTION_ARGS)
 	pfree(xpath);
 
 	if (res == NULL)
-	{
-		xmlCleanupParser();
 		PG_RETURN_BOOL(false);
-	}
 
 	bRes = xmlXPathCastToBoolean(res);
-	xmlCleanupParser();
-	PG_RETURN_BOOL(bRes);
 
+	PG_RETURN_BOOL(bRes);
 }
 
 
 
 /* Core function to evaluate XPath query */
 
-xmlXPathObjectPtr
+static xmlXPathObjectPtr
 pgxml_xpath(text *document, xmlChar *xpath)
 {
-
 	xmlDocPtr	doctree;
 	xmlXPathContextPtr ctxt;
 	xmlXPathObjectPtr res;
-
 	xmlXPathCompExprPtr comppath;
-
 	int32		docsize;
 
-
 	docsize = VARSIZE(document) - VARHDRSZ;
 
 	pgxml_parser_init();
 
 	doctree = xmlParseMemory((char *) VARDATA(document), docsize);
 	if (doctree == NULL)
-	{							/* not well-formed */
-		return NULL;
-	}
+		return NULL;			/* not well-formed */
 
 	ctxt = xmlXPathNewContext(doctree);
 	ctxt->node = xmlDocGetRootElement(doctree);
 
-
 	/* compile the path */
 	comppath = xmlXPathCompile(xpath);
 	if (comppath == NULL)
 	{
-		xmlCleanupParser();
 		xmlFreeDoc(doctree);
-		elog_error(ERROR, "XPath Syntax Error", 1);
-
-		return NULL;
+		xml_ereport(ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
+					"XPath Syntax Error");
 	}
 
 	/* Now evaluate the path expression. */
@@ -554,7 +418,6 @@ pgxml_xpath(text *document, xmlChar *xpath)
 	if (res == NULL)
 	{
 		xmlXPathFreeContext(ctxt);
-		/* xmlCleanupParser(); */
 		xmlFreeDoc(doctree);
 
 		return NULL;
@@ -563,8 +426,7 @@ pgxml_xpath(text *document, xmlChar *xpath)
 	return res;
 }
 
-text
-		   *
+static text *
 pgxml_result_to_text(xmlXPathObjectPtr res,
 					 xmlChar *toptag,
 					 xmlChar *septag,
@@ -574,10 +436,8 @@ pgxml_result_to_text(xmlXPathObjectPtr res,
 	text	   *xpres;
 
 	if (res == NULL)
-	{
-		xmlCleanupParser();
 		return NULL;
-	}
+
 	switch (res->type)
 	{
 		case XPATH_NODESET:
@@ -595,37 +455,37 @@ pgxml_result_to_text(xmlXPathObjectPtr res,
 			xpresstr = xmlStrdup((const xmlChar *) "<unsupported/>");
 	}
 
-
 	/* Now convert this result back to text */
 	xpres = cstring_to_text((char *) xpresstr);
 
 	/* Free various storage */
-	xmlCleanupParser();
-	/* xmlFreeDoc(doctree);  -- will die at end of tuple anyway */
-
 	xmlFree(xpresstr);
 
-	elog_error(ERROR, "XPath error", 0);
-
-
 	return xpres;
 }
 
-/* xpath_table is a table function. It needs some tidying (as do the
+/*
+ * xpath_table is a table function. It needs some tidying (as do the
  * other functions here!
  */
-
 PG_FUNCTION_INFO_V1(xpath_table);
 
 Datum
 xpath_table(PG_FUNCTION_ARGS)
 {
-/* SPI (input tuple) support */
+	/* Function parameters */
+	char	   *pkeyfield = text_to_cstring(PG_GETARG_TEXT_PP(0));
+	char	   *xmlfield = text_to_cstring(PG_GETARG_TEXT_PP(1));
+	char	   *relname = text_to_cstring(PG_GETARG_TEXT_PP(2));
+	char	   *xpathset = text_to_cstring(PG_GETARG_TEXT_PP(3));
+	char	   *condition = text_to_cstring(PG_GETARG_TEXT_PP(4));
+
+	/* SPI (input tuple) support */
 	SPITupleTable *tuptable;
 	HeapTuple	spi_tuple;
 	TupleDesc	spi_tupdesc;
 
-/* Output tuple (tuplestore) support */
+	/* Output tuple (tuplestore) support */
 	Tuplestorestate *tupstore = NULL;
 	TupleDesc	ret_tupdesc;
 	HeapTuple	ret_tuple;
@@ -635,13 +495,6 @@ xpath_table(PG_FUNCTION_ARGS)
 	MemoryContext per_query_ctx;
 	MemoryContext oldcontext;
 
-/* Function parameters */
-	char	   *pkeyfield = text_to_cstring(PG_GETARG_TEXT_PP(0));
-	char	   *xmlfield = text_to_cstring(PG_GETARG_TEXT_PP(1));
-	char	   *relname = text_to_cstring(PG_GETARG_TEXT_PP(2));
-	char	   *xpathset = text_to_cstring(PG_GETARG_TEXT_PP(3));
-	char	   *condition = text_to_cstring(PG_GETARG_TEXT_PP(4));
-
 	char	  **values;
 	xmlChar   **xpaths;
 	char	   *pos;
@@ -654,8 +507,7 @@ xpath_table(PG_FUNCTION_ARGS)
 	int			j;
 	int			rownr;			/* For issuing multiple rows from one original
 								 * document */
-	int			had_values;		/* To determine end of nodeset results */
-
+	bool		had_values;		/* To determine end of nodeset results */
 	StringInfoData query_buf;
 
 	/* We only have a valid tuple description in table function mode */
@@ -682,7 +534,6 @@ xpath_table(PG_FUNCTION_ARGS)
 	 * The tuplestore must exist in a higher context than this function call
 	 * (per_query_ctx is used)
 	 */
-
 	per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
 	oldcontext = MemoryContextSwitchTo(per_query_ctx);
 
@@ -699,6 +550,12 @@ xpath_table(PG_FUNCTION_ARGS)
 	/* get the requested return tuple description */
 	ret_tupdesc = CreateTupleDescCopy(rsinfo->expectedDesc);
 
+	/* must have at least one output column (for the pkey) */
+	if (ret_tupdesc->natts < 1)
+		ereport(ERROR,
+				(errcode(ERRCODE_SYNTAX_ERROR),
+				 errmsg("xpath_table must have at least one output column")));
+
 	/*
 	 * At the moment we assume that the returned attributes make sense for the
 	 * XPath specififed (i.e. we trust the caller). It's not fatal if they get
@@ -714,26 +571,27 @@ xpath_table(PG_FUNCTION_ARGS)
 	rsinfo->setDesc = ret_tupdesc;
 
 	values = (char **) palloc(ret_tupdesc->natts * sizeof(char *));
-
 	xpaths = (xmlChar **) palloc(ret_tupdesc->natts * sizeof(xmlChar *));
 
-	/* Split XPaths. xpathset is a writable CString. */
-
-	/* Note that we stop splitting once we've done all needed for tupdesc */
-
+	/*
+	 * Split XPaths. xpathset is a writable CString.
+	 *
+	 * Note that we stop splitting once we've done all needed for tupdesc
+	 */
 	numpaths = 0;
 	pos = xpathset;
-	do
+	while (numpaths < (ret_tupdesc->natts - 1))
 	{
-		xpaths[numpaths] = (xmlChar *) pos;
+		xpaths[numpaths++] = (xmlChar *) pos;
 		pos = strstr(pos, pathsep);
 		if (pos != NULL)
 		{
 			*pos = '\0';
 			pos++;
 		}
-		numpaths++;
-	} while ((pos != NULL) && (numpaths < (ret_tupdesc->natts - 1)));
+		else
+			break;
+	}
 
 	/* Now build query */
 	initStringInfo(&query_buf);
@@ -743,30 +601,28 @@ xpath_table(PG_FUNCTION_ARGS)
 					 pkeyfield,
 					 xmlfield,
 					 relname,
-					 condition
-		);
-
+					 condition);
 
 	if ((ret = SPI_connect()) < 0)
 		elog(ERROR, "xpath_table: SPI_connect returned %d", ret);
 
 	if ((ret = SPI_exec(query_buf.data, 0)) != SPI_OK_SELECT)
-		elog(ERROR, "xpath_table: SPI execution failed for query %s", query_buf.data);
+		elog(ERROR, "xpath_table: SPI execution failed for query %s",
+			 query_buf.data);
 
 	proc = SPI_processed;
 	/* elog(DEBUG1,"xpath_table: SPI returned %d rows",proc); */
 	tuptable = SPI_tuptable;
 	spi_tupdesc = tuptable->tupdesc;
 
-/* Switch out of SPI context */
+	/* Switch out of SPI context */
 	MemoryContextSwitchTo(oldcontext);
 
-
-/* Check that SPI returned correct result. If you put a comma into one of
- * the function parameters, this will catch it when the SPI query returns
- * e.g. 3 columns.
- */
-
+	/*
+	 * Check that SPI returned correct result. If you put a comma into one of
+	 * the function parameters, this will catch it when the SPI query returns
+	 * e.g. 3 columns.
+	 */
 	if (spi_tupdesc->natts != 2)
 	{
 		ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
@@ -774,10 +630,10 @@ xpath_table(PG_FUNCTION_ARGS)
 						errdetail("Expected two columns in SPI result, got %d.", spi_tupdesc->natts)));
 	}
 
-/* Setup the parser. Beware that this must happen in the same context as the
- * cleanup - which means that any error from here on must do cleanup to
- * ensure that the entity table doesn't get freed by being out of context.
- */
+	/*
+	 * Setup the parser.  This should happen after we are done evaluating the
+	 * query, in case it calls functions that set up libxml differently.
+	 */
 	pgxml_parser_init();
 
 	/* For each row i.e. document returned from SPI */
@@ -785,13 +641,10 @@ xpath_table(PG_FUNCTION_ARGS)
 	{
 		char	   *pkey;
 		char	   *xmldoc;
-
 		xmlDocPtr	doctree;
 		xmlXPathContextPtr ctxt;
 		xmlXPathObjectPtr res;
 		xmlChar    *resstr;
-
-
 		xmlXPathCompExprPtr comppath;
 
 		/* Extract the row data as C Strings */
@@ -801,10 +654,9 @@ xpath_table(PG_FUNCTION_ARGS)
 
 		/*
 		 * Clear the values array, so that not-well-formed documents return
-		 * NULL in all columns.
+		 * NULL in all columns.  Note that this also means that spare columns
+		 * will be NULL.
 		 */
-
-		/* Note that this also means that spare columns will be NULL. */
 		for (j = 0; j < ret_tupdesc->natts; j++)
 			values[j] = NULL;
 
@@ -821,9 +673,7 @@ xpath_table(PG_FUNCTION_ARGS)
 		{
 			/* not well-formed, so output all-NULL tuple */
 			ret_tuple = BuildTupleFromCStrings(attinmeta, values);
-			oldcontext = MemoryContextSwitchTo(per_query_ctx);
 			tuplestore_puttuple(tupstore, ret_tuple);
-			MemoryContextSwitchTo(oldcontext);
 			heap_freetuple(ret_tuple);
 		}
 		else
@@ -834,24 +684,19 @@ xpath_table(PG_FUNCTION_ARGS)
 			do
 			{
 				/* Now evaluate the set of xpaths. */
-				had_values = 0;
+				had_values = false;
 				for (j = 0; j < numpaths; j++)
 				{
-
 					ctxt = xmlXPathNewContext(doctree);
 					ctxt->node = xmlDocGetRootElement(doctree);
-					xmlSetGenericErrorFunc(ctxt, pgxml_errorHandler);
 
 					/* compile the path */
 					comppath = xmlXPathCompile(xpaths[j]);
 					if (comppath == NULL)
 					{
-						xmlCleanupParser();
 						xmlFreeDoc(doctree);
-
-						elog_error(ERROR, "XPath Syntax Error", 1);
-
-						PG_RETURN_NULL();		/* Keep compiler happy */
+						xml_ereport(ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
+									"XPath Syntax Error");
 					}
 
 					/* Now evaluate the path expression. */
@@ -864,11 +709,12 @@ xpath_table(PG_FUNCTION_ARGS)
 						{
 							case XPATH_NODESET:
 								/* We see if this nodeset has enough nodes */
-								if ((res->nodesetval != NULL) && (rownr < res->nodesetval->nodeNr))
+								if (res->nodesetval != NULL &&
+									rownr < res->nodesetval->nodeNr)
 								{
 									resstr =
 										xmlXPathCastNodeToString(res->nodesetval->nodeTab[rownr]);
-									had_values = 1;
+									had_values = true;
 								}
 								else
 									resstr = NULL;
@@ -884,7 +730,6 @@ xpath_table(PG_FUNCTION_ARGS)
 								resstr = xmlStrdup((const xmlChar *) "<unsupported/>");
 						}
 
-
 						/*
 						 * Insert this into the appropriate column in the
 						 * result tuple.
@@ -893,20 +738,17 @@ xpath_table(PG_FUNCTION_ARGS)
 					}
 					xmlXPathFreeContext(ctxt);
 				}
+
 				/* Now add the tuple to the output, if there is one. */
 				if (had_values)
 				{
 					ret_tuple = BuildTupleFromCStrings(attinmeta, values);
-					oldcontext = MemoryContextSwitchTo(per_query_ctx);
 					tuplestore_puttuple(tupstore, ret_tuple);
-					MemoryContextSwitchTo(oldcontext);
 					heap_freetuple(ret_tuple);
 				}
 
 				rownr++;
-
 			} while (had_values);
-
 		}
 
 		xmlFreeDoc(doctree);
@@ -917,8 +759,6 @@ xpath_table(PG_FUNCTION_ARGS)
 			pfree(xmldoc);
 	}
 
-	xmlCleanupParser();
-/* Needed to flag completeness in 7.3.1. 7.4 defines it as a no-op. */
 	tuplestore_donestoring(tupstore);
 
 	SPI_finish();
@@ -933,5 +773,4 @@ xpath_table(PG_FUNCTION_ARGS)
 	 * expecting.
 	 */
 	return (Datum) 0;
-
 }
diff --git a/contrib/xml2/xslt_proc.c b/contrib/xml2/xslt_proc.c
index 08816b273a..4c80732bb8 100644
--- a/contrib/xml2/xslt_proc.c
+++ b/contrib/xml2/xslt_proc.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/xml2/xslt_proc.c,v 1.15 2009/06/11 14:48:53 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/xml2/xslt_proc.c,v 1.21 2010/07/06 19:18:55 momjian Exp $
  *
  * XSLT processing functions (requiring libxslt)
  *
@@ -12,6 +12,9 @@
 #include "funcapi.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
+#include "utils/xml.h"
+
+#ifdef USE_LIBXSLT
 
 /* libxml includes */
 
@@ -25,26 +28,32 @@
 #include <libxslt/xsltInternals.h>
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
+#endif   /* USE_LIBXSLT */
+
+
+/* externally accessible functions */
+
+Datum		xslt_process(PG_FUNCTION_ARGS);
 
+#ifdef USE_LIBXSLT
 
 /* declarations to come from xpath.c */
-extern void elog_error(int level, char *explain, int force);
-extern void pgxml_parser_init();
-extern xmlChar *pgxml_texttoxmlchar(text *textstring);
+extern void pgxml_parser_init(void);
 
 /* local defs */
 static void parse_params(const char **params, text *paramstr);
 
-Datum		xslt_process(PG_FUNCTION_ARGS);
-
+#define MAXPARAMS 20			/* must be even, see parse_params() */
+#endif   /* USE_LIBXSLT */
 
-#define MAXPARAMS 20
 
 PG_FUNCTION_INFO_V1(xslt_process);
 
 Datum
 xslt_process(PG_FUNCTION_ARGS)
 {
+#ifdef USE_LIBXSLT
+
 	text	   *doct = PG_GETARG_TEXT_P(0);
 	text	   *ssheet = PG_GETARG_TEXT_P(1);
 	text	   *paramstr;
@@ -77,12 +86,8 @@ xslt_process(PG_FUNCTION_ARGS)
 		doctree = xmlParseFile(text_to_cstring(doct));
 
 	if (doctree == NULL)
-	{
-		xmlCleanupParser();
-		elog_error(ERROR, "error parsing XML document", 0);
-
-		PG_RETURN_NULL();
-	}
+		xml_ereport(ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
+					"error parsing XML document");
 
 	/* Same for stylesheet */
 	if (VARDATA(ssheet)[0] == '<')
@@ -92,9 +97,8 @@ xslt_process(PG_FUNCTION_ARGS)
 		if (ssdoc == NULL)
 		{
 			xmlFreeDoc(doctree);
-			xmlCleanupParser();
-			elog_error(ERROR, "error parsing stylesheet as XML document", 0);
-			PG_RETURN_NULL();
+			xml_ereport(ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
+						"error parsing stylesheet as XML document");
 		}
 
 		stylesheet = xsltParseStylesheetDoc(ssdoc);
@@ -107,9 +111,8 @@ xslt_process(PG_FUNCTION_ARGS)
 	{
 		xmlFreeDoc(doctree);
 		xsltCleanupGlobals();
-		xmlCleanupParser();
-		elog_error(ERROR, "failed to parse stylesheet", 0);
-		PG_RETURN_NULL();
+		xml_ereport(ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
+					"failed to parse stylesheet");
 	}
 
 	restree = xsltApplyStylesheet(stylesheet, doctree, params);
@@ -120,21 +123,27 @@ xslt_process(PG_FUNCTION_ARGS)
 	xmlFreeDoc(doctree);
 
 	xsltCleanupGlobals();
-	xmlCleanupParser();
 
 	if (resstat < 0)
 		PG_RETURN_NULL();
 
 	PG_RETURN_TEXT_P(cstring_to_text_with_len((char *) resstr, reslen));
+#else							/* !USE_LIBXSLT */
+
+	ereport(ERROR,
+			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+			 errmsg("xslt_process() is not available without libxslt")));
+	PG_RETURN_NULL();
+#endif   /* USE_LIBXSLT */
 }
 
+#ifdef USE_LIBXSLT
 
-void
+static void
 parse_params(const char **params, text *paramstr)
 {
 	char	   *pos;
 	char	   *pstr;
-
 	int			i;
 	char	   *nvsep = "=";
 	char	   *itsep = ",";
@@ -154,11 +163,13 @@ parse_params(const char **params, text *paramstr)
 		}
 		else
 		{
-			params[i] = NULL;
+			/* No equal sign, so ignore this "parameter" */
+			/* We'll reset params[i] to NULL below the loop */
 			break;
 		}
 		/* Value */
 		i++;
+		/* since MAXPARAMS is even, we still have i < MAXPARAMS */
 		params[i] = pos;
 		pos = strstr(pos, itsep);
 		if (pos != NULL)
@@ -167,9 +178,13 @@ parse_params(const char **params, text *paramstr)
 			pos++;
 		}
 		else
+		{
+			i++;
 			break;
-
+		}
 	}
-	if (i < MAXPARAMS)
-		params[i + 1] = NULL;
+
+	params[i] = NULL;
 }
+
+#endif   /* USE_LIBXSLT */
diff --git a/doc/FAQ_brazilian b/doc/FAQ_brazilian
deleted file mode 100644
index 16d47428b3..0000000000
--- a/doc/FAQ_brazilian
+++ /dev/null
@@ -1,922 +0,0 @@
-
-                  Perguntas Frequentes (FAQ) sobre PostgreSQL
-                                       
-   �ltima atualiza��o: Sex Nov 16 10:53:50 EST 2007
-   
-   Mantenedor atual: Bruce Momjian ([email protected])
-   
-   Traduzido por: Euler Taveira de Oliveira ([email protected])
-   
-   A vers�o mais recente desse documento pode ser vista em
-   http://www.postgresql.org/files/documentation/faqs/FAQ.html (EN).
-   http://www.postgresql.org/files/documentation/faqs/FAQ_brazilian.html
-   (pt_BR).
-   
-   Perguntas sobre plataformas espec�ficas s�o respondidas em
-   http://www.postgresql.org/docs/faq/.
-     _________________________________________________________________
-   
-                              Perguntas Gerais
-                                      
-   1.1) O que � PostgreSQL? Como ele � pronunciado? O que � Postgres?
-   1.2) Quem controla o PostgreSQL?
-   1.3) Qual � a licen�a do PostgreSQL?
-   1.4) Quais plataformas o PostgreSQL pode ser executado?
-   1.5) Onde eu posso conseguir o PostgreSQL?
-   1.6) Qual � a �ltima vers�o?
-   1.7) Onde eu posso conseguir suporte?
-   1.8) Como eu posso submeter um relato de um bug?
-   1.9) Como eu posso saber quais s�o os bugs conhecidos ou
-   caracter�sticas ausentes?
-   1.10) Que documenta��o est� dispon�vel?
-   1.11) Como eu posso aprender SQL?
-   1.12) Como posso submeter uma corre��o (patch) ou me juntar a equipe
-   de desenvolvimento?
-   1.13) Como � o PostgreSQL comparado a outros SGBDs?
-   1.14) O PostgreSQL gerenciar� as mudan�as de hor�rio devido ao hor�rio
-   de ver�o em v�rios pa�ses?
-   
-                          Perguntas sobre Clientes
-                                      
-   2.1) Quais interfaces est�o dispon�veis para PostgreSQL?
-   2.2) Quais ferramentas est�o dispon�veis para utilizar o PostgreSQL
-   com p�ginas Web?
-   2.3) O PostgreSQL tem interfaces gr�ficas para interagir com usu�rio?
-   
-                         Perguntas Administrativas
-                                      
-   3.1) Como eu instalo o PostgreSQL em um local diferente de
-   /usr/local/pgsql?
-   3.2) Como eu controlo conex�es de outras m�quinas?
-   3.3) Como eu ajusto o servidor de banco de dados para obter uma
-   performance melhor?
-   3.4) Quais caracter�sticas de depura��o est�o dispon�veis?
-   3.5) Por que eu recebo "Sorry, too many clients" quando eu tento
-   conectar?
-   3.6) Qual � o processo de atualiza��o do PostgreSQL?
-   3.7) Que tipo de hardware eu devo usar?
-   
-                           Perguntas Operacionais
-                                      
-   4.1) Como eu fa�o um SELECT somente dos primeiros registros de uma
-   consulta? Um registro rand�mico?
-   4.2) Como eu descubro quais tabelas, �ndices, bancos de dados e
-   usu�rios est�o definidos? Como eu vejo as consultas utilizadas pelo
-   psql para mostr�-los?
-   4.3) Como voc� muda o tipo de dado de uma coluna?
-   4.4) Qual � o tamanho m�ximo de um registro, uma tabela e um banco de
-   dados?
-   4.5) Quanto espa�o em disco � necess�rio para armazenar dados de um
-   arquivo texto?
-   4.6) Por que minhas consultas est�o lentas? Por que elas n�o est�o
-   utilizando meus �ndices?
-   4.7) Como eu vejo como o otimizador de consultas est� avaliando minha
-   consulta?
-   4.8) Como eu fa�o buscas com express�es regulares e buscas com
-   express�es regulares sem diferenciar mau�sculas de min�sculas? Como eu
-   utilizo um �ndice para buscas sem distinguir mai�sculas de min�sculas?
-   4.9) Em uma consulta, como eu detecto se um campo � NULL? Como eu
-   posso concatenar poss�veis NULLs? Como eu posso ordenar por um campo
-   que � NULL ou n�o?
-   4.10) Qual � a diferen�a entre os v�rios tipos de dado de caracteres?
-   4.11.1) Como eu crio um campo serial/auto incremento?
-   4.11.2) Como eu consigo o valor de um campo SERIAL?
-   4.11.3) currval() n�o lida com condi��o de corrida com outros
-   usu�rios?
-   4.11.4) Por que os n�meros da minha sequ�ncia n�o s�o reutilizados
-   quando uma transa��o � abortada? Por que h� intervalos nos n�meros da
-   minha sequ�ncia/coluna SERIAL?
-   4.12) O que � um OID? O que � um CTID?
-   4.13) Por que eu recebo o erro "ERROR: Memory exhausted in
-   AllocSetAlloc()"?
-   4.14) Como eu informo qual vers�o do PostgreSQL eu estou utilizando?
-   4.15) Como eu crio uma coluna que conter� por padr�o a hora atual?
-   4.16) Como eu fa�o uma jun��o externa (outer join)?
-   4.17) Como eu fa�o consultas utilizando m�ltiplos bancos de dados?
-   4.18) Como eu retorno m�ltiplos registros ou colunas de uma fun��o?
-   4.19) Por que eu obtenho erros "relation with OID ###### does not
-   exist" ao acessar tabelas tempor�rias em fun��es PL/PgSQL?
-   4.20) Quais solu��es de replica��o est�o dispon�veis?
-   4.21) Por que os nomes de minhas tabelas e colunas n�o s�o
-   reconhecidos em minha consulta? Por que as mai�sculas n�o s�o
-   preservadas?
-     _________________________________________________________________
-   
-                              Perguntas Gerais
-                                      
-  1.1) O que � PostgreSQL? Como ele � pronunciado? O que � Postgres?
-  
-   PostgreSQL � pronunciado Post-Gres-Q-L. (Para os curiosos que querem
-   saber como se diz "PostgreSQL", um arquivo de �udio est� dispon�vel).
-   
-   O PostgreSQL � um sistema de banco de dados objeto-relacional que tem
-   as caracter�sticas de sistemas de bancos de dados comerciais
-   tradicionais com melhoramentos encontrados nos sistemas SGBDs de
-   pr�xima gera��o. PostgreSQL � livre e o c�digo-fonte completo est�
-   dispon�vel.
-   
-   O desenvolvimento do PostgreSQL � feito por um grupo de
-   desenvolvedores volunt�rios (na sua maioria) espalhados pelo mundo e
-   que se comunicam via Internet. � um projeto da comunidade e n�o �
-   controlado por nenhuma empresa. Para se envolver, veja a FAQ do
-   desenvolvedor em http://www.postgresql.org/docs/faqs.FAQ_DEV.html
-   
-   Postgres � um apelido para o PostgreSQL amplamente utilizado. Era o
-   nome original do projeto em Berkeley e dentre os outros apelidos � o
-   preferido. Se voc� acha 'PostgreSQL' dif�cil de pronunciar, diga
-   apenas 'Postgres'.
-   
-  1.2) Quem controla o PostgreSQL?
-  
-   Se voc� est� procurando por um mantenedor, comit� central ou empresa
-   controladora do PostgreSQL, desista --- n�o h� um(a). N�s temos um
-   comit� core e committers CVS, mas estes grupos s�o mais para quest�es
-   administrativas do que controle. O projeto � direcionado pela
-   comunidade de desenvolvedores e usu�rios, que qualquer um pode se
-   juntar. Tudo o que voc� precisa � se inscrever nas listas de discuss�o
-   e participar das discuss�es. Veja a FAQ do desenvolvedor para obter
-   informa��es como se envolver com o desenvolvimento do PostgreSQL.
-   
-  1.3) Qual � a licen�a do PostgreSQL?
-  
-   O PostgreSQL � distribu�do sob a licen�a BSD cl�ssica. Basicamente,
-   ela permite que usu�rios fa�am qualquer coisa com o c�digo, incluindo
-   revender os bin�rios sem o c�digo-fonte. A �nica restri��o � que voc�
-   n�o nos responsabilize legalmente por problemas com o programa de
-   computador. H� tamb�m a exig�ncia de que esta licen�a apare�a em todas
-   as c�pias do programa de computador. Aqui est� a licen�a BSD que
-   usamos atualmente:
-   
-   PostgreSQL est� sujeito a seguinte licen�a:
-   
-   PostgreSQL Data Base Management System
-   
-   Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
-   Portions Copyright (c) 1994-1996 Regents of the University of
-   California
-   
-   Permission to use, copy, modify, and distribute this software and its
-   documentation for any purpose, without fee, and without a written
-   agreement is hereby granted, provided that the above copyright notice
-   and this paragraph and the following two paragraphs appear in all
-   copies.
-   
-   IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY
-   FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
-   INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND
-   ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN
-   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   
-   THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
-   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
-   PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
-   CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
-   UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-   
-  1.4) Quais plataformas o PostgreSQL pode ser executado?
-  
-   Em geral, qualquer plataforma moderna compat�vel com Unix deve ser
-   capaz de executar o PostgreSQL. As plataformas que foram testadas
-   antes do lan�amento de uma vers�o s�o listadas nas instru��es de
-   instala��o.
-   
-   O PostgreSQL tamb�m executa nativamente nos sistemas operacionais
-   Microsoft Windows baseados no NT tais como Win200 SP4, WinXP e
-   Win2003. Um instalador pr�-empacotado est� dispon�vel em
-   http://pgfoundry.org/projects/pginstaller. Vers�es do Windows baseadas
-   no MS-DOS (Win95, Win98, WinMe) podem executar o PostgreSQL utilizando
-   o Cygwin.
-   
-   H� tamb�m uma vers�o para o Novell Netware 6 em
-   http://forge.novell.com e uma vers�o para OS/2 (eComStation) em
-   http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&button=Search&key=postgre
-   SQL&stype=all&sort=type&dir=%2F.
-   
-  1.5) Onde eu posso conseguir o PostgreSQL?
-  
-   Via navegador web, utilize http://www.postgresql.org/ftp/ e via ftp,
-   utilize ftp://ftp.postgresql.org/pub/.
-   
-  1.6) Qual � a �ltima vers�o?
-  
-   A �ltima vers�o do PostgreSQL � a vers�o 8.2.5.
-   
-   N�s planejamos lan�ar vers�es novas a cada ano com vers�es corretivas
-   em alguns meses.
-   
-  1.7) Onde eu posso conseguir suporte?
-  
-   A comunidade do PostgreSQL fornece assist�ncia a muitos de seus
-   usu�rios via e-mail. O principal s�tio web para inscri��o nas listas
-   de e-mail � http://www.postgresql.org/community/lists/. As listas
-   general e bugs s�o um bom lugar para in�cio.
-   
-   O principal canal de IRC � o #postgresql na Freenode
-   (irc.freenode.net). Para se conectar voc� pode utilizar o comando Unix
-   irc -c '#postgresql' "$USER" irc.freenode.net ou utilizar qualquer
-   outro cliente de IRC. Um canal hisp�nico (#postgresql-es) e um franc�s
-   (#postgresqlfr) tamb�m existem na mesma rede. H� tamb�m um canal
-   PostgreSQL na EFNet.
-   
-   Uma lista de empresas que prestam suporte comercial est� dispon�vel em
-   http://www.postgresql.org/support/professional_support.
-   
-  1.8) Como eu informo a exist�ncia de um bug?
-  
-   Visite o formul�rio que reporta bugs do PostgreSQL em
-   http://www.postgresql.org/support/submitbug.
-   
-   Verifique tamb�m o nosso ftp ftp://ftp.postgresql.org/pub para ver se
-   h� uma vers�o mais recente do PostgreSQL.
-   
-   Bugs submetidos utilizando o formul�rio ou informado a qualquer lista
-   de discuss�o do PostgreSQL tipicamente gera uma das seguintes
-   respostas:
-     * N�o � um bug e o porqu�
-     * � um bug conhecido e j� est� na lista de AFAZERES
-     * O bug foi corrigido na vers�o atual
-     * O bug foi corrigido mas n�o foi empacotado em um vers�o oficial
-     * Um pedido foi feito para obter informa��es detalhadas:
-          + Sistema Operacional
-          + Vers�o do PostgreSQL
-          + Exemplo de teste que reproduz o bug
-          + Informa��es sobre depura��o
-          + Sa�da reconstituidora de vest�gios (backtrace) do depurador
-     * O bug � novo. O seguinte pode ocorrer:
-          + Uma corre��o � criada e ser� inclu�da na pr�xima vers�o
-          + O bug n�o pode ser corrigido imediatamente e � adicionado a
-            lista de AFAZERES
-       
-  1.9) Como eu posso saber quais s�o os bugs conhecidos ou funcionalidades
-  ausentes?
-  
-   O PostgreSQL suporta um subconjunto extendido do SQL:2003. Veja nossa
-   lista de AFAZERES que cont�m bugs conhecidos, funcionalidades ausentes
-   e planos futuros.
-   
-   Uma solicita��o de funcionalidade geralmente resulta em uma das
-   seguintes respostas:
-     * A funcionalidade j� est� na lista de AFAZERES
-     * A funcionalidade n�o � desej�vel porque:
-          + Ela duplica uma funcionalidade existente que j� segue o
-            padr�o SQL
-          + A funcionalidade aumentar� a complexidade do c�digo mas
-            adicionar� pouco benef�cio
-          + A funcionalidade ser� insegura ou n�o-confi�vel
-     * A nova funcionalidade � adicionada a lista de AFAZERES
-       
-   O PostgreSQL n�o utiliza sistema de acompanhamento de bugs porque n�s
-   achamos mais eficiente responder diretamente o e-mail e manter a lista
-   de AFAZERES atualizada. Na pr�tica, bugs n�o duram muito no programa;
-   e bugs que afetam uma grande quantidade de usu�rios s�o corrigidos
-   rapidamente. O �nico lugar para encontrar todas as mudan�as, melhorias
-   e corre��es em uma vers�o do PostgreSQL � ler as mensagens de log do
-   CVS. At� mesmo as notas de lan�amento n�o listam todas as mudan�as
-   feitas no programa.
-   
-  1.10) Que documenta��o est� dispon�vel?
-  
-   O PostgreSQL inclui vasta documenta��o, incluindo um manual extenso,
-   p�ginas de manuais (man pages) e alguns exemplos teste. Veja o
-   diret�rio /doc. Voc� tamb�m pode pesquisar os manuais online em
-   http://www.postgresql.org/docs.
-   
-   H� dois livros sobre PostgreSQL dispon�veis online em
-   http://www.postgresql.org/docs/books/awbook.html e
-   http://www.commandprompt.com/ppbook/. H� uma lista de livros sobre
-   PostgreSQL dispon�veis para compra. Um dos mais populares � o do Korry
-   Douglas. Uma lista de an�lise sobre os livros pode ser encontrada em
-   http://www.postgresql.org/docs/books/. H� tamb�m uma cole��o de
-   artigos t�cnicos sbore PostgreSQL em
-   http://www.postgresql.org/docs/techdocs/.
-   
-   O programa cliente de linha de comando psql tem alguns comandos \d
-   para mostrar informa��es sobre tipos, operadores, fun��es, agrega��es,
-   etc. - utilize \? para mostrar os comandos dispon�veis.
-   
-   Nosso s�tio web cont�m ainda mais documenta��o.
-   
-  1.11) Como eu posso aprender SQL?
-  
-   Primeiro, considere os livros espec�ficos sobre PostgreSQL mencionados
-   acima. Muitos de nossos usu�rios gostam do The Practical SQL Handbook,
-   Bowman, Judith S., et al., Addison-Wesley. Outros do The Complete
-   Reference SQL, Groff et al., McGraw-Hill.
-   
-   H� tamb�m bons tutoriais dispon�veis online:
-     * http://www.intermedia.net/support/sql/sqltut.shtm
-     * http://sqlcourse.com
-     * http://www.w3schools.com/sql/default.asp
-     * http://mysite.verizon.net/Graeme_Birchall/id1.html
-       
-  1.12) Como posso submeter uma corre��o (patch) ou me juntar a equipe de
-  desenvolvimento?
-  
-   Veja a FAQ do Desenvolvedor.
-   
-  1.13) Como � o PostgreSQL comparado a outros SGBDs?
-  
-   H� v�rias maneiras de se medir um software: funcionalidades,
-   performance, confiabilidade, suporte e pre�o.
-   
-   Funcionalidades
-          PostgreSQL tem muitas caracter�sticas presentes em muitos SGBDs
-          comerciais como transa��es, subconsultas, gatilhos, vis�es,
-          integridade referencial de chave estrangeira e bloqueio (lock)
-          sofisticado. N�s temos algumas funcionalidades que eles n�o
-          tem, como tipos definidos pelo usu�rio, heran�a, regras e
-          controle de concorr�ncia de m�ltiplas vers�es para reduzir
-          bloqueios (locks).
-          
-   Performance
-          A performance do PostgreSQL � compar�vel a outros bancos de
-          dados comerciais e de c�digo livre. Ele � mais r�pido em
-          algumas coisas, mais lento em outras. Nossa performance �
-          geralmente +/- 10% comparada a de outros bancos de dados.
-          
-   Confiabilidade
-          N�s sabemos que um SGBD deve ser confi�vel ou ele � in�til. N�s
-          empenhamos em lan�ar vers�es bem testadas, de c�digo est�vel e
-          que tenha o m�nimo de bugs. Cada vers�o tem no m�nimo um m�s de
-          teste em vers�o beta, e nosso hist�rico de vers�es mostra que
-          n�s podemos fornecer vers�es est�veis e s�lidas que est�o
-          prontas para uso em produ��o. N�s acreditamos que somos
-          comparados a nosso favor com outros sistemas de bancos de dados
-          nessa �rea.
-          
-   Suporte
-          Nossas listas de discuss�o fornecem contato com um grupo de
-          desenvolvedores e usu�rios para ajudar a resolver muitos
-          problemas encontrados. Enquanto n�s n�o podemos garantir o
-          conserto, SGBDs comerciais nem sempre fornecem tamb�m. Com
-          acesso direto aos desenvolvedores, a comunidade de usu�rios,
-          manuais e o c�digo fonte faz com que o suporte do PostgreSQL
-          seja superior ao de outros SGBDs. H� suporte comercial por
-          incidente dispon�veis para aqueles que precisam de um. (Veja
-          se��o 1.7 da FAQ).
-          
-   Pre�o
-          N�s somos livres para uso dele tanto comercial quanto n�o
-          comercial. Voc� pode adicionar nosso c�digo ao seu produto sem
-          limita��es, exceto aquelas descritas na nossa licen�a BSD
-          mencionada acima.
-          
-  1.14) O PostgreSQL gerenciar� mudan�as no hor�rio devido ao hor�rio de ver�o
-  em v�rios pa�ses?
-  
-   Mudan�as no hor�rio de ver�o dos USA foram inclu�das nas vers�es 8.0
-   .[4+] do PostgreSQL e em todas as vers�es grandes, i.e. 8.1. Mudan�as
-   no Canad� e Austr�lia Oeste foram inclu�das na 8.0.[10+], 8.1.[6+] e
-   em todas as vers�es grandes subsequentes. Vers�es do PostgreSQL
-   anteriores a 8.0 utilizam o banco de dados de zona hor�ria do sistema
-   operacional para informa��es sobre hor�rio de ver�o.
-     _________________________________________________________________
-   
-                          Perguntas sobre Clientes
-                                      
-  2.1) Quais interfaces est�o dispon�veis para PostgreSQL?
-  
-   A instala��o do PostgreSQL inclui somente as interfaces C e C
-   embutida. Todas as outras interfaces s�o projetos independentes que
-   podem ser obtidos separadamente; sendo separados permitem que eles
-   tenham suas pr�prias datas de lan�amento e time de desenvolvedores.
-   
-   Algumas linguagens de programa��o como PHP incluem uma interface para
-   PostgreSQL. Interfaces para linguagens como Perl, TCL, Python e muitas
-   outras est�o dispon�veis em http://www.pgfoundry.org.
-   
-  2.2) Quais ferramentas est�o dispon�veis para utilizar o PostgreSQL com
-  p�ginas Web?
-  
-   Uma boa introdu��o para p�ginas web que utilizam bancos de dados pode
-   ser vista em: http://www.webreview.com
-   
-   Para integra��o na Web, PHP (http://www.php.net) � uma excelente
-   interface.
-   
-   Para casos complexos, muitos usam a Interface Perl e DBD::Pg com
-   CGI.pm ou mod_perl.
-   
-  2.3) O PostgreSQL tem interfaces gr�ficas para iteragir com o usu�rio?
-  
-   H� um vasto n�mero de Ferramentas Gr�ficas (GUI), que est�o
-   dispon�veis para o PostgreSQL, comerciais e de desenvolvedores de
-   c�digo aberto. Uma lista detalhada pode ser encontrada em Documenta��o
-   da Comunidade PostgreSQL
-     _________________________________________________________________
-   
-                         Perguntas Administrativas
-                                      
-  3.1) Como eu instalo o PostgreSQL em um local diferente de /usr/local/pgsql?
-  
-   Especifique a op��o --prefix quando executar o configure.
-   
-  3.2) Como eu controlo conex�es de outras m�quinas?
-  
-   Por padr�o, o PostgreSQL s� permite conex�es da m�quina local
-   utilizando soquetes de dom�nio Unix ou conex�es TCP/IP. Outras
-   m�quinas n�o poder�o conectar-se a menos que voc� modifique
-   listen_addresses no postgresql.conf, habilite a autentica��o por
-   m�quina modificando o arquivo $PGDATA/pg_hba.conf e reinicie o
-   servidor PostgreSQL.
-   
-  3.3) Como eu ajusto o servidor de banco de dados para obter uma performance
-  melhor?
-  
-   H� tr�s grandes �reas para melhorar a performance em potencial:
-   
-   Mudan�a de Consultas
-          Isto involve modificar consultas para obter melhor performance:
-          
-          + Cria��o de �ndices, incluir express�es e �ndices parciais
-          + Utiliza��o o COPY ao inv�s de m�ltiplos comandos INSERTs
-          + Agrupamento de m�ltiplos comandos em uma �nica transa��o para
-            diminuir a despesa com efetiva��es (commit)
-          + Utiliza��o do CLUSTER quando recuperar v�rios registros de um
-            �ndice
-          + Utiliza��o do LIMIT para retornar um subconjunto da sa�da da
-            consulta
-          + Utiliza��o de Consultas preparadas
-          + Utiliza��o de ANALYZE para manter as estat�sticas do
-            otimizador corretas
-          + Utiliza��o regular do VACUUM ou pg_autovacuum
-          + Remo��o de �ndices durante grande mudan�a de dados
-            
-   Configura��o do Servidor
-          Um grande n�mero de configura��es que afetam a performance.
-          Para obter detalhes adicionais, veja Administration
-          Guide/Server Run-time Environment/Run-time Configuration para
-          listagem completa, e para coment�rios veja
-          http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_co
-          nf_e.html e
-          http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html.
-          
-   Sele��o do Hardware
-          O efeito do hardware na performance � detalhado em
-          http://www.powerpostgresql.com/PerfList/ e
-          http://momjian.us/main/writings/pgsql/hw_performance/index.html
-          .
-          
-  3.4) Quais caracter�sticas de depura��o est�o dispon�veis?
-  
-   H� muitas vari�veis de configura��o do servidor log_* que habilitam a
-   exibi��o de consultas e estat�sticas que podem ser muito �teis para
-   depura��o e medidas de performance.
-   
-  3.5) Por que eu recebo "Sorry, too many clients" quando eu tento conectar?
-  
-   Voc� atingiu o limite padr�o de 100 sess�es. Voc� precisa aumentar o
-   limite do servidor PostgreSQL, que diz quantos processos servidor
-   concorrentes ele pode iniciar, alterando o valor max_connections no
-   postgresql.conf e reiniciando o postmaster.
-   
-  3.6) Qual � o processo de atualiza��o do PostgreSQL?
-  
-   Veja http://www.postgresql.org/support/versioning para discuss�o geral
-   sobre atualiza��es e
-   http://www.postgresql.org/docs/current/static/install-upgrading.html
-   para instru��es espec�ficas.
-   
-  3.7) Que tipo de hardware eu devo usar?
-  
-   Por causa do hardware de PC ser em sua maioria compat�vel, pessoas
-   tendem a acreditar que todos os hardwares de PC s�o de mesma
-   qualidade. N�o � verdade. ECC RAM, SCSI e placas m�e de qualidade s�o
-   mais confi�veis e t�m uma melhor performance do que hardwares mais
-   baratos. O PostgreSQL executar� em quase todo hardware, mas se a
-   confiabilidade e a performance forem importantes � prudente pesquisar
-   sobre as op��es de hardware. Nossas listas de discuss�o podem ser
-   usadas para discutir op��es de hardware e dilemas.
-     _________________________________________________________________
-   
-                           Perguntas Operacionais
-                                      
-  4.1) Como eu fa�o um SELECT somente dos primeiros registros de uma consulta?
-  Um registro rand�mico?
-  
-   Para obter somente alguns registros, se voc� sabe o n�mero de
-   registros necess�rios ao executar o SELECT utilize o LIMIT. Se um
-   �ndice corresponde no ORDER BY � poss�vel que a consulta toda n�o
-   tenha que ser executada. Se voc� n�o sabe o n�mero de registros ao
-   executar o SELECT, utilize um cursor e o FETCH.
-   
-   Para obter um registro rand�mico, utilize:
-    SELECT col
-    FROM tab
-    ORDER BY random()
-    LIMIT 1;
-
-  4.2) Como eu descubro quais tabelas, �ndices, bancos de dados e usu�rios
-  est�o definidos? Como eu vejo as consultas utilizadas pelo psql para
-  mostr�-los?
-  
-   Utilize o comando \dt para ver tabelas no psql. Para obter uma lista
-   completa dos comandos no psql voc� pode utilizar \?. Alternativamente,
-   voc� pode ler o c�digo-fonte do psql no arquivo
-   pgsql/src/bin/psql/describe.c, ele cont�m os comandos SQL que geram a
-   sa�da para os comandos de contrabarra do psql. Voc� tamb�m pode
-   iniciar o psql com a op��o -E para que as consultas utilizadas para
-   executar os comandos que voc� informou seja exibida. O PostgreSQL
-   tamb�m fornece uma inteface compat�vel com SQL do INFORMATION SCHEMA
-   que voc� pode consultar para obter informa��o sobre o banco de dados.
-   
-   H� tamb�m tabelas do sistema que come�am com pg_ que os descrevem
-   tamb�m.
-   
-   Utilizando o psql -l listar� todos os bancos de dados.
-   
-   Veja tamb�m o arquivo pgsql/src/tutorial/syscat.source. Ele ilustra
-   muitos dos comandos SELECTs necess�rios para obter informa��o das
-   tabelas de sistema do banco de dados.
-   
-  4.3) Como voc� muda o tipo de dado de uma coluna?
-  
-   Mudar o tipo de dado de uma coluna pode ser feito facilmente na vers�o
-   8.0 ou superior com ALTER TABLE ALTER COLUMN TYPE.
-   
-   Em vers�es anteriores, fa�a isso:
-    BEGIN;
-    ALTER TABLE tab ADD COLUMN col_nova novo_tipo_dado;
-    UPDATE tab SET col_nova = CAST(col_antiga AS novo_tipo_dado);
-    ALTER TABLE tab DROP COLUMN col_antiga;
-    COMMIT;
-
-   Voc� pode ent�o querer fazer um VACUUM FULL tab para recuperar o
-   espa�o em disco utilizado pelos registros expirados.
-   
-  4.4) Qual � o tamanho m�ximo de um registro, uma tabela e um banco de dados?
-  
-   Estes s�o os limites:
-   
-   Tamanho m�ximo de um banco de dados? ilimitado (existem bancos de
-   dados de 32 TB)
-   Tamanho m�ximo de uma tabela? 32 TB
-   Tamanho m�ximo de um registro? 400 GB
-   Tamanho m�ximo de um campo? 1 GB
-   N�mero m�ximo de registros em uma tabela? ilimitado
-   N�mero m�ximo de colunas em uma tabela? 250-1600 dependendo dos tipos
-   das colunas
-   N�mero m�ximo de �ndices em uma tabela? ilimitado
-   
-   � claro, que eles n�o s�o ilimitados, mas limitados ao espa�o em disco
-   dispon�vel e espa�o em mem�ria/swap. A Performance ser� penalizada
-   quando estes valores se tornarem grandes.
-   
-   O tamanho m�ximo de uma tabela com 32 TB n�o requer suporte a arquivos
-   grandes do sistema operacional. Tabelas grandes s�o armazenadas como
-   m�ltiplos arquivos de 1 GB ent�o o limite do sistema de arquivos n�o �
-   importante.
-   
-   O tamanho m�ximo de uma tabela, o tamanho de um registro e o n�mero
-   m�ximo de colunas podem ser quadruplicados aumentando-se o tamanho
-   padr�o do bloco para 32k. O tamanho m�ximo de uma tabela pode tamb�m
-   ser aumentado utilizando particionamento de tabela.
-   
-   Uma limita��o � que �ndices n�o podem ser criados em colunas maiores
-   do que 2.000 caracteres. Felizmente, tais �ndices s�o raramente
-   necess�rios. Unicidade � melhor garantida por um �ndice de uma fun��o
-   de um hash MD5 de uma coluna longa, e indexa��o de texto longo permite
-   a busca de palavras dentro da coluna.
-   
-  4.5) Quanto espa�o em disco � necess�rio para armazenar dados de um arquivo
-  texto?
-  
-   Um banco de dados PostgreSQL ir� requerer at� cinco vezes a quantidade
-   de espa�o requerida para armazenar dados em um arquivo texto.
-   
-   Como um exemplo, considere um arquivo com 100.000 linhas contendo um
-   inteiro e uma descri��o em cada linha. Suponha que o tamanho m�dio da
-   descri��o � de vinte bytes. O arquivo ter� 2,8 MB. O tamanho do
-   arquivo do banco de dados PostgreSQL que cont�m esses dados pode ser
-   estimado em 5,2 MB:
-    24 bytes: cada cabe�alho de registro (aproximadamente)
-    24 bytes: um campo int e um campo texto
-   + 4 bytes: ponteiro na p�gina para a tupla
-   -------------------------------------------
-    52 bytes por registro
-
-   O tamanho de uma p�gina de dados no PostgreSQL � 8192 bytes (8 KB), ent�o:
-
-   8192 bytes por p�gina
-   ------------------------   =  158 registros por p�gina do banco de dados (arredondado para baixo)
-     52 bytes por registro
-
-   100000 registros de dados
-   ----------------------------  =  633 p�ginas do banco de dados (arredondadopara cima)
-      158 registros por p�gina
-
-633 p�ginas do banco de dados * 8192 bytes por p�gina  =  5.185.536 bytes (5,2MB)
-
-   �ndices n�o requerem muito espa�o, mas cont�m dados que foram
-   indexados, ent�o eles podem ocupar algum espa�o.
-   
-   NULLs s�o armazenados como bitmaps, ent�o eles utilizam muito pouco
-   espa�o.
-   
-  4.6) Por que minhas consultas est�o lentas? Por que elas n�o est�o utilizando
-  meus �ndices?
-  
-   �ndices n�o s�o utilizados por toda consulta. �ndices s�o utilizados
-   somente se a tabela � maior do que um tamanho m�nimo, e a consulta
-   seleciona somente uma pequena porcentagem dos registros da tabela.
-   Isto porque o acesso rand�mico ao disco causado pela busca indexada
-   pode ser mais lento do que uma leitura ao longo da tabela ou busca
-   sequencial.
-   
-   Para determinar se um �ndice deveria ser utilizado, o PostgreSQL deve
-   ter estat�sticas sobre a tabela. Estas estat�sticas s�o coletadas
-   utilizando o VACUUM ANALYZE ou simplesmente o ANALYZE. Utilizando
-   estat�sticas, o otimizador sbae quantos registros est�o na tabela, e
-   pode melhor determinar se �ndices deveriam ser utilizados.
-   Estat�sticas tamb�m s�o �teis para determinar a ordem de jun��o �tima
-   e m�todos de jun��o. Cole��o de estat�sticas deveriam ser feitas
-   periodicamente a medida que o conte�do da tabela muda.
-   
-   �ndices n�o s�o normalmente utilizados para ORDER BY ou para fazer
-   jun��es. Uma busca sequencial seguido por uma ordena��o expl�cita �
-   geralmente mais r�pida do que uma busca indexada em uma tabela grande.
-   Contudo, LIMIT combinado com ORDER BY frequentemente utilizar� �ndice
-   porque somente uma pequena por��o da tabela ser� retornada.
-   
-   Se voc� acredita que o otimizador est� incorreto ao escolher uma busca
-   sequencial, utilize SET enable_seqscan TO 'off' e execute a consulta
-   novamente para ver se uma busca indexada � realmente mais r�pida.
-   
-   Ao utilizar operadores curinga tais como LIKE ou ~, �ndices podem ser
-   utilizados somente em algumas condi��es:
-     * O in�cio da cadeia de caracteres da busca deve ser iniciar com uma
-       cadeia de caracteres, i.e.
-          + modelos LIKE n�o devem iniciar com %.
-          + modelos ~ (express�es regulares) devem iniciar com ^.
-     * A cadeia de caracteres utilizada na busca n�o pode iniciar com a
-       classe de caracteres e.g. [a-e].
-     * Busca que n�o diferenciam mai�sculas de min�sculas tais como ILIKE
-       e ~* n�o utilizam �ndices. Em vez disso, utilize �ndice de
-       express�o, que � descrito na se��o 4.8.
-     * O idioma padr�o C deve ser usando durante o initdb porque n�o �
-       poss�vel saber o pr�ximo caracter em idiomas que n�o sejam o C.
-       Voc� pode criar um �ndice especial text_pattern_ops para tais
-       casos que funcionam somente para indexa��o com LIKE. Tamb�m �
-       poss�vel utilizar indexa��o de busca textual para buscas por
-       palavras.
-       
-   Em vers�es anteriores a 8.0, �ndices frequentemente n�o podem ser
-   utilizados a menos que os tipos de dados correspondam aos tipos de
-   coluna do �ndice. Isto era particularmente verdadeiro para �ndices de
-   coluna int2, int8 e numeric.
-   
-  4.7) Como eu vejo como o otimizador de consulta est� avaliando a minha
-  consulta?
-  
-   Veja o comando EXPLAIN no manual.
-   
-  4.8) Como eu fa�o buscas com express�es regulares e buscas com express�es
-  regulares sem diferenciar mai�sculas de min�sculas? Como eu utilizo um �ndice
-  para buscas que n�o diferenciam mai�sculas de min�sculas?
-  
-   O operador ~ faz avalia��o de express�es regulares, e ~* faz avalia��o
-   n�o sens�vel a mai�sculas de express�es regulares. A variante n�o
-   sens�vel a mai�sculas do LIKE � chamada de ILIKE.
-   
-   Compara��es de igualdade n�o sens�veis a mai�sculas s�o normalmente
-   expressadas como:
-    SELECT *
-    FROM tab
-    WHERE lower(col) = 'abc';
-
-   Isso n�o ir� utilizar o �ndice padr�o. Contudo, se voc� criar um
-   �ndice de express�o, ele ser� utilizado:
-    CREATE INDEX tabindex ON tab (lower(col));
-
-   Se o �ndice acima � criado como UNIQUE, embora a coluna possa
-   armazenar caracteres mai�sculos e min�sculos, ele n�o pode ter valores
-   id�nticos que diferem apenas em letras mai�sculas e min�sculas. Para
-   for�ar uma letra mai�scula ou min�scula a ser armazenada na coluna,
-   utilize uma restri��o CHECK ou um gatilho.
-   
-  4.9) Em uma consulta, como eu detecto se um campo � NULL? Como eu posso
-  concatenar poss�veis NULLs? Como eu posso ordenar por um campo que � NULL ou
-  n�o?
-  
-   Voc� testa a coluna com IS NULL e IS NOT NULL, como a seguir:
-   SELECT *
-   FROM tab
-   WHERE col IS NULL;
-
-   Para concatenar com poss�veis NULLs, utilize COALESCE(), assim:
-   SELECT COALESCE(col1, '') || COALESCE(col2, '')
-   FROM tab
-
-   Para ordenar pelo status NULL, utilize os modificadores IS NULL e IS
-   NOT NULL na sua cl�usula ORDER BY. Coisas que s�o verdadeiro ser�o
-   ordenadas acima das coisas que s�o falso, ent�o a consulta a seguir
-   ir� colocar entradas NULL no in�cio da lista de resultados:
-   SELECT *
-   FROM tab
-   ORDER BY (col IS NOT NULL)
-
-  4.10) Qual � a diferen�a entre os v�rios tipos de dado de caracteres?
-  
-   Tipo Nome Interno Observa��o
-   VARCHAR(n) varchar tamanho especifica o tamanho m�ximo, sem
-   preenchimento
-   CHAR(n) bpchar preenchimento em branco para comprimento fixo
-   espec�fico
-   TEXT text nenhum limite superior espec�fico no comprimento
-   BYTEA bytea vetor de bytes de comprimento vari�vel (seguro a byte
-   nulo)
-   "char" char um caracter
-   
-   Voc� ver� o nome interno quando examinar o cat�logo do sistema e em
-   algumas mensagens de erro.
-   
-   Os primeiros quatro tipos acima s�o do tipo "varlena" (i.e., os
-   primeiros quatro bytes no disco s�o o comprimento seguido pelos
-   dados). Consequentemente o espa�o atual utilizado � ligeiramente maior
-   do que o tamanho declarado. Contudo, valores longos s�o tamb�m
-   sujeitos a compress�o, ent�o o espa�o em disco pode tamb�m ser bem
-   menor do que o esperado.
-   VARCHAR(n) � melhor quando est� armazenando cadeias de caracteres de
-   comprimento vari�vel e h� um limite de tamanho desta cadeia. TEXT �
-   para cadeias de caracteres de comprimento ilimitado, com o m�ximo de
-   um gigabyte.
-   
-   CHAR(n) � para armazenar cadeias de caracteres que s�o todas do mesmo
-   tamanho. CHAR(n) preenche com espa�os em branco at� o tamanho
-   especificado, enquanto o VARCHAR(n) armazena somente os caracteres
-   fornecidos. BYTEA � para armazenar dados bin�rios, particularmente
-   valores que incluem bytes NULL. Todos os tipos descritos aqui tem
-   caracter�sticas de performance similares.
-   
-  4.11.1) Como eu crio um campo serial/auto incremento?
-  
-   PostgreSQL suporta o tipo de dados SERIAL. Ele cria automaticamente
-   uma sequ�ncia. Por exemplo:
-    CREATE TABLE pessoa (
-        id   SERIAL,
-        nome TEXT
-    );
-
-   � automaticamente traduzido em:
-    CREATE SEQUENCE pessoa_id_seq;
-    CREATE TABLE pessoa (
-        id   INT4 NOT NULL DEFAULT nextval('pessoa_id_seq'),
-        nome TEXT
-    );
-
-   Sequ�ncias automaticamente criadas s�o nomeadas como
-   <tabela>_<colunaserial>_seq, onde tabela e colunaserial s�o os nomes
-   da tabela e da coluna serial, respectivamente. Veja a p�gina sobre
-   create_sequence no manual para obter informa��es adicionais sobre
-   sequ�ncias.
-   
-  4.11.2) Como eu consigo o valor de um campo SERIAL?
-  
-   A maneira mais simples de obter o pr�ximo valor SERIAL de uma
-   sequ�ncia � com RETURNING. Utilizando o exemplo da tabela em 4.11.1,
-   ele ficaria assim:
-    INSERT INTO pessoa (nome) VALUES ('Blaise Pascal') RETURNING id;
-
-   Voc� tamb�m pode chamar nextval() e utilizar o valor no INSERT ou
-   chamar currval() ap�s o INSERT.
-   
-  4.11.3) currval() n�o lida com condi��o de corrida com outros usu�rios?
-  
-   N�o. currval() retorna o valor atual atribuido pela sua sess�o, e n�o
-   por todas as sess�es.
-   
-  4.11.4) Por que os n�meros da minha sequ�ncia n�o s�o reutilizados quando uma
-  transa��o � abortada? Por que h� intervalos nos n�meros da minha
-  sequ�ncia/coluna SERIAL?
-  
-   Para melhorar a concorr�ncia, valores da sequ�ncia s�o atribu�dos a
-   transa��es correntes e n�o s�o travados at� que a transa��o seja
-   finalizada. Isso causa intervalos na numera��o por causa de transa��es
-   abortadas.
-   
-  4.12) O que � um OID? O que � um CTID?
-  
-   Se uma tabela � criada com WITH OIDS, cada registro recebe um OID
-   �nico. OIDs s�o automaticamente atribu�dos como inteiros de 4 bytes
-   que s�o �nicos ao longo de toda instala��o. Contudo, eles s�o
-   limitados em 4 bilh�es e, ent�o, os OIDs come�am a ser duplicados. O
-   PostgreSQL utiliza OIDs para ligar as tabelas do sistema.
-   
-   Para numerar registros nas tabelas do usu�rios, � melhor utilizar
-   SERIAL ao inv�s de OIDs porque sequ�ncias SERIAL s�o �nicas somente em
-   uma tabela; e s�o menos prop�cias a atingir o limite. SERIAL8 est�
-   dispon�vel para armazenar valores de sequ�ncias com oito bytes.
-   
-   CTIDs s�o utilizados para identificar registros f�sicos espec�ficos
-   com valores de block e deslocamento. CTIDs mudam ap�s registros serem
-   modificados ou recarregados. Eles s�o utilizados por �ndices para
-   apontar registros f�sicos.
-   
-  4.13) Por que eu recebo o erro "ERROR: Memory exhausted in AllocSetAlloc()"?
-  
-   Voc� provavelmente est� sem mem�ria virtual no seu sistema, ou o seu
-   n�cleo (kernel) tem um limite baixo para certos recursos. Tente isto
-   antes de iniciar o servidor PostgreSQL:
-    ulimit -d 262144
-    limit datasize 256m
-
-   Dependendo da sua shell, somente um desses comando ter� sucesso, mas
-   ele definir� o segmento de dados do seu processo com um limite maior e
-   talvez permita que a consulta seja feita. Este comando � aplicado ao
-   processo atual e todos os subprocessos criados depois do comando ser
-   executado. Se voc� tiver problemas com o cliente SQL porque o processo
-   servidor retornou muitos dados, tente-o antes de iniciar o cliente.
-   
-  4.14) Como eu informo qual vers�o do PostgreSQL eu estou utilizando?
-  
-   No psql, digite SELECT version();
-   
-  4.15) Como eu crio uma coluna que conter� por padr�o a hora atual?
-  
-   Utilize CURRENT_TIMESTAMP:
-        CREATE TABLE teste (x int, modtime timestamp DEFAULT CURRENT_TIMESTAMP);
-
-  4.16) Como eu fa�o uma jun��o externa (outer join)?
-  
-   PostgreSQL suporta jun��es externas utilizando a sintaxe padr�o do
-   SQL. Aqui temos dois exemplos:
-    SELECT *
-    FROM t1 LEFT OUTER JOIN t2 ON (t1.col = t2.col);
-
-   or
-    SELECT *
-    FROM t1 LEFT OUTER JOIN t2 USING (col);
-
-   Essas duas consultas ind�nticas juntam t1.col com t2.col, e tamb�m
-   retornam qualquer registro que n�o foi juntado em t1 (aqueles que n�o
-   combinaram com t2). Uma jun��o a direita RIGHT adicionaria registros
-   que n�o foram juntados da tabela t2. Uma jun��o completa (FULL)
-   retornaria os registros combinados mais todos os registros n�o
-   combinados de t1 e t2. A palavra OUTER � opcional e � assumida nas
-   jun��es LEFT, RIGHT e FULL. Jun��es ordin�rias s�o chamadas jun��es
-   internas (INNER).
-   
-  4.17) Como eu fa�o consultas utilizando m�ltiplos bancos de dados?
-  
-   N�o h� outra maneira de consultar um banco de dados caso ele n�o seja
-   o atual. Porque o PostgreSQL carrega cat�logos do sistema espec�ficos
-   do banco de dados, � incerto como uma consulta em banco de dados
-   distintos pode se comportar.
-   
-   contrib/dblink permite consultas em bancos de dados distintos
-   utilizando chamadas de fun��es. � claro, que um cliente pode fazer
-   conex�es simult�neas em bancos de dados diferentes e juntar os
-   resultados no cliente.
-   
-  4.18) Como eu retorno m�ltiplos registros ou colunas de uma fun��o?
-  
-   � f�cil utilizando fun��es que retornam conjunto,
-   http://www.postgresql.org/docs/techdocs.17.
-   
-  4.19) Por que eu obtenho erros "relation with OID ###### does not exist" ao
-  acessar tabelas tempor�rias em fun��es PL/PgSQL?
-  
-   Em vers�es do PostgreSQL < 8.3, PL/PgSQL armazena o conte�do da
-   fun��o, e o efeito indesejado � que se uma fun��o PL/PgSQL acessa uma
-   tabela tempor�ria, e aquela tabela � removida e criada novamente, e a
-   fun��o � chamada novamente, a fun��o ir� falhar porque o conte�do
-   armazenado da fun��o ainda apontar� para a tabela tempor�ria antiga. A
-   solu��o � utilizar o EXECUTE para acesso a tabelas tempor�rias no
-   PL/PgSQL. Isto ir� fazer com que a consulta seja avaliada toda vez.
-   
-   Este problema n�o ocorre no PostgreSQL 8.3 ou superior.
-   
-  4.20) Quais solu��es de replica��o est�o dispon�veis?
-  
-   Embora "replica��o" seja um termo simples, h� v�rias tecnologias para
-   fazer replica��o, com vantagens e desvantagens para cada um.
-   
-   Replica��o mestre/escravo permite que um mestre receba consultas de
-   leitura e escrita, enquanto os escravos s� podem aceitar
-   leitura/consultas SELECT. A solu��o mais popular de replica��o
-   mestre-escravo para PostgreSQL dispon�vel livremente � Slony-I.
-   
-   Replica��o com m�ltiplos mestres permite que consultas leitura/escrita
-   sejam enviadas para m�ltiplos computadores replicadores. Esta
-   capacidade tamb�m tem um s�rio impacto na performance por causa da
-   necessidade de sincronizar as mudan�as entre os servidores. PGCluster
-   � a solu��o mais popular dispon�vel livremente para PostgreSQL.
-   
-   H� tamb�m solu��es de replica��o comerciais e baseadas em hardware
-   dispon�veis que suportam uma variedade de modelos de replica��o.
-   
-  4.21) Por que os nomes de minhas tabelas e colunas n�o s�o reconhecidos em
-  minha consulta? Por que as mai�sculas n�o s�o preservadas?
-  
-   A causa mais comum de nomes desconhecidos � o uso de aspas ao redor
-   dos nomes da tabela ou coluna durante a cria��o da tabela. Ao utilizar
-   aspas, nomes de tabela e coluna (chamados de identificadores) s�o
-   armazenados como especificado, significando que voc� deve utilizar
-   aspas quando se referir aos nomes na consulta. Algumas interfaces,
-   como pgAdmin, automaticamente colocam aspas nos identificadores
-   durante a cria��o da tabela. Ent�o, para identificadores serem
-   reconhecidos, voc� deve:
-     * Evitar colocar aspas no identificador ao criar tabelas
-     * Utilizar somente caracteres min�sculos em identificadores
-     * Colocar aspas em identificadores ao referenci�-los nas consultas
diff --git a/doc/FAQ_chinese_simp b/doc/FAQ_chinese_simp
deleted file mode 100644
index fde161fa10..0000000000
--- a/doc/FAQ_chinese_simp
+++ /dev/null
@@ -1,801 +0,0 @@
-
-                          PostgreSQL 常����FAQ�
-                                       
-   �����2007 年 1 � 30 � ��� 17:37:01 EST
-   ��������2007 年 2 � 1 � ��� 12:55:04 CST
-   
-   ��维�人��Bruce Momjian ([email protected])
-   ���维�人��Daojing.Zhou�[email protected]�
-   
-   ��档������以�
-   http://www.postgresql.org/files/documentation/faqs/FAQ.html���
-   
-   ���系�平��������http://www.postgresql.org/docs/faq/����
-   ��
-     _________________________________________________________________
-   
-常���
-
-   1.1)PostgreSQL ����该�����
-   1.2)����管�PostgreSQL �
-   1.3)PostgreSQL�������
-   1.4)PostgreSQL�以�������系�平���
-   1.5)�������PostgreSQL�
-   1.6)����PostgreSQL ����
-   1.7)�������对PostgreSQL ����
-   1.8)����交�个BUG���
-   1.9)����解已�� BUG ��缺����
-   1.10)��������档����
-   1.11)��该�� ���  SQL �
-   1.12)���交补���� ������
-   1.13)PostgreSQL ������系��起����
-   1.14)PostgreSQL �以�����个�家��������
-   
-��客�端��
-
-   2.1)�们�以������PostgreSQL �交��
-   2.2)���工��以�PostgreSQL �� Web 页��
-   2.3)PostgreSQL ���形������
-   
-系�管���
-
-   3.1)��� ����PostgreSQL �� /usr/local/pgsql 以�����
-   3.2)���������������
-   3.3)��� ���������以���好����
-   3.4)PostgreSQL ��以����� �������
-   3.5)为�������������Sorry, too many clients� ���
-   3.6)PostgreSQL��级������容�
-   3.7)(使�PostgreSQL)���使���计��硬件 �
-   
-����
-
-   4.1) ������个�询���头� ����������
-   4.2)
-   ����表�索�����以�����������psql�����询�令并��
-   ���们�
-   4.3) �����个�段���类��
-   4.4) ��记���个表��个�����大������
-   4.5) ���个������件����������空��
-   4.6) 为�����询���为�����询没���索��
-   4.7) ��������询������ ��估�����询��
-   4.8) ��� ����表达��索�大��� ���
-   ��表达������ ���索���大��� ����
-   4.9) ��个�询����� ����个�段��为
-   NULL�������确����论��段���NULL��
-   4.10) ���符类���������
-   4.11.1) ��� ��建�个������������段�
-   4.11.2) ������个���������
-   4.11.3) ��使� currval() �导�������������
-   4.11.4) 为�������常����������为�������段���中
-   ������
-   4.12) ��� OID���� CTID �
-   4.13) 为������误信��ERROR: Memory exhausted in
-   AllocSetAlloc()��
-   4.14) ����������� PostgreSQL ����
-   4.15) ����建�个缺���������段�
-   4.16) ��������outer join��询�
-   4.17) �������个�����询�
-   4.18) ��让������������
-   4.19) 为����使�PL/PgSQL����临�表�����误信��relation
-   with OID ##### does not exist��
-   4.20) ��������������
-   4.21) 为��询���示�表��������询��中
-   ����为�大��������
-     _________________________________________________________________
-   
-常���
-
-  1.1)PostgreSQL ����该�����
-  
-   PostgreSQL 读� Post-Gres-Q-L������称为Postgres
-   ���������人������载声��件� MP3 � �� �
-   
-   PostgreSQL
-   ����� ��系���系������ ������系��������������
-   ���代 DBMS 系��使���强���PostgreSQL
-   ����费��并����代� ��以���
-   
-   PostgreSQL
-   �����主�为�����们������并��������系����个社�
-   ���项����被任������
-   ��� ������请����人�常����FAQ�
-   http://www.postgresql.org/files/documentation/faqs/FAQ_DEV.html
-   
-  1.2) ���PostgreSQL �
-  
-   ��� �寻�PostgreSQL���人�����中
-   央�������������� �����---� 为�个���
-   ����们�确��个
-   � ������CVS管������工���设�主��为���管�工����
-   �对PostgreSQL���� ����PostgreSQL项���任�人�
-   ��� ���人�社����������� �����就�订��件�表���讨论
-   ������PostgreSQL���详� ��人�常�� (Developer's FAQ)
-   ��信���
-   
-  1.3)PostgreSQL������?
-  
-   PostgreSQL��������BSD�����许�������使�PostgreSQL����
-   �以��PostgreSQL����代� ��以������就�� ��� 软件��
-   �������们追���责任���就������软件��中
-   须��以���声����就��们�使��BSD��声��容�
-   
-   PostgreSQL���管�系�
-   
-   �����c�1996-2005�PostgreSQL ������������c�1994-1996
-   � �大���
-   
-   �Portions copyright (c) 1996-2005,PostgreSQL Global Development Group
-   Portions Copyright (c) 1994-6 Regents of the University of
-   California�
-   
-   �许为任���使�����修�����个软件����档����任�费�
-   �� 并�� 须�署� �
-   ��产�������������声���段以���两段�����������
-   
-   �Permission to use, copy, modify, and distribute this software and
-   its documentation for any purpose, without fee, and without a written
-   agreement is hereby granted, provided that the above copyright notice
-   and this paragraph and the following two paragraphs appear in all
-   copies.�
-   
-   �任������ �大������ 使��
-   �软件���档�导��对任���人�����
-   ���������� ����伴�����������失�责任��使� �大�
-   �已�建议����失����������
-   
-   �IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY
-   PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
-   DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS
-   SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA
-   HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.�
-   
-   � �大��确��任�����������������������������
-   ������份软件�������������� �� �大�
-   �没�责任��维���������强��修�����
-   
-   �THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
-   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
-   PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
-   CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
-   UPDATES, ENHANCEMENTS, OR MODIFICATIONS.�
-   
-  1.4)PostgreSQL �以�������系�平���
-  
-   ��说��任���对 UNIX �容���系�������PostgreSQL
-   ����������������确���平��
-   
-   PostgreSQl��以�������微软Windows-NT���系���Win2000
-   SP4�WinXP � Win2003�已����������
-   http://pgfoundry.org/projects/pginstaller�载���MSDOS�Windows���
-   �� �Win95�Win98�WinMe�����Cygwin模�����PostgreSQL�
-   
-   �����个为Novell Netware 6�������
-   http://forge.novell.com���为OS/2(eComStation)�������
-   http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&button=Search&key=postgre
-   SQL&stype=all&sort=type&dir=%2F �载�
-   
-  1.5) �������PostgreSQL�
-  
-   �������http://www.postgresql.org/ftp/�载�����FTP��
-   ftp://ftp.PostgreSQL.org/pub/���载�
-   
-  1.6) ����PostgreSQL����
-  
-   PostgreSQL �������� 8.2.1 �
-   
-   �们计��年���个主��级����� 个����个����
-   
-  1.7) �������对PostgreSQL����
-  
-   PostgreSQL社����件�表为�大������帮��订��件�表�主
-   ���
-   http://www.postgresql.org/community/lists/��������� �General �
-   Bug�件�表��个�好����
-   
-   主��IRC����FreeNode(irc.freenode.net)�#postgresql�为����
-   �����以使�UNIX��irc���令� ��� irc -c '#postgresql'
-   "$USER" irc.freenode.net ���使���IRC客�端����������
-   ��个PostgreSQL�西����(#postgersql-es)�����
-   (#postgresql-fr)��� ����EFNET����个PostgreSQL�交����
-   
-   �����������表��http://techdocs.postgresql.org/companies.php�
-   ��
-   
-  1.8) ����交�个BUG���
-  
-   �访�
-   http://www.postgresql.org/support/submitbug�填�Bug��表� ������
-    ���访�ftp��ftp://ftp.PostgreSQL.org/pub/
-   ���� ���PostgreSQL���补��
-   
-   ��使�Bug�交表� �����PostgreSQL�件�表�Bug�常��以������
-   �
-     * ��交�容���个Bug����Bug��� �
-     * ��交�容��个已��Bug并�已�� �TODO���任��表�
-     * ��交�Bug已������被修��
-     * ��交�Bug已修�����补�� ������软件��
-     * 请��交����详��信��
-          + ��系�
-          + PostgreSQL��
-          + ���Bug�����
-          + ��信�
-          + ���踪��
-     * ��交�容��个�Bug����以�工��
-          + �建�个�补�并��� ���个主�������������
-          + �Bug����修���被� �TODO���任��表�
-       
-  1.9) ����解已�� BUG ��缺����
-  
-   PostgreSQL ���个��� SQL:2003 �������们�TODO
-   �表��解已�Bug�表��缺���������计��
-   
-   ���� �����请�常���以�������
-     * 该��已� �TODO���任��表�
-     * 该�����须��� 为�
-          + ������符�SQL� ���������
-          + 该����大大�� 代� �������带��好��微�足���
-          + 该����������� ��
-     * 该���被� �TODO���任��表�
-       
-   PostgreSQL�使�Bug�踪系��� 为�们����件�表中
-   ����以���TODO任��表�����������工������������
-   ��Bug����们�软件��������
-   对影������Bug����快�被修���������������修�
-   �����CVS���信���使��软件������信�中
-   ���������软件���
-   
-  1.10) ��������档����
-  
-   PostgreSQL��大���档�主��详���������页����������� /doc
-   ����注��为 $PGHOME/doc��
-   � ��以�线��PostgreSQL���������http://www.PostgreSQL.org/d
-   ocs�
-   
-   �两���PostgreSQL�书�线����
-   http://www.PostgreSQL.org/docs/awbook.html �
-   http://www.commandprompt.com/ppbook/ � ��大��PostgreSQL书���购
-   买����为�������Korry Douglas�����
-   http://techdocs.PostgreSQL.org/techdocs/bookreviews.php�
-   ��大���PostgreSQL书����� �
-   http://techdocs.PostgreSQL.org/������PostgreSQL�大����� �
-   
-   客�端��令���psql���以 \d
-   �头��令���示��类����符�������信��使� \?
-   �以�示������令�
-   
-   �们� web ��������档�
-   
-  1.11) ��该�� ���  SQL �
-  
-   �����述����PostgreSQL���书�������Teach Yourself SQL in
-   21 Days, Second Edition��详�������
-   http://members.tripod.com/er4ebus/sql/index.htm�
-   �们�许����欢The Practical SQL Handbook� Bowman, Judith S.
-   ���Addison-Wesley����������欢 The Complete Reference SQL,
-   Groff ���McGraw-Hill�����
-   
-   ���������好�����们�
-     * http://www.intermedia.net/support/sql/sqltut.shtm
-     * http://sqlcourse.com.
-     * http://www.w3schools.com/sql/default.asp
-     * http://mysite.verizon.net/Graeme_Birchall/id1.html
-       
-  1.12)���交补���� ������
-  
-   详� ��人�常��� (Developer's FAQ) �
-   
-  1.13)PostgreSQL������系��起����
-  
-   �价软件�好� ������������ �����价� ��
-   
-   ��
-          PostgreSQL ��大�������������������
-          �询�触���������������������
-          �们�����们没����������类��继��������并�
-          ���以��������
-          
-   ��
-          PostgreSQL��������������类似����对�������快
-          �对����������� ����������们������常�
-          +/- 10%���
-          
-   �� �
-          �们�������须��� �����就����没���们������
-          ��认�����缺����稳�代� ��个������个�� beta
-          �����并��们������示�们�以��稳����������
-          ��产使������们�信�����们�������软件�����
-          
-   ��
-          �们��件�表���个�常大���人������以帮�解��碰�
-          ��任�����们�������解��������������软
-          件�并�������解����
-          �����人����群��������触使PostgreSQL�������
-          ����好�����������������以���������人��
-          ��1.7 ���
-          
-   价� �
-          �们对任�����费������������
-          � �以�� ����� �产��� ��们�代� ������们�����
-          �声��声�� BSD������容�
-          
-  1.14) PostgreSQL�以�����个�家�������?
-  
-   PostgreSQL 8.0������使���系�中
-   �������������信���8.0��以����PostgreSQL��身������
-   ��信��
-     _________________________________________________________________
-   
-��客�端��
-
-  2.1) �们�以������PostgreSQL�交��
-  
-   PostgreSQL(缺���)����C����C��������������项����
-   ���载�����项����好�
-   ��们�以������计�����������
-   
-   ����语
-   ��PHP��访�PostgreSQL����Perl�TCL�Python以�����������
-   http://gborg.postgresql.org����Drivers/Interfaces������
-   并���Internet�容��索��
-   
-  2.2) ���工��以�PostgreSQL�� Web 页��
-  
-   �个��以���为�����������http://www.webreview.com�
-   
-   对� Web ���PHP ��个�好������http://www.php.net/�
-   
-   对����任����人�� Perl ��� 使�CGI.pm�DBD::Pg � mod_perl �
-   
-  2.3)PostgreSQL���形������
-  
-   ����������人���������PostgreSQL�GUI�形工�软件��
-   PostgreSQL社��档��个详���表�
-     _________________________________________________________________
-   
-系�管���
-
-  3.1)��� ���PostgreSQL�� /usr/local/pgsql 以�����
-  
-   ��� configure �� � --prefix �项�
-   
-  3.2) ���������������
-  
-   缺�����PostgreSQL��许������� unix �����TCP/IP������
-   � ���修���置�件postgresql.conf中
-   �listen_addresses�����置�件$PGDATA/pg_hba.conf����
-   ������� host-based
-   ��身份认��并����PostgreSQL������������ �PostgreSQL
-   ���������
-   
-  3.3) ��� ��������以���好����
-  
-   ��个主����以��PostgreSQL����
-   
-   �询�����
-          �主���修��询��以���好���:
-          
-          + �建索����表达����索��
-          + 使�COPY��代��个Insert���
-          + ��个SQL�����个��以���交������
-          + ��个索������记��使�CLUSTER�
-          + ��个�询�������记��使�LIMIT�
-          + 使������询�Prepared Query)�
-          + 使�ANALYZE以��精确����计�
-          + ��使� VACUUM � pg_autovacuum
-          + ��大�������� �索�����建索��
-            
-   �����置
-          �置�件postgres.conf中
-          ���设置��影����������表���
-          管����/����������/���������置�
-          �����解����http://www.varlena.com/varlena/GeneralBits/Tid
-          bits/annotated_conf_e.html �
-          http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html�
-          
-   硬件���
-          计��硬件对���影����
-          http://candle.pha.pa.us/main/writings/pgsql/hw_performance/inde
-          x.html � http://www.powerpostgresql.com/PerfList/�
-          
-  3.4)PostgreSQL��以����� �������
-  
-   PostgreSQL ���类似 log_*
-   �����置������询�������计����工�对����������
-   ���
-   
-  3.5) 为�����������Sorry, too many
-  clients�已�太����������
-  
-   �表示� 已达�缺�100个并����������� ����修�postgres
-   ql.conf�件��max_connections��
-   �� postmaster���并�����修�������postmaster�
-   
-  3.6)PostgreSQL��级������容 �
-  
-   PostgreSQL ���对�次�����级主������Bug修�工��� ��
-   7.4.8 �级� 7.4.9 ��� dump � restore������
-   ��������������软件������������
-   
-   ��PostgreSQL����该������ �使��主�����������尽快��
-   ���尽管�次�级���������PostgreSQL��������设计���
-   ���
-   ���Bug��代� ������以��������PostgreSQL社�认为���
-   ����级��������级��
-   
-   主����级���� 7.3 � 7.4��常�修�系�表���表���� ���
-   ������������ ��们�维����件����容��� �����中
-   ����导��dump�/������中
-   ����导��reload�对主����级��须��
-   
-  3.7)(使�PostgreSQL)���使���计��硬件 �
-  
-   ��计��硬件大����容��人们������信��计��硬件�
-   ��������������� ECC RAM�带��� �������SCSI
-   �硬����质�主����便�货��� �� ����好����PostgreSQL
-   � ��以���任�硬件��
-   ����� ����对� �系������ 就������ 究��� �硬件��
-   ������们��件�表����� 硬件�置��价��讨论�
-     _________________________________________________________________
-   
-����
-
-  4.1) ������个�询���头� ����������
-  
-   ��� ������ ����并�� ����询中
-   ��确������ �以使�LIMIT��� ����个索�� ORDER BY中
-   ��件���PostgreSQL ��就������头� �记��
-   ����对�个�询��������������������询������确�
-   �记��� �使�游� (cursor)�FETCH���
-   
-   �使�以���������记���
-      SELECT  cols
-      FROM tab
-      ORDER BY random()
-      LIMIT 1 ;
-
-  4.2)
-  ����表�索�����以�����������psql�����询�令并�示�们
-  �
-  
-   �psql�使� \dt �令��示��表������解psql中
-   ����令�表�使�\? ����� ��以�读 psql ��代�
-   �件pgsql/src/bin/psql/describe.c����为��psql��� �令������ SQL
-   �令�� ��以带 -E �项�� psql� �� ������� �psql中
-   �����令��������使��SQL�询语
-   ��PostgreSQL�����个�容SQL�INFORMATION SCHEMA���
-   � �以�����������信��
-   
-   �系������以pg_ �头�系�表��述�表����
-   
-   使� psql -l �令�以���������
-   
-   ��以����
-   pgsql/src/tutorial/syscat.source�件���举��������系�表�
-   ��信��SELECT���
-   
-  4.3) �����个�段���类��
-  
-   �8.0������个�段���类��容���使� ALTER TABLE ALTER
-   COLUMN TYPE �
-   
-   �以�������以�� ���
-   BEGIN;
-    ALTER TABLE tab ADD COLUMN new_col new_data_type;
-    UPDATE tab SET new_col = CAST(old_col AS new_data_type);
-    ALTER TABLE tab DROP COLUMN old_col;
-    COMMIT;
-
-   � ���以使�VACUUM FULL tab �令�使系���� ����� ��空��
-   
-  4.4) ��记���个表��个�����大������
-  
-   ��������
-   
-     �个����大尺寸�   � ���已��� 32TB �����
-     �个表��大尺寸�     32 TB
-     ��记���大尺寸�   1.6 TB
-     �个�段��大尺寸?    1 GB
-     �个表��大���      � ��
-     �个表��大���       250-1600 ���类����
-     �个表���大索���� � ��
-   
-   ������没����� �����������空������/交����约�
-   ������述�������常�大��系�������大影��
-   
-   �表��大大� 32 TB
-   �����系�对�个�件����大����大表��个 1 GB ��件�
-   ��� ��件系�大����������
-   
-   ��缺���大���� 32K ��大��表大���大����以�� ����
-   
-   ��个��就���对大���2000�
-   ����建索��幸����� ��索��������对��
-   ����容��MD5����������索��对����������
-   并����索�许对��������索�
-   
-  4.5) ���个������件����������空��
-  
-   �个 Postgres �����
-   ��个���件��� ��空�����������个���件�身大�5���
-   �空��
-   
-   ����设��个 100,000 ���件�����个����个���述�
-   �设��串�平��度为20������件� � 2.8 MB��
-   ������PostgreSQL����件大约� 6.4 MB:
-     28 ��: ���头�大约��
-     24 ��: �个����段��个����段
-   +  4 ��: 页���������
-   ----------------------------------------
-     56 ����
-
-   PostgreSQL ��页�大�� 8192 �� (8 KB)���
-
-   8192 ���页
-   -------------------   =  146 �/��页������
-     56 ����
-
-   100000 ���
-   --------------------  =  685 ��页������
-      146 �/��页
-
-   685 ��页 * 8192 ��/页  = 5,611,520 ���5.6 MB�
-
-   索���������������确���被索������ �
-   ��们����大�
-   
-   空�NULL�������� �� ����空��
-   
-  4.6) 为�����询���为�����询没���索��
-  
-   并��个�询����使�索�����表�大����个����并��
-   询����表������记������索��
-   ��� 为索����起�������������读�表�顺�������
-   
-   为���
-   ��使�索��PostgreSQL�须����表��计�����计��以使�
-   � VACUUM ANALYZE�� ANALYZE ��� 使��计�������表中
-   �����就���好�������索��
-   �计�对确������顺������������表��容����������
-   ��计�������
-   
-   索��常��� ORDER BY
-   ������对�个大表��次顺������次���常�索����快��
-   ����� LIMIT � ORDER BY
-   ����起使�����常��使�索��� 为�����表中
-   �����记��
-   
-   ��� 确信PostgreSQL����使�顺������确��� �以使�SET
-   enable_seqscan TO 'off'�令���顺����
-   ���次���询�� 就�以��使��个索�����确��快���
-   
-   �使���符����� LIKE � ~ ��索����������使��
-     * �符串������须����符串��就�说�
-          + LIKE 模���以 % �头�
-          + ~ ���表达��模��须以 ^ �头�
-     * �符串��以���个�符�模�类�头��� [a-e]�
-     * 大��� ������ ILIKE � ~* ��使�索����以� 4.8
-       ��述�表达�索��
-     * �� initdb ��须��缺����设置 C
-       locale�� 为系��������C locale�����个�大�符����
-       �������� �以�建�个���text_pattern_ops索����LIKE
-       �索��
-       
-   �8.0�����中
-   �����询���类��索����类�������索��常��被����
-   ���对int2,int8�����索��
-   
-  4.7) ��������询������ ��估�����询�
-  
-   �� EXPLAIN ��页�
-   
-  4.8) ��� ����表达��索�大��� ���
-  ��表达������ ���索���大��� ����
-  
-   ��符 ~ ����表达����� ~* ��大��� ���
-   ��表达����大��� �� LIKE ���为 ILIKE�
-   
-   大��� �������常���
-    SELECT *
-    FROM tab
-    WHERE lower(col) = 'abc';
-
-   �� ����使�� ��索�����以�建�个������使��表达��
-   ���:
-    CREATE INDEX tabindex ON tab (lower(col));
-
-   ���述索���建�� �UNIQUE约����索��段�身�容�以�
-   �大������容�����UNIQUE约������容�����大��������
-   �� �����为������������以使�CHECK约��件��触����
-   �������
-   
-  4.9) ��个�询����� ����个�段��为 NULL �������确����论��
-  段��� NULL ��
-  
-   � IS NULL � IS NOT NULL ���个�段��������
-   SELECT *
-   FROM tab
-   WHERE col IS NULL;
-
-   为��对� NULL�段����� ORDER BY �件�使� IS NULL� IS NOT
-   NULL 修饰符��件为� true ���件为�false ����������
-   就��� NULL �记�����������
-   SELECT *
-   FROM tab
-   ORDER BY (col IS NOT NULL)
-
-  4.10) ���符类���������
-  
-   类� ���称 说�
-   VARCHAR(n) varchar ����大�度����
-   符串��足���度����补�
-   CHAR(n) bpchar ���符串������足���度��以空� �补�
-   TEXT text 没��������������大�度���
-   BYTEA bytea �������使�NULL�符���许��
-   "char" char �个�符
-   
-   �系�表�����误信��� ������称�
-   
-   ��������类��"varlena"����类���就�说��头��个�
-   ���度��������� ����� ��空��声��大������
-   ����类���������以被�缩���� �
-   ���空�����������
-   
-   VARCHAR(n) �������大�度����符串��好�� TEXT ����
-   ��大�达 1G左��������度��符串�
-   
-   CHAR(n) �������度����符串� CHAR(n)�� �������
-   段�度以空� �补足��足��段�容�� � VARCHAR(n) ��
-   ��������容� BYTEA ����������尤���� NULL �
-   ������类���差������
-   
-  4.11.1) ��� ��建�个�����������段�
-  
-   PostgreSQL �� SERIAL ��类����
-   段��为SERIAL������建�个���������
-   CREATE TABLE person (
-      id   SERIAL,
-      name TEXT
-   );
-
-   ���转�为以�SQL���
-   CREATE SEQUENCE person_id_seq;
-   CREATE TABLE person (
-      id   INT4 NOT NULL DEFAULT nextval('person_id_seq'),
-      name TEXT
-   );
-
-   �� create_sequence ��页������������信��
-   
-  4.11.2) ������个���������
-  
-   �������������� nextval() ���对象��索���个 SERIAL
-   ��������精确����使� 4.11.1 ���表���伪� �� ��述�
-   new_id = execute("SELECT nextval('person_id_seq')");
-   execute("INSERT INTO person (id, name) VALUES (new_id, 'Blaise Pascal')");
-
-   �� �������询�使���� new_id ���������为�� person
-   表����� 注����建� SEQUENCE 对象��称���
-   <table>_<serialcolumn>_seq� �� table � serialcolumn
-   ���� �表��称�� � SERIAL �段��称�
-   
-   类似��� SERIAL 对象缺����� �以��� currval() �索����
-   SERIAL �����
-   execute("INSERT INTO person (name) VALUES ('Blaise Pascal')");
-   new_id = execute("SELECT currval('person_id_seq')");
-
-  4.11.3) ��使� currval() �导�������������
-  
-   ���currval() ����� �次��������������������
-   
-  4.11.4) 为�������常����������为�������段��������
-  ��
-  
-   为���并���������������
-   ��������并�������������� �就�导��常中
-   ���������������
-   
-  4.12) ��� OID ���� CTID �
-  
-   PostgreSQL
-   ��建����记������个���OID�����建表�使�WITHOUT
-   OIDS�项� OID�建�������个4�������� OID
-   ���PostgreSQL���������� �������40亿��溢�� OID�
-   ��������PostgreSQL �����系�表�使� OID �表��建��系�
-   
-   ������表���好�使�SERIAl�代�OID
-   � 为SERIAL������个表中
-   �������就�以���� ��溢�����就�常���
-   SERIAL8�����8��������
-   
-   CTID ��� �带��������������移�������� CTID
-   �记�被����载������索���使��们������
-   
-  4.13) 为������误信��ERROR: Memory exhausted in AllocSetAlloc()��
-  
-   �����系�������������� �对���������������
-   postmaster ��������令�
-   ulimit -d 262144
-   limit datasize 256m
-
-   ���� ��
-   shell����令�������������� �����段��设�����
-   � ��许�让�询������令��������以�������令�����
-   �������
-   ��� ����SQL客�端�� 为�����太����������请���
-   客�端�����述�令�
-   
-  4.14) �����������PostgreSQL����
-  
-   � psql ���� SELECT version();�令�
-   
-  4.15) ����建�个缺���������段�
-  
-   使� CURRENT_TIMESTAMP�
-   CREATE TABLE test (x int, modtime TIMESTAMP DEFAULT CURRENT_TIMESTAMP );
-
-  4.16) ��� ��� outer join ������
-  
-   PostgreSQL ��� �� SQL �����������两个���
-   SELECT *
-   FROM t1 LEFT OUTER JOIN t2 ON (t1.col = t2.col);
-
-   ��
-   SELECT *
-   FROM t1 LEFT OUTER JOIN t2 USING (col);
-
-   �两个�价��询� t1.col � t2.col �����并��� t1 中
-   ����������� t2 �没������� �[�]���RIGHT OUTER
-   JOIN���� t2 ������� ������FULL OUTER JOIN���� t1 � t2
-   ������� ��� OUTER �左[�]����[�]�����[�]��中
-   ���������被称为����INNER JOIN��
-   
-  4.17) ��使����个�����询�
-  
-   没����询������������
-   � 为PostgreSQL�� 载�������系����系�表��� �
-   �跨�����询���������
-   
-   �� ��模�contrib/dblink�许��������跨��询�������以
-   ��������������询���客�端�并���
-   
-  4.18) ��让������������
-  
-   ��������记�������容�使���详����
-   http://techdocs.postgresql.org/guides/SetReturningFunctions
-   
-  4.19) 为����使�PL/PgSQL����临�表�����误信��relation with
-  OID ##### does not exist��
-  
-   PL/PgSQL���������容���带���个�好�������个
-   PL/PgSQL
-   ��访���个临�表���该表被� �并�建����次��该���
-   �失败� � 为������容������临�表�解������ PL/PgSQL
-   ��EXECUTE
-   对临�表��访���� �����询������被��解��
-   
-  4.20) ��������������
-  
-   �������个����好� ���������������缺��
-   
-   主/�������许�个主�����读/���请���个���������
-   ��/SELECT�询��请� �������费�主/�PostgreSQL�����
-   Slony-I �
-   
-   �个主���������许�读/���请������计����������
-   ���������������
-   ���带��严�����失�Pgcluster������� 中
-   �好������以�费�载�
-   
-   ��������费���硬件�����������述����模��
-   
-  4.21) 为��询���示�表��������询�������为�大��������
-  
-   �常���� ���建表�对表�����使���������使��������
-   ������称为� �符������� 大����
-   ����� ��询�表������使�������工�软件��pgAdmin��
-   ���建表��令������个� �符�� ���� � �
-   ��为�� �符����� �该�
-     * ��建表����� �符使�����起��
-     * �� �符��使������
-     * �为��已���� �符�����询�使������ �符�起��
diff --git a/doc/FAQ_chinese_trad b/doc/FAQ_chinese_trad
deleted file mode 100644
index b190853577..0000000000
--- a/doc/FAQ_chinese_trad
+++ /dev/null
@@ -1,793 +0,0 @@
-
-                          PostgreSQL 常����FAQ�
-                                       
-   �����2007 年 2 � 8 � ��� 22:43:13 EST
-   ��������2007 年 2 � 12 � ��� 12:00:04 CST
-   
-   ����人��Bruce Momjian ([email protected])
-   �������人�����(ChaoYi, Kuo)�[email protected]�
-   
-   ���������以�
-   http://www.postgresql.org/files/documentation/faqs/FAQ.html ���
-   
-   ���系統平�������� http://www.postgresql.org/docs/faq/
-   裡�����
-     _________________________________________________________________
-   
-常���
-
-   1.1)PostgreSQL ��麼�該�麼���
-   1.2)誰���管�PostgreSQL �
-   1.3)PostgreSQL�����麼�
-   1.4)PostgreSQL�以�������系統平���
-   1.5)���裡���PostgreSQL�
-   1.6)���� PostgreSQL ��麼�
-   1.7)���裡���� PostgreSQL ����
-   1.8)����交�� BUG � ���
-   1.9)����解已�� BUG ��缺����
-   1.10)�� �����������
-   1.11)��該�樣�� SQL �
-   1.12)���交����� ������
-   1.13)PostgreSQL �����庫系統�起����
-   1.14)PostgreSQL �以�������家��������
-   
-��客�端��
-
-   2.1)���以��麼��� PostgreSQL �����
-   2.2)��麼工��以� PostgreSQL �� Web � ��
-   2.3)PostgreSQL ���形����(GUI)��
-   
-系統管���
-
-   3.1)��樣��� PostgreSQL �� /usr/local/pgsql 以�����
-   3.2)���������������
-   3.3)��樣調���庫伺��以���好����
-   3.4)PostgreSQL 裡�以���麼樣�調試���
-   3.5)��麼�試���������Sorry, too many clients� ���
-   3.6)PostgreSQL ���������容�
-   3.7)(使� PostgreSQL )���使��麼��硬��
-   
-����
-
-   4.1) ��������詢���� 幾����������
-   4.2) ����表�索����庫以�����義����� psql
-   裡����詢�令並顯示���
-   4.3) ��������������
-   4.4) �������表�����庫��大������
-   4.5) ����������件裡���������空��
-   4.6) ��麼���詢�����麼���詢����索��
-   4.7) ��������詢�����樣�估�����詢��
-   4.8) ��樣���表���索�大�寫����
-   ��表������樣��索���大�寫�����
-   4.9) ����詢裡���樣檢測�������
-   NULL�������確�����������NULL��
-   4.10) �種�符������麼���
-   4.11.1) ��樣�建����������������
-   4.11.2) ����������������
-   4.11.3) ��使� currval() ���������������
-   4.11.4) ��麼�����常������������麼���������中
-   ������
-   4.12) �麼� OID��麼� CTID �
-   4.13) ��麼����誤���ERROR: Memory exhausted in
-   AllocSetAlloc()��
-   4.14) ����������� PostgreSQL ����
-   4.15) ����建��� �����������
-   4.16) ��������outer join��詢�
-   4.17) ����������庫��詢�
-   4.18) ���������������
-   4.19) ��麼��使� PL/PgSQL ������表�����誤���relation
-   with OID ##### does not exist��
-   4.20) ��������寫(replication)�����
-   4.21) ���詢��顯示�表��������詢��中
-   ������大寫�������
-     _________________________________________________________________
-   
-常���
-
-  1.1) PostgreSQL ��麼�該�麼���
-  
-   PostgreSQL �� Post-Gres-Q-L�����簡稱�Postgres
-   ���������人����裡�����件� MP3 � �� �
-   
-   PostgreSQL ����������庫系統�����統�業
-   ��庫系統���������������代 DBMS
-   系統�使���強���PostgreSQL
-   ����費��並����代碼��以���
-   
-   PostgreSQL
-   �����主��������������並����網���繫�����社����
-    ����被任������
-   ��� �����������人�常����FAQ�
-   http://www.postgresql.org/files/documentation/faqs/FAQ_DEV.html
-   
-  1.2) 誰�� PostgreSQL �
-  
-   ��� ���PostgreSQL���人����麼中
-   央�������麼�屬���� �����---� ������
-   ������確��� � ������CVS管������工���設
-   �主������管�工�����PostgreSQL��������PostgreSQL�
-    ���任�人�
-   ��� ���人�社����������� �����就����件�表�������
-   �����PostgreSQL���詳� ��人�常�� (Developer's FAQ) ������
-   
-  1.3) PostgreSQL �����麼?
-  
-   PostgreSQL�������� BSD �����許�������使�
-   PostgreSQL���� �以�� PostgreSQL
-   ����代碼��以������就�� ��� ���身������追訴��
-   責任���就������������ ��以������
-   ��就����使��BSD�����容�
-   
-   PostgreSQL ��庫管�系統
-   
-   �����c�1996-2005�PostgreSQL ������������c�1994-1996
-   � �大���
-   
-   �Portions copyright (c) 1996-2005,PostgreSQL Global Development Group
-   Portions Copyright (c) 1994-6 Regents of the University of
-   California�
-   
-   �許�任���使�����修�����������������任�費��
-   並��� 簽署� ��������������������段以����段��
-   ���������
-   
-   �Permission to use, copy, modify, and distribute this software and
-   its documentation for any purpose, without fee, and without a written
-   agreement is hereby granted, provided that the above copyright notice
-   and this paragraph and the following two paragraphs appear in all
-   copies.�
-   
-   �任������ �大������ 使��
-   ������������任���人�����
-   ���������� ����伴�����������失�責任��使� �大�
-   �已�建�����失����������
-   
-   �IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY
-   PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
-   DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS
-   SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA
-   HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.�
-   
-   � �大��確��任�����������������������������
-   �裡����份���������������� �� �大���責任��維
-   ���������強��修�����
-   
-   �THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
-   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
-   PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
-   CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
-   UPDATES, ENHANCEMENTS, OR MODIFICATIONS.�
-   
-  1.4) PostgreSQL �以�������系統平���
-  
-   ��說��任���� UNIX �容���系統������ PostgreSQL
-   ������裡���������確測試�平��
-   
-   PostgreSQL ��以�������微� Windows-NT ���系統��
-   Win2000 SP4�WinXP � Win2003�已製���������
-   http://pgfoundry.org/projects/pginstaller�����MSDOS�Windows�業
-   系統 �Win95�Win98�WinMe�����Cygwin模�����PostgreSQL�
-   
-   ������� Novell Netware 6 ������� http://forge.novell.com
-   ����OS/2(eComStation)�������
-   http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&button=Search&key=postgre
-   SQL&stype=all&sort=type&dir=%2F ���
-   
-  1.5) ���裡��� PostgreSQL�
-  
-   ���覽��� http://www.postgresql.org/ftp/ �������FTP��
-   ftp://ftp.PostgreSQL.org/pub/ �����
-   
-  1.6) ���� PostgreSQL ��麼�
-  
-   PostgreSQL �������� 8.2.3 �
-   
-   �����年����主�������幾����������
-   
-  1.7) ���裡���� PostgreSQL ����
-  
-   PostgreSQL社����件�表��大������幫�����件�表�主��
-   ��
-   http://www.postgresql.org/community/lists/��������� �General �
-   Bug�件�表����好����
-   
-   主��IRC� ����FreeNode(irc.freenode.net)�#postgresql������
-   �� ����以使� UNIX �� irc���令� ��� irc -c '#postgresql'
-   "$USER" irc.freenode.net ���使���IRC客�端�����網絡���
-   ��� PostgreSQL �西��� ��(#postgersql-es)���� ��
-   (#postgresql-fr)��樣��� EFNET ����� PostgreSQL �交�� ���
-   
-   �����������表�� http://techdocs.postgresql.org/companies.php
-   �覽�
-   
-  1.8) ����交�� BUG � ���
-  
-   �訪� http://www.postgresql.org/support/submitbug�填寫 Bug
-   �� �表� �����樣��訪� ftp �� ftp://ftp.PostgreSQL.org/pub/
-   檢������PostgreSQL ������
-   
-   ��使� Bug �交表� ����� PostgreSQL �件�表� Bug
-   �常��以������
-     * ��交�容���� Bug ���� Bug ��� �
-     * ��交�容���已�� Bug 並�已�� � TODO ���任��表�
-     * ��交� Bug 已������被修��
-     * ��交� Bug 已修�������� ����������
-     * ���交����詳細����
-          + ��系統
-          + PostgreSQL ��
-          + ��� Bug �測試��
-          + 調試��
-          + 調試�蹤輸�
-     * ��交�容���� Bug����以�工��
-          + �建�����並��� ����主�������������
-          + � Bug ����修���被� � TODO ���任��表�
-       
-  1.9) ����解已�� BUG ��缺����
-  
-   PostgreSQL ������� SQL:2003 ��������� TODO �表��解已� Bug
-   �表��缺������������
-   
-   ���� �������常���以�������
-     * 該��已� � TODO ���任��表�
-     * 該������ ��� ��
-          + ������符� SQL ����������
-          + 該����大大�� 代碼�������帶��好��微�足���
-          + 該����������� ��
-     * 該���被� � TODO ���任��表�
-       
-   PostgreSQL �使� Bug �蹤系統�� �������件�表中
-   ����以��� TODO
-   任��表總����������工����������實��Bug��������中
-   ������� �影������Bug�總��快�被修�
-   ���������������修����� CVS
-   �������使���������������������������
-   
-  1.10) �� �����������
-  
-   PostgreSQL ��大�����主��詳細��������� ����測試�����
-   /doc ����註��� $PGHOME/doc�� � ��以���覽 PostgreSQL
-   �����網���http://www.PostgreSQL.org/docs�
-   
-   �����PostgreSQL��������
-   http://www.postgresql.org/docs/books/awbook.html �
-   http://www.commandprompt.com/ppbook/ � ��大�� PostgreSQL
-   ����購買������������ Korry Douglas 編寫���
-   http://techdocs.PostgreSQL.org/techdocs/bookreviews.php� ��大���
-   PostgreSQL ���簡�� � http://techdocs.PostgreSQL.org/ ������
-   PostgreSQL �大����� �
-   
-   客�端��令���psql���以 \d �� �
-   ��令��顯示�������符����������使� \?
-   �以顯示������令�
-   
-   ��� web ����������
-   
-  1.11) ��該�樣�� SQL �
-  
-   �����述����PostgreSQL����������� Teach Yourself SQL in
-   21 Days, Second Edition��詳細�紹�網��
-   http://members.tripod.com/er4ebus/sql/index.htm� ���許�����The
-   Practical SQL Handbook� Bowman, Judith S.
-   編寫�Addison-Wesley����������� The Complete Reference SQL,
-   Groff 編寫�McGraw-Hill �����
-   
-   ���網�����好�������
-     * http://www.intermedia.net/support/sql/sqltut.shtm
-     * http://sqlcourse.com.
-     * http://www.w3schools.com/sql/default.asp
-     * http://mysite.verizon.net/Graeme_Birchall/id1.html
-       
-  1.12)���交����� ������
-  
-   詳� ��人�常��� (Developer's FAQ) �
-   
-  1.13) PostgreSQL �����庫系統�起����
-  
-   �����好幾種����������� ������� ��
-   
-   ��
-          PostgreSQL ��大�����庫�������������
-          �詢�觸���������������������
-          ������������������義���繼��������並����
-          ����������
-          
-   ��
-          PostgreSQL�����������庫���似������������快��
-          ����������� �����庫�����������常� +/-
-          10%���
-          
-   �� �
-          �������庫�� ��� �����就������������������
-          �測試��缺����穩�代碼������������ beta
-          測試���並�������
-          ��顯示���以��穩������������使��������信��
-          ����������庫�������
-          
-   ��
-          ����件�表�����常大���人������以幫�解決�碰��
-          任����������
-          總��解決������������庫���並��總�� ���
-          �決���
-          �����人����群��������觸使PostgreSQL�������
-          �庫��好������業
-          ����������以給��給�����人����1.7 ���
-          
-   �� �
-          ���任�����費������������
-          � �以�� ����� ���裡� ����代碼�������������
-          ��裡��� BSD������容�
-          
-  1.14) PostgreSQL �以�������家�������?
-  
-   PostgreSQL 8.0������使���系統������庫�����������
-   8.0 ��以���� PostgreSQL ��身����������
-     _________________________________________________________________
-   
-��客�端��
-
-  2.1) ���以��麼��� PostgreSQL �����
-  
-   PostgreSQL (� ���)���� C ���� C
-   ��������������� ���� ���������� ����好�
-   ����以������������������
-   
-   ��編���� PHP ��訪� PostgreSQL ����Perl�TCL�Python
-   以����������� http://gborg.postgresql.org 網���
-   Drivers/Interfaces ������ 並��� Internet �容��索��
-   
-  2.2) ��麼工��以� PostgreSQL �� Web � ��
-  
-   ���紹以��庫������������http://www.webreview.com�
-   
-   �� Web ���PHP ���極好������ http://www.php.net/�
-   
-   �����任����人�� Perl ��� 使� CGI.pm � DBD::Pg � mod_perl
-   �
-   
-  2.3)PostgreSQL ���形������
-  
-   ����������人��������� PostgreSQL�GUI �形工�����
-   PostgreSQL社��� ���詳細��表�
-     _________________________________________________________________
-   
-系統管���
-
-  3.1)��樣�� PostgreSQL �� /usr/local/pgsql 以�����
-  
-   ��� configure �� � --prefix �� �
-   
-  3.2) ���������������
-  
-   � �����PostgreSQL ��許������� unix ����� TCP/IP
-   ������ � ���修���置�件 postgresql.conf ��
-   listen_addresses�����置�件 $PGDATA/pg_hba.conf ����
-   ��� ���� host-based ��身份���並����
-   PostgreSQL������������ � PostgreSQL 伺��������
-   
-  3.3) ��樣調���庫��以���好����
-  
-   ���主����以�� PostgreSQL ����
-   
-   �詢�����
-          �主���修��詢��以���好���:
-          
-          + �建索����表�����索��
-          + 使� COPY ��代��� Insert ���
-          + ���SQL��������以���交������
-          + ���索���������使� CLUSTER�
-          + ����詢����������使� LIMIT�
-          + 使�� 編���詢�Prepared Query)�
-          + 使� ANALYZE 以��精確���統��
-          + ��使� VACUUM � pg_autovacuum
-          + ��大���������索�����建索��
-            
-   伺����置
-          �置�件 postgres.conf ����設
-          置��影����������表���
-          管����/��庫伺������/��庫伺�����置�
-          �����解����http://www.varlena.com/varlena/GeneralBits/Tidb
-          its/annotated_conf_e.html �
-          http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html�
-          
-   硬����
-          ��硬�����影���覽
-          http://candle.pha.pa.us/main/writings/pgsql/hw_performance/inde
-          x.html � http://www.powerpostgresql.com/PerfList/�
-          
-  3.4)PostgreSQL 裡�以���麼樣�調試���
-  
-   PostgreSQL ����似 log_*
-   �伺���置������詢������統�����工��調試���測試�
-   ��幫��
-   
-  3.5) ��麼�試�������Sorry, too many
-  clients�已�太����������
-  
-   �表示� 已��� � 100 �並�(��)���������� ����修�
-   postgresql.conf �件�� max_connections �� ��  postmaster
-   ���併�����修������� postmaster�
-   
-  3.6)PostgreSQL ���������容 �
-  
-   PostgreSQL �����次������主������ Bug 修�工��� ��
-   7.4.8 ��� 7.4.9 ��� dump � restore������
-   ���庫伺�����������������伺�����
-   
-   ��PostgreSQL����該������ �使��主������������快��
-   ��管�次��������風��PostgreSQL��� ���������修�
-   ��� Bug
-   ����碼������以風�������PostgreSQL社������������
-   風���������
-   
-   主��������� 7.3 � 7.4��常�修�系統表���表���� ���
-   ������������ ���������件����容��� �����中
-   �������dump�/������中
-   �������reload��主�������� ��
-   
-  3.7)(使� PostgreSQL )���使��麼��硬� �
-  
-   ����硬�大����容��人�總�����信����硬�質����
-   ����實���� ECC RAM�帶��� ��������SCSI
-   �硬����質�主�����便�貨��� �� ����好����
-   PostgreSQL 幾��以���任�硬���
-   ����� ������ �系統����� 就������ 究��� �硬���
-   �������件�表����� 硬��置��������
-     _________________________________________________________________
-   
-����
-
-  4.1) ��������詢���� 幾����������
-  
-   ��� �����幾����並�� ����詢中
-   ��確������ �以使� LIMIT ��� �����索�� ORDER BY 中
-   ��件���PostgreSQL ��就������� 幾����
-   ��������詢��������������������詢������確�����
-   �� �使�游�(cursor)�FETCH���
-   
-   �使�以�������������
-       SELECT  cols
-      FROM tab
-      ORDER BY random()
-      LIMIT 1 ;
-
-  4.2)
-  ����表�索����庫以�����義�����psql裡����詢�令並顯示�
-  ���
-  
-   �psql�使� \dt �令�顯示��表��義���解 psql 中
-   ����令�表�使� \? ����� ��以�� psql ��代碼 �件
-   pgsql/src/bin/psql/describe.c������� psql ����令�輸���� SQL
-   �令�� ��以帶 -E �� �� psql� �樣������ � psql 中
-   �給���令������實�使�� SQL
-   �詢���PostgreSQL�������容 SQL� INFORMATION SCHEMA ���
-   � �以��裡������庫����
-   
-   �系統�����以 pg_ �� �系統表��述�表��義�
-   
-   使� psql -l �令�以�������庫�
-   
-   ��以�覽�� pgsql/src/tutorial/syscat.source
-   �件�����������庫系統表������SELECT���
-   
-  4.3) ��������������
-  
-   �8.0��裡������������容���使� ALTER TABLE ALTER COLUMN
-   TYPE �
-   
-   �以�������以�樣��
-    BEGIN;
-    ALTER TABLE tab ADD COLUMN new_col new_data_type;
-    UPDATE tab SET new_col = CAST(old_col AS new_data_type);
-    ALTER TABLE tab DROP COLUMN old_col;
-    COMMIT;
-
-   � ���以使� VACUUM FULL tab �令�使系統����������空��
-   
-  4.4) �������表�����庫��大������
-  
-   ��������
-   
-     ����庫�大尺寸�    ����已��� 32TB ���庫�
-     ��表��大尺寸�      32 TB
-     ������大尺寸�     1.6 TB
-     ������大尺寸?      1 GB
-     ��表裡�大���       ���
-     ��表裡�大����    250-1600 ��������
-     ��表裡��大索���� ���
-   
-   ���實�������������������空�������/交������
-   �實����述�������常�大��系統������大影��
-   
-   �表��大大� 32 TB ����業
-   系統����件���麼大����大表��� 1 GB ��件���� �
-   ��件系統大����������
-   
-   ��� ���大���� 32K ��大��表大���大����以�� ����
-   
-   �����就����大���2000�
-   ����建索��幸����樣�索�����������
-   ����容��MD5����������索�������������
-   並���檢索�許���������索�
-   
-  4.5) ����������件裡���������空��
-  
-   �� Postgres ��庫��
-   ������件�����空���������������件�身大�5����空�
-   �
-   
-   �������� 100,000 ���件��������������述� �設
-   ��串�平��度�20���(Byte)����件�� 2.8 MB��
-   ������PostgreSQL��庫�件大�� 5.2 MB:
-     24 ���: ���� �大���
-     24 ����: ���������������
-   +  4 ����: � ���������
-   ----------------------------------------
-     52 �����
-
-   PostgreSQL ��� �大�� 8192 ��� (8 KB)���
-
-   8192 �����
-   -------------------   =  158 �/��� ������
-     52 �����
-
-   100000 ���
-   --------------------  =  633 ��� ������
-      146 �/���
-
-   633 ���  * 8192 ��/�   = 5,185,536 ���5.2 MB�
-
-   索�����麼���������確實��被索������ �
-   �������大�
-   
-   空� NULL �������� ������空��
-   
-  4.6) ��麼���詢�����麼���詢����索��
-  
-   並����詢����使�索�����表�大���������並��詢���
-   ��表�������������索�� ��� �索����起������
-   ���������表�� �������
-   
-   ������使�索��PostgreSQL
-   �� ����表�統�����統���以使� VACUUM ANALYZE�� ANALYZE
-   ��� 使�統��������表中
-   �����就�� �好�������索��
-   統���確������� ������������表��容�����������
-   �統��������
-   
-   索��常��� ORDER BY
-   ���������大表��次� ������次���常�索����快������
-   � LIMIT � ORDER BY
-   ����起使��話��常��使�索��� ������表���������
-   
-   ��� 確信PostgreSQL����使�� ������確��� �以使�SET
-   enable_seqscan TO 'off'�令���� ����
-   ���次���詢�� 就�以��使���索�����確實�快���
-   
-   �使���符����� LIKE � ~ ��索����������使��
-     * �符串������� ����符串��就�說�
-          + LIKE 模���以 % �� �
-          + ~ ���表���模��� 以 ^ �� �
-     * �符串��以�����符�模���� ��� [a-e]�
-     * 大�寫������� ILIKE � ~* ��使�索����以� 4.8
-       ��述�表��索��
-     * �� initdb ��� ��� �����置 C
-       locale�� �系統������� C locale �������大�符��麼�
-       ��種����� �以�建����� text_pattern_ops 索����
-       LIKE �索��
-       
-   � 8.0 �����中
-   �����詢������索������������索��常��被������
-   �� int2, int8 �����索��
-   
-  4.7) ��������詢�����樣�估�����詢�
-  
-   �� EXPLAIN ��� �
-   
-  4.8) ��樣���表���索�大�寫����
-  ��表������樣��索���大�寫�����
-  
-   ��符 ~ ����表������ ~* ��大�寫�����表�����大�寫���
-   LIKE �種�� ILIKE�
-   
-   大�寫��������常寫��
-    SELECT *
-    FROM tab
-    WHERE lower(col) = 'abc';
-
-   �樣���使����索�����以�建����種���使��表��索�
-   :
-    CREATE INDEX tabindex ON tab (lower(col));
-
-   ���述索���建�� � UNIQUE �����索����身�容�以�
-   �大�寫����容����� UNIQUE
-   �������容�����大�寫������� ���������
-   ����種����以使� CHECK ���件��觸�����������
-   
-  4.9) ����詢裡���樣檢測������� NULL
-  �������確����������� NULL ��
-  
-   � IS NULL � IS NOT NULL 測試������������
-   SELECT *
-   FROM tab
-   WHERE col IS NULL;
-
-   ����� NULL ������� ORDER BY �件�使� IS NULL � IS NOT
-   NULL 修飾符��件�� true ���件�� false ����������
-   就��� NULL �������������
-   SELECT *
-   FROM tab
-   ORDER BY (col IS NOT NULL)
-
-  4.10) �種�符������麼���
-  
-   �� ���稱 說�
-   VARCHAR(n) varchar ����大�度����
-   符串��足�義�度������
-   CHAR(n) bpchar ���符串�實����足�義�度��以空� ���
-   TEXT text ���������������大�度���
-   BYTEA bytea �������使�NULL�符���許��
-   "char" char ���符
-   
-   �系統表�����誤��裡� ������稱�
-   
-   �������種��� "varlena"��������就�說��� ����
-   ���度��������� ��實����空�����大������
-   ��������義�����以被�縮���� �
-   ���空������ �����
-   
-   VARCHAR(n) �������大�度����符串��好�� TEXT ����
-   ��大�� 1G 左����義���度��符串�
-   
-   CHAR(n) �������度����符串�
-   CHAR(n)�� ���給�����度以空� ��足��足����容�� �
-   VARCHAR(n) ����給�����容� BYTEA ����������尤����
-   NULL �����������差������
-   
-  4.11.1) ��樣�建���������������
-  
-   PostgreSQL �� SERIAL
-   ���������義�SERIAL������建�����������
-   CREATE TABLE person (
-      id   SERIAL,
-      name TEXT
-   );
-
-   ������以�SQL���
-   CREATE SEQUENCE person_id_seq;
-   CREATE TABLE person (
-      id   INT4 NOT NULL DEFAULT nextval('person_id_seq'),
-      name TEXT
-   );
-
-   �� create_sequence ��� ���������������
-   
-  4.11.2) ����������������
-  
-   �種������������ nextval() ����象裡檢索���� SERIAL
-   ��������精確����使� 4.11.1 裡��表����碼�樣�述�
-   new_id = execute("SELECT nextval('person_id_seq')");
-   execute("INSERT INTO person (id, name) VALUES (new_id, 'Blaise Pascal')");
-
-   �樣������詢�使���� new_id 裡����������� person
-   表����� 注����建� SEQUENCE �象��稱���
-   <table>_<serialcolumn>_seq� �裡 table � serialcolumn
-   ���� �表��稱�� � SERIAL ����稱�
-   
-   �似��� SERIAL �象� ����� �以��� currval() 檢索�賦��
-   SERIAL �����
-   execute("INSERT INTO person (name) VALUES ('Blaise Pascal')");
-   new_id = execute("SELECT currval('person_id_seq')");
-
-  4.11.3) ��使� currval() ���������������
-  
-   ���currval() ����� �次�話���賦��������������
-   
-  4.11.4) ��麼�����常������������麼����������������
-  
-   ����併������������賦��
-   ��������並�������������� �就����常中
-   ���������������
-   
-  4.12) �麼� OID ��麼� CTID �
-  
-   PostgreSQL 裡�建��������������� OID�����建表�使�
-   WITHOUT OIDS �� � OID �建�������� 4��������� OID ���
-   PostgreSQL 伺��������� ������� 40���溢�� OID �
-   ��������PostgreSQL �����系統表裡使� OID
-   �表��建��繫�
-   
-   ������表���好�使� SERIAl �代� OID � � SERIAL ����
-   ���表��������就�以���樣�溢�����就�常���
-   SERIAL8 �����8���������
-   
-   CTID ����帶��������������移�������� CTID
-   ���被�����������索���使���������
-   
-  4.13) ��麼����誤���ERROR: Memory exhausted in AllocSetAlloc()��
-  
-   �����系統������������� �����������������
-   postmaster ��試試����令�
-   ulimit -d 262144
-   limit datasize 256m
-
-   �決�� ��
-   shell����令�������������� �����段��������
-   � ��許���詢������令��������以�������令����建�
-   ����
-   ��� ����SQL客�端�� ������太��������������客��
-   �������述�令�
-   
-  4.14) �����������PostgreSQL����
-  
-   � psql 裡�輸� SELECT version();�令�
-   
-  4.15) ����建��� �����������
-  
-   使� CURRENT_TIMESTAMP�
-   CREATE TABLE test (x int, modtime TIMESTAMP DEFAULT CURRENT_TIMESTAMP );
-
-  4.16) ��樣�� outer join ������
-  
-   PostgreSQL ����� SQL ���������裡������
-   SELECT *
-   FROM t1 LEFT OUTER JOIN t2 ON (t1.col = t2.col);
-
-   ��
-   SELECT *
-   FROM t1 LEFT OUTER JOIN t2 USING (col);
-
-   �������詢� t1.col � t2.col �����並��� t1 中
-   ����������� t2 ��������� �[�]���RIGHT OUTER
-   JOIN���� t2 ������� ������FULL OUTER JOIN���� t1 � t2
-   ������� ��� OUTER �左[�]����[�]�����[�]��中
-   ���������被稱�����INNER JOIN��
-   
-  4.17) ��使�������庫��詢�
-  
-   ��辦��詢����庫�����庫�
-   � �PostgreSQL�� ����庫���系統���系統表��� �
-   �跨��庫��詢���������
-   
-   �� ��模� contrib/dblink
-   �許����調�實�跨庫�詢�������以����������庫��
-   ��詢���客�端�併���
-   
-  4.18) ���������������
-  
-   ����������������容�使���詳����
-   http://techdocs.postgresql.org/guides/SetReturningFunctions
-   
-  4.19) ��麼��使� PL/PgSQL ������表�����誤���relation with OID
-  ##### does not exist��
-  
-   PL/PgSQL �緩�������容���帶�����好��������
-   PL/PgSQL
-   ��訪������表���該表被��並�建����次調�該����
-   ��� � �緩�����容��������表�解決����� PL/PgSQL 中
-   �EXECUTE ���表��訪���樣����詢����總�被��解��
-   
-  4.20) ��������寫(replication)�����
-  
-   ��寫���������好幾種�寫������種�����缺��
-   
-   主/���寫����許��主伺�����/寫��������伺������
-   �/SELECT�詢���� �������費�主/�PostgreSQL�寫���
-   Slony-I �
-   
-   ��主伺����寫���許��/寫�����給���主���種�����
-   ����伺���������� ���帶��������失�Pgcluster
-   ����種����好��並���以�費���
-   
-   ��������費���硬�����寫������述�種�寫模��
-   
-  4.21) ���詢��顯示�表��������詢���������大寫�������
-  
-   �常���� ���建表��表�����使�����( ' '
-   )��使�������表�����稱���符������� 大�寫��
-   ����� ��詢�表������使�������工����� pgAdmin
-   �����建表��令���������符�� ���� � ������
-   符�統��� �該�
-     * ��建表������符使�����起��
-     * ���符��使��寫���
-     * ����已�����符�����詢�使�������符�起��
diff --git a/doc/FAQ_czech b/doc/FAQ_czech
deleted file mode 100644
index 99120e6060..0000000000
--- a/doc/FAQ_czech
+++ /dev/null
@@ -1,849 +0,0 @@
-
-                          Frequently Asked Questions
-                                       
-   Casto kladen� dotazy (FAQ) PostgreSQL
-   
-   Posledn� aktualizace: 29. r�jna 2007 (aktualizov�no pro PostgreSQL
-   8.3)
-   
-   Soucasn� spr�vce: Bruce Momjian ([email protected])
-   
-   Prelozil: Pavel Stehule ([email protected])
-   
-   Nejaktu�lnejs� verzi tohoto dokumentu naleznete na adrese
-   http://www.postgresql.org/files/documentation/faqs/FAQ.html
-   
-   Odpovedi na ot�zky v�zan� na konkr�tn� platformy naleznete na adrese
-   http://www.postgresql.org/docs/faq/.
-     _________________________________________________________________
-   
-                               Obecn� ot�zky
-                                      
-   1.1) Co je to PostgreSQL? Jak� je spr�vn� v�slovnost slova PostgreSQL?
-   1.2) Kdo r�d� v�voj PostgreSQL?
-   1.3) Pod jakou licenc� je PostgreSQL?
-   1.4) Na kter�ch platform�ch lze provozovat PostgreSQL?
-   1.5) Kde mohu z�skat PostgreSQL?
-   1.6) Jak� je posledn� verze?
-   1.7) Kde mohu z�skat podporu?
-   1.8) Jak a kam hl�sit chyby?
-   1.9) Kde najdu informace o zn�m�ch chyb�ch nebo nepodporovan�ch
-   vlastnostech?
-   1.10) Jak� je dostupn� dokumentace?
-   1.11) Jak se mohu naucit SQL?
-   1.12) Jak se mohu pripojit k t�mu v�voj�ru?
-   1.13) Jak je na tom PostgreSQL v porovn�n� s jin�mi datab�zemi?
-   1.14) Je PostgreSQL pripraven na aktu�ln� zav�den� letn�ho casu v
-   nekter�ch zem�ch?
-   
-                        Dotazy na klientsk� rozhran�
-                                      
-   2.1) Kter� rozhran� jsou pouziteln� pro PostgreSQL?
-   2.2) Jak� n�stroje lze pouz�t pro PostgreSQL a web?
-   2.3) Existuje grafick� rozhran� pro PostgreSQL?
-   
-                           Administrativn� dotazy
-                                      
-   3.1) Jak nainstalovat PostgreSQL jinam nez do /usr/local/pgsql?
-   3.2) Jak nastavit pravidla pro pr�stup z jin�ch stanic?
-   3.3) Jak vyladit datab�zi na vyss� v�kon?
-   3.4) Jak� m�m lad�c� prostredky?
-   3.5) Co znamen� "Sorry, too many clients", kdyz se zkous�m pripojit?
-   3.6) Proc je nutn� dump a obnoven� (load) datab�ze pri upgradu
-   PostgreSQL?
-   3.7) Jak� hardware bych mel pouz�vat?
-   
-                              Provozn� dotazy
-                                      
-   4.1) Jak z�skat pouze prvn� r�dek dotazu? N�hodn� r�dek?
-   4.2) Jak z�sk�m seznam tabulek, indexu, datab�z�, a definovan�ch
-   uzivatelu. Mohu videt dotazy, kter� pouz�v� psql pro zobrazen� techto
-   informac�?
-   4.3) Jak zmenit datov� typ sloupce?
-   4.4) Jak� je maxim�ln� velikost r�dku, tabulky a datab�ze?
-   4.5) Kolik diskov�ho prostoru je potreba k ulozen� dat z norm�ln�ho
-   textov�ho souboru?
-   4.6) Muj dotaz je pomal� a nepouz�v� vytvoren� indexy. Proc?
-   4.7) Jak zjist�m, jak se vyhodnocuje muj dotaz?
-   4.8) Jak pouz�t case-(in)sensitive regul�rn� v�raz? Jak pouz�t index
-   pro case insensitive hled�n�?
-   4.9) Jak v dotazu detekovat, ze polozka je NULL? Jak bezpecne spojit
-   dva retezce, pokud mohou obsahovat NULL? Lze tr�dit podle toho, jestli
-   je polozka NULL nebo ne?
-   4.10) Jak� jsou rozd�ly mezi ruzn�mi znakov�mi typy?
-   4.11.1) Jak vytvorit serial/auto-increment polozku?
-   4.11.2) Jak z�skat hodnotu SERIAL po vlozen� r�dku?
-   4.11.3) Nezpusob� currval() a nextval() probl�my ve v�ce uzivatelsk�m
-   prostred�?
-   4.11.4) Proc nen� vygenerovan� c�slo pouzito pri prerusen�
-   transakce?Proc vznikaj� d�ry v c�slov�n� prostrednictv�m sekvence nebo
-   typu SERIAL?
-   4.12) Co to je OID? Co je to CTID?
-   4.13) Co znamen� chybov� hl�sen� "ERROR: Memory exhausted in
-   AllocSetAlloc()"?
-   4.14) Jak zjist�m, kterou verzi PostgreSQL pouz�v�m?
-   4.15) Jak vytvorit sloupec, kter� bude implicitne obsahovat aktu�ln�
-   cas?
-   4.16) Jak prov�st vnejs� spojen� (outer join)?
-   4.17) Jak prov�st dotaz napr�c nekolika datab�zemi?
-   4.18) Muze funkce vr�tit v�ce r�dku nebo sloupcu?
-   4.19) Co je pr�cinou chyby "relation with OID xxxxx does not exist"?
-   4.20) Jak� jsou moznosti replikace datab�z�?
-   4.21) Proc v dotazu nejsou rozpozn�ny n�zvy m�ch tabulek nebo funkc�?
-   Proc jsou velk� p�smena v n�zvech automaticky prevedena na mal�
-   p�smena?
-     _________________________________________________________________
-   
-                               Obecn� ot�zky
-                                      
-  1.1) Co je to PostgreSQL? Jak� je spr�vn� v�slovnost slova PostgreSQL?
-  
-   V�slovnost PostgreSQL je Post-Gres-Q-L , nebo zjednodusene Postgres .
-   V rade jazyku je slovo PostgreSQL obt�zne vysloviteln�, proto se v
-   hovoru casto pouz�v� zjednodusen� forma n�zvu. Pro ty, kter� by si
-   r�di poslechli v�slovnost, je k dispozici audioz�znam v MP3 form�tu.
-   
-   PostgreSQL je relacn� datab�ze s nekter�mi objektov�mi rysy, kter� m�
-   moznosti tradicn�ch komercn�ch datab�zov�ch syst�mu s nekolika
-   rozs�ren�mi, kter� lze naj�t v DBMS syst�mech pr�st� generace.
-   Pouz�v�n� PostgreSQL nen� omezen� a vesker� zdrojov� k�dy jsou volne
-   dostupn�.
-   
-   Za v�vojem PostgreSQL je mezin�rodn� skupina nez�visl�ch v�voj�ru
-   navz�jem komunikuj�c�ch prostrednictv�m internetu. Tento projekt nen�
-   r�zen z�dnou obchodn� organizac�. Pokud se chcete pridat k projektu,
-   prectete si v�voj�rsk� FAQ na adrese
-   http://www.postgresql.org/files/documentation/faqs/FAQ_DEV.html .
-   
-  1.2) Kdo r�d� v�voj PostgreSQL?
-  
-   Pokud budete hledat organizaci r�d�c� v�voj PostgreSQL, budete
-   zklam�ni. Nic takov�ho neexistuje. Existuj� pouze "core" a CVS skupiny
-   uzivatelu, ale ty existuj� v�ce z administr�torsk�ch duvodu nez z
-   organizacn�ch. Projekt je smerov�n komunitou v�voj�ru a uzivatelu, ke
-   kter� se kdokoliv muze pripojit. Jedin� co potrebuje, je prihl�sit se
-   do elektronick� konference. V�ce ve v�voj�rsk�m FAQ.
-   
-  1.3) Pod jakou licenc� je PostgreSQL?
-  
-   PostgreSQL je predmetem n�sleduj�c�ch autorsk�ch pr�v:
-   
-   D�lc� Copyright (c) 1996-2009, PostgreSQL Global Development Group
-   D�lc� Copyright (c) 1994-6, Regents of the University of California
-   
-   Udeluje se opr�vnen� k uzit�, rozmnozov�n�, prov�den� �prav a
-   rozsirov�n� tohoto softwaru a dokumentace k nemu, pro jak�koli �cely,
-   bez licencn�ho poplatku a bez p�semn� licencn� smlouvy, za podm�nky,
-   ze na vsech jeho kopi�ch je uvedeno ozn�men� o v�se uveden�ch pr�vech,
-   jakoz i obsah tohoto a dvou n�sleduj�c�ch odstavcu.
-   
-   THE UNIVERSITY OF CALIFORNIA ("KALIFORNSK� UNIVERZITA") NEN� V Z�DN�M
-   PR�PADE ODPOVEDNA Z�DN� TRET� OSOBE ZA PR�MOU, NEPR�MOU, ZVL�STN�,
-   NAHODILOU NEBO V�SLEDNOU SKODU, VCETNE USL�HO ZISKU, ZPUSOBENOU UZIT�M
-   TOHOTO SOFTWARU A DOKUMENTACE K NEMU, A TO I V PR�PADE, ZE THE
-   UNIVERSITY OF CALIFORNIA BYLA INFORMOV�NA O MOZNOSTI VZNIKU TAKOV�
-   SKODY.
-   
-   THE UNIVERSITY OF CALIFORNIA ZEJM�NA NEPOSKYTUJE JAK�KOLI Z�RUKY, A TO
-   NEJEN Z�RUKY OBCHODOVATELNOSTI A VHODNOSTI TOHOTO V�ROBKU KE
-   SPECIFICK�M �CELUM. N�ZE UVEDEN� SOFTWARE JE POSKYTNUT "JAK STOJ� A
-   LEZ�" A THE UNIVERSITY OF CALIFORNIA NEN� POVINNA ZAJISTIT JEHO
-   �DRZBU, PODPORU, AKTUALIZACI, VYLEPSEN� NEBO MODIFIKACI.
-   
-   V�se uveden� je BSD licence, bezn� licence otevren�ho zdroje. Nen� zde
-   z�dn� omezen� ohledne uzit� k�du zdroje. Jsme s t�m spokojeni a nem�me
-   v �myslu na t�to skutecnosti cokoli menit.
-   
-  1.4) Na kter�ch platform�ch lze provozovat PostgreSQL?
-  
-   Strucne receno, PostgreSQL bez� na vsech modern�ch unixov�ch
-   syst�mech. Seznam tech, u kter�ch probehlo testov�n�, naleznete v
-   instalacn�ch instrukc�ch.
-   
-   PostreSQL tak� bez� nativne na vsech Microsof Windows syst�mech
-   odvozen�ch z Microsoft Windows NT jako jsou Windows 2000SP4, WindowsXP
-   a Windows2003. Instalacn� bal�cek naleznete na adrese
-   http://pgfoundry.org/projects/pginstaller. Na stars�ch syst�mech s
-   jeste MS-DOS j�drem lze spustit PostgreSQL s emulacn�m programem
-   Cygwin.
-   
-   D�le existuje port pro Novell Netware 6 port na adrese
-   http://forge.novell.com, a pro OS/2 verze (eComStation) na adrese
-   http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&button=Search&key=postgre
-   SQL&stype=all&sort=type&dir=%2F .
-   
-  1.5) Kde mohu z�skat PostgreSQL?
-  
-   Pomoc� webov�ho klienta z adresy http://www.postgresql.org/ftp/ nebo
-   klienta ftp z adresy ftp://ftp.postgresql.org/pub/.
-   
-  1.6) Jak� je posledn� verze?
-  
-   Nejnovejs� verz� PostgreSQL je verze 8.2.5
-   
-   V pl�nu je uvolnovat kazdorocne jednu velkou verzi a kazd�ch nekolik
-   mes�cu mal� verze.
-   
-  1.7) Kde mohu z�skat podporu?
-  
-   Nejcastejs� forma podpory uzivatelum PostgreSQL komunitou je
-   prostrednictv�m e-mailu. Na nasem webov�m serveru naleznete odkaz na
-   str�nky,kde se muzete prihl�sit do elektronick� konference. Pro
-   zac�tek jsou doporucen� konference general nebo bugs.
-   
-   Dals� cestou je IRC kan�l #postgresql na Freenode (irc.freenode.net).
-   K pripojen� pouzijte Unixov� pr�kaz irc -x '#postgresql' "$USER"
-   irc.freenode.net nebo jak�koholiv jin�ho IRC klienta. V t�to s�ti
-   existuje jeste spanelsk� (#postgresql-es) a francouzsk�
-   (#postgresqlfr) verze. Dals� PostgreSQL kan�l naleznete na EFNet.
-   
-   Seznam spolecnost� poskytuj�c� komercn� podporu naleznete na adrese
-   http://techdocs.postgresql.org/companies.php.
-   
-  1.8) Jak a kam hl�sit chyby?
-  
-   Vyplnte formul�r na adrese
-   http://www.postgresql.org/support/submitbug. Na nasem ftp serveru
-   ftp://ftp.postgresql.org/pub/ si overte, ze pouz�v�te aktu�ln� verzi
-   PostreSQL.
-   
-   Chyby reportovan� prostrednictv�m chybov�ho formul�re nebo zasl�n�m
-   mailu do PostgreSQL konference obvykle generuje n�sleduj�c� odezvu:
-     * Nejedn� se o chybu, a proc
-     * Jedn� se o zn�mou chybu, kter� je jiz v seznamu �kolu TODO
-     * Tato chyba byla opravena v aktu�ln� verzi
-     * Tato chyba byla jiz opravena ve verzi, kter� zat�m nebyla
-       ofici�lne uvolnena
-     * Pozadavek na dals� doplnuj�c� informace:
-          + Operacn� syst�m
-          + Verze PostgreSQL
-          + Test reprodukuj�c� chybu
-          + Lad�c� informace
-          + Backtrace v�stup debuggeru
-     * Jedn� se o zat�m nezjistenou chybu, pak muzete cekat
-          + Z�platu odstranuj�c� chybu, kter� bude vlozena do dals� velk�
-            nebo mal� verze
-          + Informaci, ze se jedn� o chybu, kterou nelze okamzite resit a
-            je proto prid�na do TODO
-       
-  1.9) Kde najdu informace o zn�m�ch chyb�ch nebo nepodporovan�ch vlastnostech?
-  
-   PostgreSQL podporuje rozs�renou podmnozinu SQL:2003. V nasem TODO
-   naleznete seznam zn�m�ch chyb, chybej�c�ch vlastnost�, a pl�ny do
-   budoucna.
-   
-   Odezva na pozadavek na novou vlastnost PostgreSQL je obvykle:
-     * Pozadavek je jiz v TODO
-     * Pozadovan� funkce nen� chten� protoze
-          + Duplikuje jiz existuj�c� funkci, kter� respektuje SQL
-            standard
-          + Implementac� funkce by se pr�lis zkomplikoval k�d bez
-            relevantn�ho pr�nosu
-          + Funkce by mohla b�t nebezpecn� nebo nespolehliv�
-     * Pozadavek je prid�n do TODO
-       
-   PostgreSQL nepoz�v� syst�m pro sledov�n� chyb, protoze jsme zjistili,
-   ze je efektivnejs� pr�mo reagovat na maily a udrzovat aktu�ln� TODO. V
-   praxi je snaha o co nejrychlejs� resen� chyb, a chyby, kter� by se
-   mohly projevit u mnoha uzivatelu jsou opravov�ny velice rychle. Jedin�
-   m�sto, kde lze dohledat vsechny zmeny, rozs�ren� a opravy v PostgreSQL
-   je CVS log. Pozn�mky k verzi "Release notes" nezachycuj� vsechny
-   zmeny, k nemz doslo.
-   
-  1.10) Jak� je dostupn� dokumentace?
-  
-   PostgreSQL obsahuje vynikaj�c� dokumentaci zahrnuj�c� manu�l,
-   manu�lov� str�nky a testovac� pr�klady. Pod�vejte se do adres�re /doc.
-   Manu�l je pr�stupn� online na http://www.postgresql.org/docs.
-   
-   K dispozici jsou zdarma dve online knihy na adres�ch
-   http://www.postgresql.org/docs/books/awbook.html a
-   http://www.commandprompt.com/ppbook/. Dals� literaturu lze zakoupit.
-   Nejpopul�rnejs� je od Kerryho Douglase. Seznam dostupn� literatury je
-   na http://techdocs.postgresql.org/techdocs/bookreviews.php. Jeste je
-   kolekce technicky orientovan�ch cl�nku tematicky spojen�ch s
-   PostgreSQL na adrese http://techdocs.postgresql.org/.
-   
-   R�dkov� klient psql m� \d pr�kazy pro zobrazen� informac� o typech,
-   oper�torech, funkc�ch, agregacn�ch funkc�, atd. Pouzijte \? pro
-   zobrazen� dostupn�ch pr�kazu.
-   
-   Dals� dokumentaci najdete na nasem webu.
-   
-  1.11) Jak se mohu naucit SQL?
-  
-   Pod�vejte se do v�se uveden� dokumentace. Dals� online knihou je
-   "Teach Yourself SQL in 21 Days, Second Edition" na adrese
-   http://members.tripod.com/er4ebus/sql/index.htm. Mnoho nasich
-   uzivatelu doporucuje knihu The Practical SQL Handbook, Bowman, Judith
-   S., et al., Addison-Wesley. Dals� The Complete Reference SQL, Groff et
-   al., McGraw-Hill.
-   
-   Dals� online tutori�ly jsou dostupn� na adres�ch:
-     * http://www.intermedia.net/support/sql/sqltut.shtm
-     * http://sqlcourse.com
-     * http://www.w3schools.com/sql/default.asp
-     * http://mysite.verizon.net/Graeme_Birchall/id1.html
-       
-  1.12) Jak se mohu pripojit k t�mu v�voj�ru?
-  
-   Prostudujte si Developer's FAQ.
-   
-  1.13) Jak je na tom PostgreSQL v porovn�n� s jin�mi datab�zemi?
-  
-   Software muzeme porovn�vat z nekolika ruzn�ch pohledu: vlastnosti,
-   v�kon, spolehlivost, podpora a cena.
-   
-    Vlastnosti
-    
-   PostgreSQL nab�z� vetsinu funkc� funkcionality velk�ch komercn�ch DBMS
-   syst�mu jako jsou: transakce, vnoren� dotazy, spouste, referencn�
-   integrita a sofistikovan� syst�m zamyk�n�. Poskytujeme urcit� funkce,
-   kter� ostatn� syst�my bezne nepodporuj�. Napr. uzivatelem definovan�
-   typy, dedicnost, pravidla (rules), a MVCC architekturu.
-   
-    V�kon
-    
-   V�kon PostgreSQL je srovnateln� s ostatn�mi komercn�mi nebo Open
-   Source datab�zemi. V nekter�ch pr�padech je rychlejs�, jindy
-   pomalejs�. N�s v�kon je obvykle +/-10% vuci ostatn�m datab�z�m.
-   
-    Spolehlivost
-    
-   Uvedomujeme si, ze datab�ze mus� b�t stoprocentne spolehliv�, jinak je
-   nepouziteln�. Snaz�me se, aby kazd� verze byla dobre otestov�na a
-   obsahovala minimum chyb. Kazd� verze je minim�lne nekolik mes�cu v
-   beta testovac�m rezimu. Do produkcn�ho rezimu se dostane, az kdyz
-   nedoch�z� k dals�m zmen�m nebo oprav�m. Ver�me, ze jsem v�ce nez
-   srovnateln� s ostatn�mi datab�zemi v t�to oblasti.
-   
-    Podpora
-    
-   Na nasich internetov�ch konferenc�ch se setk�v� velk� skupina v�voj�ru
-   a uzivatelu pri resen� vyskytuj�c�ch se probl�mu. Nase internetov�
-   konference umoznuj� kontakt velk� skupiny v�voj�ru a uzivatelu.
-   Nemuzeme garantovat opravu chyby, ale komercn� DBMSs tak� vzdy
-   negarantuj� resen� probl�mu. Ver�me ale, ze d�ky pr�m�mu kontaktu na
-   v�voj�re, nasi uzivatelskou komunitu, manu�lum, a dostupn�m zdrojov�m
-   k�dum m�me leps� podporu nez ostatn� DBMSs. Pro ty, kter� preferuj�
-   komercn� "per-incident" podporu, existuje spolecnost�, kter� ji
-   nab�zej� (FAQ sekce 1.7.)
-   
-    Cena
-    
-   PostgreSQL lze pouz�vat bezplatne (a to i pro komercn� pouzit�). Tak�
-   muzete neomezene pouz�vat n�s k�d ve sv�ch produktech s v�jimkami
-   specifikovan�mi v nas� licenci (preb�r�me BSD licenci).
-   
-  1.14) Je PostgreSQL pripraven na aktu�ln� zav�den� letn�ho casu v nekter�ch
-  zem�ch?
-  
-   Poc�naje verz� 8.0.[4+] podporuje PostgreSQL letn� cas tak� pro USA.
-   Podpora letn�ho casu (daylight saving time) pro Kanadu a Z�padn�
-   Austr�lii je obsazena ve verz�ch 8.0.[10+] a 8.1.[6+] a vsech
-   n�sleduj�c�ch verz�ch. Stars� verze pouz�valy syst�movou datab�zi
-   casov�ch z�n obsahuj�c�, krome jin�ho, informaci o tom, zda se pro
-   danou casovou z�nu rozlisuje mezi letn�m a zimn�m casem.
-     _________________________________________________________________
-   
-                        Dotazy na klientsk� rozhran�
-                                      
-  2.1) Kter� rozhran� jsou pouziteln� pro PostgreSQL?
-  
-   PostgreSQL se distribuuje pouze s rozhran�m pro jazyk C a embedded C.
-   Vsechna dals� rozhran� predstavuj� nez�visl� projekty, kter� je treba
-   st�hnout z internetu samostatne. Osamostatnen� techto projektu
-   umoznuje nez�vislost v�vojov�ch t�mu a moznost vyd�vat nov� verze bez
-   ohledu na vyd�n� nov� verze PostgreSQL.
-   
-   Nekter� programovac� jazyky jako je napr. PHP obsahuj� rozhran� pro
-   PostgreSQL. Rozhran� pro jazyky jako je Perl, Tcl, Python a mnoho
-   dals�ch jsou dostupn� na adrese: http://gborg.postgresql.org v sekci
-   Drivers/Interfaces.
-   
-  2.2) Jak� n�stroje lze pouz�t pro PostgreSQL a web?
-  
-   Dobr�m �vodem do problematiky datab�z� v prostred� webov�ch str�nek
-   muze b�t web http://www.webreview.com.
-   
-   PHP (http://www.php.net) je vynikaj�c�m rozhran�m pro tvorbu webu.
-   
-   Pro slozitejs� �lohy se casto pouz�v� Perl a jeho BDB:Pg rozhran� s
-   podporou CGI - CGI.pm nebo mod_perl(u).
-   
-  2.3) Existuje grafick� rozhran� pro PostgreSQL?
-  
-   K dispozici je rada grafick�ch n�stroju podporuj�c�ch PostgreSQL a to
-   od komercn�ch nebo open source v�voj�ru. Podrobn� seznam naleznete na
-   adrese http://www.postgresql.org/docs/techdocs.54.
-     _________________________________________________________________
-   
-                           Administrativn� dotazy
-                                      
-  3.1) Jak nainstalovat PostgreSQL jinam nez do /usr/local/pgsql?
-  
-   Pri spousten� configure nastavte parametr --prefix
-   
-  3.2) Jak nastavit pravidla pro pr�stup z jin�ch stanic?
-  
-   Ve v�choz� konfiguraci, PostgreSQL umoznuje pouze pripojen� z
-   lok�ln�ho uzivatele prostrednictv�m Unix domain sockets nebo TCP/IP
-   spojen�. Bez modifikace listen_addresses v souboru postgresql.conf, a
-   povolen� adresy v souboru $PGDATA/pg_hba.conf se nelze pripojit k
-   PostgreSQL z ostatn�ch stanic. Zmena v�se zm�nen�ch parametru vyzaduje
-   restart datab�zov�ho serveru.
-   
-  3.3) Jak vyladit datab�zi na vyss� v�kon?
-  
-   V�kon syst�mu muzete ovlivnit ve trech oblastech:
-   
-    Zmeny dotazu
-    
-     * Pouzit�m indexu vcetne c�stecn�ch a funkcion�ln�ch
-     * Pouzit�m COPY m�sto opakovan�ch INSERTu
-     * Sloucen�m mnoha SQL pr�kazu do jedn� transakce sn�zen�m rezie na
-       commit
-     * Pouz�v�n�m CLUSTERU, pokud nac�t�te vets� pocet r�dek podle indexu
-     * Pouzit�m klauzule LIMIT v poddotazech
-     * Pouzit�m predpripraven�ch dotazu
-     * Pouz�v�n�m ANALYZE. Tento pr�kaz aktualizuje statistiky, kter� se
-       pouz�vaj� pri optimalizaci dotazu
-     * Pravideln� pouzit� VACUUM nebo pouz�v�n� pg_autovacuum
-     * Odstranen�m indexu pred rozs�hl�mi zmenami v datech
-       
-    Konfigurace serveru
-    
-   Urcit� parametry v souboru postgresql.conf maj� vliv na v�kon serveru.
-   Detaily naleznete v pr�rucce Administr�tora v Server Run-time
-   Environment/Run-time Configuration. Dals� koment�re naleznete v
-   http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_conf_e.ht
-   ml a http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html.
-   
-    V�ber hardware
-    
-   Vliv hardware na v�kon serveru je pops�n v dokumentech
-   http://candle.pha.pa.us/main/writings/pgsql/hw_performance/index.html
-   a http://www.powerpostgresql.com/PerfList/.
-   
-  3.4) Jak� m�m lad�c� prostredky?
-  
-   Nastaven�m log_* promenn�ch v konfiguraci serveru si vynut�te logov�n�
-   dotazu a procesn�ch statistik, kter� V�m mohou pomoci pri laden� a
-   optimalizaci v�konu.
-   
-  3.5) Co znamen� "Sorry, too many clients", kdyz se zkous�m pripojit?
-  
-   Prekrocil jste v�choz� limit, kter� je 100 soucasne pripojen�ch
-   uzivatelu. V konfiguraci serveru v postgresql.conf tuto hodnotu muzete
-   zvetsit zmenou hodnoty max_connection. Nezapomente restartovat server.
-   
-  3.6) Proc je nutn� dump a obnoven� (load) datab�ze pri upgradu PostgreSQL?
-  
-   Zpusob c�slov�n� je pops�n v dokumentaci na
-   http://www.postgresql.org/support/versioning. Instrukce k proveden�
-   migrace na vyss� verzi jsou takt�z v dokumentaci na adrese
-   http://www.postgresql.org/docs/current/static/install-upgrading.html.
-   
-  3.7) Jak� hardware bych mel pouz�vat?
-  
-   Jelikoz PC jsou vetsinou kompatibiln�, lid� maj� tendence verit, ze
-   vsechna PC jsou stejne kvalitn�. Coz nen� pravda. Pameti ECC, SCSI a
-   kvalitn� z�kladn� desky jsou mnohem spolehlivejs� a v�konnejs� nez
-   lacinejs� hardware. PostgreSQL pobez� na vetsine hardwaru, nicm�ne
-   pokud je pro V�s spolehlivost a v�kon syst�mu dulezit�, je dobr�
-   venovat cas nalezen� vhodn� hardwarov� konfigurace. Na nasich
-   elektronick�ch konferenc�ch muzete diskutovat o vhodn�ch konfigurac�ch
-   a znack�ch.
-     _________________________________________________________________
-   
-                              Provozn� dotazy
-                                      
-  4.1) Jak z�skat pouze prvn� r�dek dotazu? N�hodn� r�dek?
-  
-   Pokud potrebujete pouze nekolik r�dku a pokud v�te kolik, pouzijte
-   SELECT LIMIT. Pokud bude mozn� pouz�t index shoduj�c� se s ORDER BY,
-   je mozn�, ze se nebude prov�det cel� dotaz. Pokud nezn�te pocet
-   z�znamu, pouzijte kurzor a pr�kaz FETCH.
-   
-   Pro v�ber n�hodn�ho r�dku pouzijte pr�kaz ve tvaru:
-SELECT col
-FROM tab
-ORDER BY random()
-LIMIT 1;
-
-  4.2) Jak z�sk�m seznam tabulek, indexu, datab�z�, a definovan�ch uzivatelu.
-  Mohu videt dotazy, kter� pouz�v� psql pro zobrazen� techto informac�?
-  
-   V psql pr�kazem \dt z�sk�te seznam tabulek. �pln� seznam pr�kazu psql
-   z�sk�te pr�kazem \?. Alternativne si muzete prostudovat zdrojov� k�d
-   psql - soubor pgsql/src/bin/psql/describe.c, kter� obsahuje SQL
-   pr�kazy, kter� jsou generov�ny pro z�sk�n� v�stupu psql "backslash"
-   pr�kazu. Tak� muzete nastartovat psql s parametrem -E, kter� zpusob�
-   zobrazen� vsech SQL pr�kazu, kter� se odes�laj� na server. PostgreSQL
-   tak� podporuje SQL standard INFORMACN� SCH�MATA (standardn� syst�mov�
-   tabulky). Klasick�m dotazem do syst�mov�ch tabulek z�sk�te pozadovan�
-   informace o strukture datab�ze.
-   
-   Syst�mov� tabulky PostgreSQL (mimo r�mec SQL standardu) pouz�vaj�
-   prefix pg_. Pro zjisten� struktury datab�ze je muzete pouz�t tak�, i
-   kdyz preferov�ny jsou dotazy do informacn�ho sch�matu.
-   
-   Seznam vsech datab�z� z�sk�te pr�kazem psql -l
-   
-   Dals� inspiraci najdete v souboru pgsql/src/tutorial/syscat.source.
-   Obsahuje ilustracn� SELECTy potrebn� k z�sk�n� informac� z syst�mov�ch
-   tabulek datab�ze.
-   
-  4.3) Jak zmenit datov� typ sloupce?
-  
-   Ve verz�ch 8.0 a pozdejs�ch jednoduse:
-ALTER TABLE ALTER COLUMN TYPE
-
-   V stars�ch verz�ch:
-BEGIN;
-ALTER TABLE tab ADD COLUMN new_col new_data_type;
-UPDATE tab SET new_col = CAST(old_col AS new_data_type);
-ALTER TABLE tab DROP COLUMN old_col;
-COMMIT;
-
-   Po zmene spustte pr�kaz VACUUM FULL, aby doslo k uvolnen� diskov�ho
-   prostoru pouzit�ho v tu chv�li jiz neplatn�mi z�znamy.
-   
-  4.4) Jak� je maxim�ln� velikost r�dku, tabulky a datab�ze?
-  
-   PostgreSQL m� tato omezen�:
-   
-   Maxim�ln� velikost datab�ze:       neomezena (existuj� 32TB db)
-   Maxim�ln� velikost tabulky:        32 TB
-   Maxim�ln� velikost r�dky:          480GB
-   Maxim�ln� velikost polozky         1 GB
-   Maxim�ln� pocet r�dku v tabulce:   neomezeno
-   Maxim�ln� pocet sloupcu v tabulce: 250-1600 podle typu
-   Maxim�ln� pocet indexu na tabulce: neomezeno
-   
-   Ve skutecnosti nic nen� neomezeno, limitem b�v� vzdy dostupn� diskov�
-   pamet nebo velikost operacn� pameti. Pokud m�te nekterou z techto
-   hodnot neobvykle velkou, muze doj�t ke sn�zen� v�konu.
-   
-   Maxim�ln� velikost tabulky je 32 TB a nevyzaduje podporu velk�ch
-   souboru operacn�m syst�mem. Velk� tabulky se ukl�daj� do nekolika 1 GB
-   souboru takze limity souborov�ho syst�mu nejsou podstatn�.
-   
-   Maxim�ln� velikost tabulky a maxim�ln� pocet sloupcu muzeme
-   zectyrn�sobit nastaven�m velikosti bloku na 32K.
-   
-   Indexy jsou povolen� pouze na sloupc�ch jejichz d�lka je mens� nez
-   2000 znaku. Pokud tuto d�lku prekroc�me a index potrebujeme pro
-   zajisten� jednoznacnosti, je vhodnejs� pouz�t funkcion�ln� index nad
-   MD5 funkc� nebo fulltextov� index.
-   
-  4.5) Kolik diskov�ho prostoru je potreba k ulozen� dat z norm�ln�ho textov�ho
-  souboru?
-  
-   PostgreSQL vyzaduje az petin�sobek diskov�ho prostoru k ulozen� dat z
-   textov�ho souboru.
-   
-   Napr�klad, uvazujme soubor se 100 tis�ci r�dky obsahuj�c� na kazd�
-   r�dce cel� c�slo a textov� popis. Text je v prumerne dvacet bytu
-   dlouh�. Textov� soubor bude 2.8 MB dlouh�. Velikost datab�ze
-   obsahuj�c� odpov�daj�c� data bude zhruba 5.2 MB.
-    24 bytu: hlavicka r�dku (priblizne)
-    24 bytu: jedna celoc�seln� polozka a jedna textov�
-   + 4 byty: ukazatel na str�nku k entici
-   ------------------------------------------------------
-    52 bytu na r�dek
-
-   Velikost datov� str�nky PostgreSQL je 8192 bytu (8KB)
- 8192 bytu na str�nce
----------------------- = 158 r�dek na str�nku
-  52 bytu za r�dek
-
-100000 r�dek
------------------------ = 633 str�nek (zaokrouhleno nahoru)
-   158 r�dek na str�nce
-
-633 datov�ch str�nek * 8192 bytu na kazdou str�nku = 5,185,536 bytu (5.2 MB)
-
-   Indexy nemaj� tak velkou rezii, ale mohou b�t tak� velk�, protoze
-   obsahuj� indexovan� data.
-   
-   Hodnoty NULL jsou ulozeny v bitmap�ch, takze zab�raj� jen velmi m�lo
-   diskov�ho prostoru.
-   
-  4.6) Muj dotaz je pomal� a nepouz�v� vytvoren� indexy. Proc?
-  
-   Kazd� dotaz nemus� nutne pouz�t existuj�c� indexy. Index se pouzije
-   tehdy, kdyz je tabulka vets� nez urcit� minim�ln� velikost, a dotaz
-   vyb�r� pouze procentu�lne malou c�st r�dku tabulky. To proto, ze
-   n�hodn� pr�stup k disku dan� cten�m indexu muze b�t pomalejs� nez
-   line�rn� cten� tabulky nebo sekvencn� cten�.
-   
-   PostgreSQL rozhoduje o pouzit� indexu na z�klade statistiky pr�stupu k
-   tabulce. Tyto statistiky se shromazduj� pr�kazy VACUUM ANALYZE nebo
-   ANALYZE. D�ky statistik�m m� optimizer informaci o poctu r�dek v
-   tabulce a muze l�pe rozhodnout o pouzit� indexu. Statistiky se uplatn�
-   pri urcen� optim�ln�ho porad� a metody spojen� tabulek. Statistiky by
-   se meli aktualizovat opakovane, tak jak se men� obsah tabulek.
-   
-   Indexy nejsou obycejne pouzity pro setr�den� nebo spojen� tabulek.
-   Sekvencn� zpracov�n� n�sledovan� explicitn�m tr�den�m je obycejne
-   rychlejs� nez pouzit� indexu na velk� tabulce.
-   
-   Jinak je tomu v pr�pade pouzit� LIMIT a ORDER BY, pri kter�m se
-   vetsinou index pouzije, jelikoz je v�sledkem pouze mal� c�st tabulky.
-   
-   Pokud si mysl�te, ze optimizer mylne zvolil sekvencn� prohled�v�n�
-   tabulky, pouzijte pr�kaz SET enable_seqscan TO 'off' a zkuste zda je
-   prohled�v�n� s indexem rychlejs�.
-   
-   Pri vyhled�v�n� na z�klade vzoru jako je napr. oper�tor LIKE nebo ~ se
-   indexy pouzij� pouze za urcit�ch skutecnost�:
-     * zac�tek hledan�ho vzoru mus� b�t ukotven k zac�tku, tj.
-          + vzor LIKE nesm� zac�nat %
-          + ~ regul�rn� v�raz mus� zac�nat ^
-     * vzor nesm� zac�nat intervalem, napr. [a-e]
-     * vyhled�van�, kter� nen� Case sensitiv jako je ILIKE nebo ~*
-       nepouz�v� indexy. Muzete ale pouz�t funkcion�ln� indexy, kter�
-       jsou pops�ny v sekci 4.8
-     * pri inicializaci datab�ze (initdb) mus� b�t pouzito C locale nebo
-       vytvorte speci�ln� text_pattern_index, kter� umozn�, pri
-       respektov�n� zm�nen�ch podm�nek pouzit� indexu operac� LIKE. Pro
-       vyhled�v�n� cel�ch slov je mozn� a v�hodn� pouz�t fulltext.
-       
-  4.7) Jak zjist�m, jak se vyhodnocuje muj dotaz?
-  
-   Pod�vejte se do n�povedy k pr�kazu EXPLAIN.
-   
-  4.8) Jak pouz�t case-(in)sensitive regul�rn� v�raz? Jak pouz�t index pro case
-  insensitive hled�n�?
-  
-   Vyhled�v�n� prostrednictv�m regul�rn�ch vzoru zajistuje oper�tor ~,
-   kter� je case-sensitive. Jeho case-insensitive varianta je oper�tor
-   ~*. Case-insensitive variac� oper�toru LIKE je oper�tor ILIKE.
-   
-   Case-insensitive vyhled�n� se res�:
-SELECT *
-FROM tab
-WHERE lower(col) = 'abc';
-
-   Tento dotaz nepouzije standardn� index. Mus�te pouz�t tzv.
-   funkcion�ln� index:
-CREATE INDEX tabindex ON tab (lower(col));
-
-   Pokud index vytvor�me jako unik�tn�, tak muzeme ukl�dat retezce
-   obsahuj�c� mal� i velk� p�smena, ale nikoliv retezce, kter� se od sebe
-   odlisuj� jen v mal�ch a velk�ch p�smenech. K zajisten� z�pisu retezce
-   obsahuj�c� pouze mal� nebo pouze velk� p�smena pouzijte CHECK kontroly
-   nebo triggery.
-   
-  4.9) Jak v dotazu detekovat, ze polozka je NULL? Jak bezpecne spojit dva
-  retezce, pokud mohou obsahovat NULL? Lze tr�dit podle toho, jestli je polozka
-  NULL nebo ne?
-  
-   Pokud chcete testovat hodnotu NULL pouzijte oper�tor IS:
-   SELECT *
-   FROM tab
-   WHERE col IS NULL;
-
-   K spojen� retezcu, kter� mohou obsahovat hodnotu NULL, pouz�vejte
-   funkci COALESCE(), napr.:
-   SELECT COALESCE(col1, '') || COALESCE(col2, '')
-   FROM tab
-
-   Pokud chcete tr�dit podle hodnoty NULL, pouzijte v�raz IS NULL nebo IS
-   NOT NULL v klauzuli ORDER. Hodnota pravda m� prednost pred hodnotou
-   false a tedy pokud pouzijete:
-   SELECT *
-   FROM tab
-   ORDER BY (col IS NOT NULL)
-
-   tak z�znamy s NULL budou na zac�tku setr�den�ch dat.
-   
-  4.10) Jak� jsou rozd�ly mezi ruzn�mi znakov�mi typy?
-  
-   Typ        Intern� n�zev Pozn�mky
-   VARCHAR(n) varchar       n urcuje maxim�ln� d�lku
-   CHAR(n)    bpchar        retezec je do dan� d�lky rozs�ren mezerami
-   TEXT       text          bez omezen� d�lky
-   BYTEA      bytea         pole bytu nespecifikovan� d�lky
-   "char"     char          jeden znak
-   
-   Na intern� n�zvy muzete narazit v syst�mov�m katalogu nebo v nekter�ch
-   chybov�ch hl�sen�ch.
-   
-   Ctyri prvn� typy jsou tzv. varlena typy (prvn� ctyri byty na disku
-   jsou obsahuj� d�lku, ostatn� obsahuj� vlastn� data). Skutecne obsazen�
-   prostor je tedy o neco m�lo vets� nez deklarovan� velikost. Na druhou
-   stranu, dels� retezce jsou komprimov�ny, takze obsazen� prostor na
-   disku muze b�t mens� nez se cek�.
-   
-   VARCHAR(n) je vhodn� pro ukl�d�n� ruzne dlouh�ch retezcu u kter�ch
-   zn�me d�lkov� omezen�, TEXT pro retezce bez omezen� d�lky (maximum je
-   jeden gigabyte).
-   
-   CHAR(n) se pouz�v� pro ulozen� stejne dlouh�ch retezcu. CHAR(n) dopln�
-   mezerami na specifikovanou d�lku, VARCHAR(n) hodnoty se ukl�daj� tak
-   jak jsou. BYTEA je pro ukl�d�n� bin�rn�ch dat - non ASCII hodnot.
-   Vsechny zm�nen� typy maj� podobn� v�konov� charakteristiky.
-   
-  4.11.1) Jak vytvorit serial/auto-increment polozku?
-  
-   V PostgreSQL muzete pouz�t datov� typ SERIAL. Jeho pouzit�m se
-   automaticky vytvor� sekvence. Napr�klad:
-CREATE TABLE person (
-  id   SERIAL,
-  name TEXT
-);
-
-   je automaticky transformov�no na:
-CREATE SEQUENCE person_id_seq;
-CREATE TABLE person (
-  id   INT4 NOT NULL DEFAULT nextval('person_id_seq'),
-  name TEXT
-);
-
-   Podrobnejs� informace najdete v manu�lu v popisu pr�kazu
-   create_sequence.
-   
-  4.11.2) Jak z�skat hodnotu SERIAL po vlozen� r�dku?
-  
-   Nejjednoduss�m zpusob, jak z�skat vygenerovanou hodnotu typu SERIAL,
-   je vyuz�t klauzuli RETURNING. Pro tabulku z 4.11.1 vypad� takto:
-INSERT INTO person (name) VALUES ('Blaise Pascal') RETURNING id;
-
-   Tak� muzete pouz�t funkci nextvall() a jej� v�sledek pouz�t v pr�kazu
-   INSERT, nebo zavolat currval() po proveden� pr�kazu INSERT.
-   
-  4.11.3) Nezpusob� currval() a nextval() probl�my ve v�ce uzivatelsk�m
-  prostred�?
-  
-   Ne, currval vrac� vzdy hodnotu, kter� byla vygenerov�na pro v�s.
-   
-  4.11.4) Proc nen� vygenerovan� c�slo pouzito pri prerusen� transakce?Proc
-  vznikaj� d�ry v c�slov�n� prostrednictv�m sekvence nebo typu SERIAL?
-  
-   Pot� co sekvence vygeneruje nov� c�slo, tak se nedoch�z� k zamcen�
-   sekvence a necek� se na �spesn� nebo ne�spesn� dokoncen� transakce.
-   Odvol�n�m transakce, kter� si vyz�dala c�sla sekvence se tato c�sla
-   nen�vratne ztrat�.
-   
-  4.12) Co to je OID? Co je to CTID?
-  
-   V pr�pade, ze tabulku nezaloz�me s atributem WITHOUT OIDS, tak m�
-   kazd� r�dek unik�tn� identifikacn� c�slo OID. Toto c�slo je 4 bajtov�
-   cel� c�slo, kter� je jedinecn� v cel� instalaci. Pretece po 4
-   miliard�ch r�dku. PostgreSQL pouz�v� OIDs jako intern� linky v
-   intern�ch syst�mov�ch tabulk�ch.
-   
-   K z�sk�n� unik�tn�ho c�sla v nesyst�mov�ch tabulk�ch je vhodnejs�
-   pouzit� typu SERIAL nez OID, jelikoz sekvence SERIAL se pouz�v� pouze
-   pro jednu tabulku a je tud�z m�ne n�chyln� na pretecen�. Pokud byste
-   se toho ob�vali, pouzijte typ SERIAL8.
-   
-   CTID se pouz�v� k identifikaci konkr�tn�ho fyzick�ho r�dku. CTID se
-   men� pokud je r�dek modifikov�n nebo znovu nacten. Pouz�vaj� ho indexy
-   jako adresaci fyzick�ch r�dku.
-   
-  4.13) Co znamen� chybov� hl�sen� "ERROR: Memory exhausted in
-  AllocSetAlloc()"?
-  
-   Pravdepodobne jste vycerpal dostupnou virtu�ln� pamet, nebo tvuj
-   kernel m� pr�lis n�zk� limity u urcit�ch zdroju. Pred startem
-   PostgreSQL vyzkousejte:
-ulimit -d 262144
-limit datasize 256m
-
-   Mozn�, ze se projde pouze jeden pr�kaz - z�lez� to na vasem shellu.
-   Mel by zvednout limity datov�ch segmentu vasich procesu na dostatecne
-   velkou hodnotu a snad umoznit dokoncen� dotazu. Zmena limitu se bude
-   aplikovat pouze na aktu�ln� proces a na vsechny nove vytvoren�
-   procesy. Jestlize m�te probl�m s SQL klientem, protoze v�m server
-   vr�til pr�lis dat, zkuste to pred startem klienta.
-   
-  4.14) Jak zjist�m, kterou verzi PostgreSQL pouz�v�m?
-  
-   V psql napiste:
-SELECT version();
-
-  4.15) Jak vytvorit sloupec, kter� bude implicitne obsahovat aktu�ln� cas?
-  
-   Pouzijte CURRENT_TIMESTAMP:
-CREATE TABLE test (x int, modtime TIMESTAMP DEFAULT CURRENT_TIMESTAMP );
-
-  4.16) Jak prov�st vnejs� spojen� (outer join)?
-  
-   PostgreSQL podporuje standardn� SQL syntaxi pro vnejs� spojen�. Zde
-   jsou dva pr�klady:
-SELECT *
-FROM t1 LEFT OUTER JOIN t2 ON (t1.col = t2.col);
-
-   nebo
-SELECT *
-FROM t1 LEFT OUTER JOIN t2 USING (col);
-
-   Tyto identick� dotazy spoj� sloupec t1.col k sloupci t2.col, a jeste
-   vr�t� vsechny nesp�rovan� r�dky t2 (ty, kter� nedohled� v t2). RIGHT
-   JOIN by pripojil vsechny nesp�rovan� r�dky z t2. FULL JOIN vr�t�
-   vsechny sp�rovan� r�dky i vsechny zb�vaj�c� r�dky z obou tabulek.
-   Kl�cov� slovo OUTER je voliteln�. Bezn� operace JOIN se tak� oznacuje
-   jako vnitrn� spojen�.
-   
-  4.17) Jak prov�st dotaz napr�c nekolika datab�zemi?
-  
-   Neexistuje z�dn� zpusob, jak se v dotazu odkazovat na tabulky z jin�
-   nez aktu�ln� datab�ze. A to protoze m� syst�mov� tabulky ulozen�
-   nez�visle v kazd� datab�zi a nen� tak �plne zrejm�, jak by se dotaz
-   proveden� napr�c datab�zemi mel chovat.
-   
-   Jeden z doplnku dblink umoznuje dotaz nad nekolika tabulkami pomoc�
-   funkc�. Druh� zpusob je simult�ln� pripojen� klienta ke vsem
-   relevantn�m datab�z�m a sloucen� v�sledku na strane klienta.
-   
-  4.18) Muze funkce vr�tit v�ce r�dku nebo sloupcu?
-  
-   Jde to jednoduse pomoc� set-returning funkce. V�ce na
-   http://www.postgresql.org/docs/techdocs.17.
-   
-  4.19) Co je pr�cinou chyby "relation with OID xxxxx does not exist"?
-  
-   Nechten�m vedlejs�m efektem kesov�n� SQL dotazu v PL/pgSQL funkci je
-   probl�m s neplatn�mi odkazy na docasn� tabulky, kter� byly od prvn�ho
-   spusten� funkce zruseny a znovu vytvoreny pred dals�m spusten�m
-   PL/pgSQL funkce. Resen�m je pouz�t pr�kaz EXECUTE a to proto, ze
-   prov�dec� pl�n SQL pr�kazu spousten�ho pr�kazem EXECUTE se vytv�r�
-   pokazd� znovu (neukl�d� se do cache).
-   
-   Tento probl�m by se nemel vyskytovat u PostgreSQL verze 8.3 a vyss�ch
-   verz�ch.
-   
-  4.20) Jak� jsou moznosti replikace datab�z�?
-  
-   Replikaci datab�ze umoznuje nekolik technoligi�. Kazd� m� urcit�
-   v�hody a nev�hody.
-   
-   Master/Slave replikaci podporuje jeden hlavn� server, kter� prij�m�
-   pozadavky na z�pis a cten�, a nekolik podr�zen�ch serveru, kter�
-   umoznuj� pouze cten� (SELECT). Nejrozs�renejs�m volne dostupn�m
-   resen�m tohoto typu je Slony-I.
-   
-   Replikace typu Multi-master podporuje existenci nekolika serveru s
-   povolen�m z�pisem na v�ce replikovan�ch serverech. Toto resen� zvysuje
-   z�tez serveru, protoze je nutn� synchronizace serveru.
-   Nejrozs�renejs�m volne dostupn�m resen�m je PGCluster.
-   
-   Jeste existuje nekolik komercn�ch a hardware resen� replikac�
-   podporuj�c�ch ruzn� modely replikace.
-   
-  4.21) Proc v dotazu nejsou rozpozn�ny n�zvy m�ch tabulek nebo funkc�? Proc
-  jsou velk� p�smena v n�zvech automaticky prevedena na mal� p�smena?
-  
-   Nejcastejs�m duvodem nerozpozn�n� n�zvu objektu bylo pouzit� vlozen�
-   n�zvu sloupce nebo tabulky mezi uvozovky pri zakl�d�n� tabulky. Pokud
-   se n�zev zap�se mezi uvozovky, pak je case sensitive, a v dusledku
-   toho je nutn� n�zvy techto sloupcu nebo tabulek v SQL pr�kazech tak�
-   vkl�dat mezi uvozovky (pokud obsahuj� velk� p�smena). Nekter�
-   programy, jako je napr�klad pgAdmin, automaticky pouz�vaj� uvozovky.
-   Takze pokud chcete, aby syst�m identifikoval identifik�tor, mus�te:
-     * nepouz�vat uvozovky v pr�kazu CREATE TABLE
-     * v identifik�toru pouz�t pouze mal� p�smena
-     * v dotazech vkl�dat identifik�tory do uvozovek
diff --git a/doc/FAQ_farsi b/doc/FAQ_farsi
deleted file mode 100644
index 95b28bb9b6..0000000000
--- a/doc/FAQ_farsi
+++ /dev/null
@@ -1,1256 +0,0 @@
-PostgreSQL FAQسوالاتي كه اغلب در مورد PostgreSQL‌ 
-پرسيده مي شوند
-تاريخ آخرين اصلاح اين فايل: 28 شهریور 1383 هجری 
-شمسی
-نگهدارنده اصلي فايل (زبان انگليسي)در حال 
-حاضر : Bruce Momjian [email protected]
-نگهدارنده فايل به زبان فارسي: [email protected] 
- محمود تقي‌زاده مهرجردی
-
-آخرين نسخه اين فايل را مي‌توانيد از اين 
-آدرس بگيريد  http://www.PostgreSQL.org/docs/faqs/FAQ.html
-سوالاتي كه در مورد يك سکوی(پلتفرم) خاص است در 
-اين آدرس جواب داده شده اند  
-http://www.PostgreSQL.org/docs/index.html
-
-
-
-سوالات عمومي
-1.1) PostgreSQL چيست و چگونه بايد آن را تلفظ كرد؟
-1.2) قانون كپي رايت‌ (حقوق معنوي) در مورد 
-PostgreSQL  به چه صورت است؟
-1.3) PostgreSQL‌ روي چه نوع يونيكسهايي اجرا 
-مي‌شود؟
-1.4) روي چه محيطهاي غير يونيكسي مي‌توان آن را 
-اجرا كرد؟
-1.5) PostgreSQL را از كجا مي‌توانم بگيرم؟
-1.6) از كجا خدمات پشتيباني بگيرم؟
-1.7) آخرين نسخه اعلام شده چيست؟
-1.8) چه مستندات و راهنمائيهايي وجود دارند؟
-1.9) چگونه مي‌توانم ازاشكالات شناخته شده و يا 
-امكاناتي كه در اين پايگاه داده وجود ندارد  
-مطلع شوم؟
-1.10) چگونه مي‌توانم زبان SQL را ياد بگيرم؟
-1.11) آيا PostgreSQL مشكل Y2K‌ دارد يا خير؟
-1.12) چگونه مي‌توانم به تيم برنامه نويس PostgreSQL 
-ملحق شوم؟
-1.13) چگونه مي‌توانم يك اشكال را به گروه 
-برنامه نويس اعلام كنم؟
-1.14)  وضعيت PostgreSQL‌ در مقايسه با ساير DBMSها به 
-چه صورت است؟
-1.15) من چگونه مي‌توانم از نظر مالي به PostgreSQL 
-كمك كنم؟
-
-سوالات مربوط به استفاده از پايگاه داده
-2.1) آيا هيچ درايور ODBC‌ براي PostgreSQL وجود دارد؟
-2.2) چه ابزارهايي براي استفاده از PostgreSQL‌ با 
-صفحات وب وجود دارد؟
-2.3) آيا PostgreSQL‌ يك واسط كاربري گرافيكي دارد؟
-2.4) با چه زبانهاي برنامه‌نويسي مي‌توان با 
-PostgreSQL‌ ارتباط برقرار كرد؟
-
-سوالات مربوط به راهبري
-3.1) چگونه مي‌توانم PostgreSQL‌ را در شاخه‌اي غير 
-از /usr/local/pgsql/  نصب كنم؟
-3.2) چرا موقعي كه من برنامه postmaster‌ را اجرا مي 
-كنم پيام Bad system call‌ و يا core dump ‌مي‌گيرم؟
-3.3) چرا موقعي كه من سعي مي‌كنم برنامه postmaster‌ 
-را اجرا كنم خطاي IpcMemoryCreate  مي‌گيرم؟
-3.4) چرا موقعي كه من سعي مي‌كنم برنامه postmaster‌ 
-را اجرا كنم خطاي  IpcSemaphoreCreate مي‌گيرم؟
-3.5) چگونه مي‌توانم اتصالات ساير ماشينها را 
-كنترل كنم؟
-3.6) براي كارايي بالاتر و بهتر پايگاه داده من 
-چه تنظيماتي را بايد انجام دهم؟
-3.7) چه امكاناتي براي پيدا كردن اشكال‌ وجود 
-دارد؟
-3.8) چرا موقعي كه من مي‌خواهم به پايگاه داده 
-وصل شوم پيام "Sorry, too many clients" ‌مي‌گيرم؟
-3.9) در شاخه  pgsql_tmp  چه چيزي قرار دارد؟
-3.10) چرا براي به روز كردن نسخه پايگاه داده من 
-بايد كل داده ها را dump‌ و مجدداً restore كنم؟
-3.11) از چه سخت افزاري بايد استفاده كنم؟
-
-سوالات عملياتي
-4.1) تفاوت بين binary cursors و Normal cursors چيست؟
-4.2) من چگونه مي‌توانم فقط روي چند رديف اول يا 
-يك رديف تصادفي درخواست SELECT‌ بزنم؟
-4.3) من چگونه مي‌توانم ليستي از جداول يا ساير 
-چيزهايي كه در psql‌ وجود دارد را ببينم؟
-4.4) چگونه يك ستون جدول را حذف مي‌كنيد؟ چگونه 
-نوع داده آن را عوض كنيم؟
-4.5) حداكثر اندازه يك رديف،‌ جدول و خود 
-پايگاه داده چقدر است؟
-4.6) چقدر فضاي ديسك سخت براي ذخيره كردن 
-داده‌‌هاي يك فايل متني مورد نياز است؟
-4.7) چگونه مي‌توانم بفهمم كه چه كاربران،‌ 
-پايگاه داده،‌ نمايه و جداولي در سيستم تعريف 
-شده است؟
-4.8) چرا درخواستهاي من كند اجرا مي‌شوند يا 
-چرا از نمايه ها استفاده نمي‌كنند؟
-4.9) چگونه مي‌توانم نحوه بررسي درخواست را 
-توسط بهينه‌ساز درخواستها مشاهده كنم؟
-4.10) نمايه R-tree‌ چيست؟
-4.11) بهينه ساز تكويني درخواست چيست؟ (Genetic Query 
-Optimizer)
-4.12) چگونه از عبارات منظم براي جستجو استفاده 
-كنم؟ چگونه جستجويي انجام دهم كه حساس به متن 
-نباشد؟ چگونه براي يك جستجوي غير حساس به متن 
-از نمايه استفاده كنم؟
-4.13) چگونه مي‌توانم در يك درخواست تشخيص دهم 
-كه يك فيلد NULL‌ است؟
-4.14) تفاوت بين گونه‌هاي مختلف character چيست؟
-4.15.1) چگونه مي‌توانم يك فيلد سريال يا 
-افزايشي ايجاد كنم؟
-4.15.2) چگونه مي‌توانم مقدار يك درج سريالي را 
-بدانم؟
-4.15.3) آیا توابع ()nextval و ()currval منجر به ایجاد 
-شرایط race برای سایر کاربران می شوند؟
-4.15.4) چرا اعداد سریالی مربوط به تراکنشهای abort 
-شده مجدداً استفاده نمی شود؟ چرا بین اعداد 
-سریالی یک فاصله خالی ایجاد می شود؟
-4.16) OID و TID چه هستند؟
-4.17) معني بعضي از ترمها و كلماتي كه در PostgreSQL‌ 
-استفاده مي‌شود چيست؟
-4.18) چرا من خطاي "ERROR: Memory exhausted in AllocSetAlloc" 
-مي‌گيرم؟
-4.19) از كجا تشخيص دهم كه ويرايش يا نسخه 
-PostgreSQLيي كه من استفاده مي‌كنم چيست؟
-4.20) چرا در حین اجرای عملیات روی large-objectها 
-خطای "invalid large obj descriptor"به وجود می آید؟
-4.21) چگونه يك ستون ايجاد كنم كه مقدار زمان 
-جاري را به عنوان مقدار پيش‌فرض داشته باشد؟
-4.22) چرا زير درخواستهايي كه از IN استفاده 
-مي‌كنند كند هستند؟
-4.23) چگونه مي‌توانم يك الحاق خارجي (outer join) 
-انجام دهم؟
-4.24) چگونه مي‌توان درخواستهايي از چند پايگاه 
-داده توليد كرد؟
-4.25) چگونه خروجي يك تابع مي‌تواند  چند رديف 
-يا ستون باشد؟
-4.26)  در توابع PL/PgSQL چرا نمي‌توان با اطمينان 
-جداول موقت را ايجاد يا حذف كرد؟
-4.27) چه گزينه‌هايي براي تكرار (replication) وجود 
-دارد؟
-4.28) چه گزينه‌هايي براي رمزنگاري وجود دارد؟
-
-توسعه PostgreSQL
-5.1) من يك تابع نوشته‌ام. چگونه آن را در psql 
-اجرا كنم؟ چرا با اجراي آن core dump مي‌گيرم؟
-5.2) چگونه مي‌توانم در توليد نوع‌ها و توابع 
-جديد و جالب براي PostgreSQL‌ همكاري و مشاركت 
-داشته باشم.
-5.3) چگونه مي‌توانم يك تابع به زبان C بنويسم 
-كه خروجي آن يك ‌tuple  (چند تايي) باشد؟
-5.4) من يك فايل منبع را عوض كرده ام چرا در 
-عمليات كامپيل مجدد آن تغيير ديده نمي‌شود؟
-
-
-
-
-سوالات عمومي
-1.1) PostgreSQL چيست و چگونه آن را بايد تلفظ كرد؟
-PostgreSQL به صورت Post-Gres-Q-L‌ تلفظ مي‌شود. يك فايل 
-صوتي در آدرس http://www.postfresql.org/postgresql.mp3‌ براي 
-كساني كه مايلند تلفظ صحيح را بشنوند وجود 
-دارد.
-PostgreSQL از روي سيستم مديريت پايگاه داده POSTGRES 
-توسعه داده شده است (هنوز هم بعضي مواقع براي 
-سادگي به آن Postgres گفته مي‌شود) كه يك نمونه 
-تحقيقاتي از پايگاه داده‌هاي نسل بعد است. 
-PostgreSQL همان الگوي داده قوي و انواع داده  را 
-حفظ كرده است ولي زبان PostQuel را با يك 
-زيرمجموعه پيشرفته از SQL جايگزين كرده است. 
-PostgreSQL متن باز بوده و متن كامل آن در دسترس 
-است.
-PostgreSQL  توسط يك تيم برنامه‌نويس كه همگي در 
-گروه پست الكترونيك برنامه‌نويسان PostgreSQL  
-عضو هستند، انجام مي‌شود. هماهنگ كننده اصلي 
-در حال حاضر Marc G. Fournier‌ به آدرس [email protected]  
-مي‌باشد. (براي ديدن نحوه ملحق شدن به اين تيم 
-قسمت 1.6 را ببينيد). اين تيم در حاضر مسئوليت 
-تمام مسائل مربوط به برنامه‌نويسي PostgreSQL را 
-بر عهده دارد. اين يك پروژه گروهي است و تحت 
-كنترل هيچ شركتي نيست. براي اطلاعات بيشتر در 
-مورد اين تيم به آدرس 
-http://www.PostgreSQL.org/docs/faqs/FAQ_DEV.html مراجعه كنيد.
-اولين نسخه PostgreSQL‌ توسط Andrew Yu and Jolly Chen به 
-وجود آمد. افراد بسياري در توسعه و رفع اشكال و 
-انتقال آن شركت كرده‌اند. متن اصلي Postgres كه 
-PostgreSQL از روي آن نوشته شده است، توسط تعداد 
-زيادي دانشجوي كارشناسي ارشدو دانشجوي 
-كارشناسي و تيم برنامه‌نويسي كه تحت نظر 
-پروفسور Michael Stonebrake در دانشگاه 
-بركلي،‌كاليفرنيا كار مي‌كرده‌اند نوشته 
-شده است.
-نام اصلي نرم افزار در دانشگاه بركلي Postgres‌ 
-بود. در سال 1995 بعد از اضافه شدن SQL نام آن به 
-Postgres95 تغيير داده شد. در سال 1996 نام آن به 
-PostgreSQL تغيير داده شد.
-1.2) قوانين كپي رايت در مورد PostgreSQL به چه صورت 
-است؟
-PostgreSQL تحت قانون كپي رايت زير قرار دارد:
-PostgreSQL Data Base Management System
-Portions copyright (c) 1996-2004, PostgreSQL Global Development Group Portions 
-Copyright (c) 1994-6 Regents of the University of California
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose, without fee, and without a written agreement is 
-hereby granted, provided that the above copyright notice and this paragraph and 
-the following two paragraphs appear in all copies.
-IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR 
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST 
-PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF 
-THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
-PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND 
-THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, 
-UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-قانون بالا ليسانس BSD كه يك ليسانس كلاسيك 
-براي متن‌هاي باز است مي‌باشد. هيچ محدوديتي 
-در مورد نحوه استفاده از متن در آن ديده 
-نمي‌شود. ما آن را دوست داريم و هيچ قصدي براي 
-تغيير آن نداريم.
-1.3) PostgreSQL‌ روي چه نوع يونيكسهايي اجرا 
-مي‌شود؟
-در حالت كلي PostgreSQL روي هر پلتفرم (سكوي) سازگار 
-با يونيكس اجرا مي‌شود. ليست پلتفرمهايي كه 
-تاكنون PostgreSQL‌ روي آنها نصب و تست شده است 
-درقسمت دستورالعملهاي نصب آمده است.
-1.4) روي چه محيطهاي غير يونيكسي مي‌توان آن را 
-اجرا كرد؟
-Client
-مي‌توان psql, كتابخانه libpq و ساير واسطها و 
-برنامه‌هاي كاربردي را طوري كامپيل كرد كه 
-روي محيطهاي ويندوز نيز اجرا شوند. در اين 
-حالت Client روي ويندوز اجرا مي‌شود و از طربق 
-شبكه و پروتكل TCP/IP با يك سرور كه روي يك پلتفرم 
-لينوكس در حال اجراست ارتباط برقرار 
-مي‌كند.يك فايل win32.mak همراه با كدهاي PostgreSQL 
-وجود دارد كه براي كامپيل كردن كتابخانه libpq و 
-برنامه psql مي‌باشد. P‌ostgreSQL‌ همچنين امكان 
-ارتباط به صورت ODBC‌  را نيز دارد.
-Server
-با استفاده از Cygwin‌ و كتابخانه Cygnus مي‌توان 
-پايگاه داده را روي ويندوز NT و يا Win2K اجرا 
-كرد.براي ديدن اطلاعات بيشتر فايل pgsql/doc/FAQ_MSWIN 
-‌را كه بهمراه توزبع‌هاي PostgreSQL آمده است 
-ببينيد و يا اينكه به اين صفحه 
-http://www.PostgreSQL.org/docs/faqs/text/FAQ_MSWIN مراجعه كنيد.
-در حال حاضر يك عمليات انتقال PostgreSQL به روي 
-سكوهاي Win NT/2000/XP در جريان است. براي ديدن وضعيت 
-اين پروژه به سايت‌هاي 
-http://momjian.postgresql.org/main/writings/pgsql/win32.htm Ùˆ 
-http://techdocs.postgresql.org/guides/Windows مراجعه كنيد. 
-همچنين يك عمليات انتقال بر روي Novell Netware 6 نيز 
-در حال انجام است كه در سايت http://forge.novell.com 
-مي‌توانيد اطلاعات بيشتر را ببينيد.
-1.5) PostgreSQL را از كجا مي‌توانم بگيرم؟
-PostgreSQL‌ را از سايت اصلي آن  ftp://ftp.PostgreSQL.org/pub 
-مي‌توانيد بگيريد. در صفحه اصلي سايت ليست 
-ساير آدرسهايي كه مي‌توانيد PostgreSQL‌ را از 
-آنها بگيريد آمده است.
-1.6) از كجا خدمات پشتيباني بگيرم؟
-گروه پستي اصلي [email protected] مي‌باشد. اين 
-گروه براي بحث در مورد موضوعات مختلف در زمينه 
-PostgreSQL است. براي عضو شدن در اين گروه پستي يك 
-نامه الكترونيكي به آدرس گروه با محتوياتی كه 
-در ادامه آمده است ارسال كنيد. در قسمت Subject 
-چيزي ننويسيد.
-    subscribe
-    end
-آدرس گروه: [email protected]
-همچنين يك گروه پستي هم به صورت ارسال چكيده 
-پيامها وجود دارد. براي عضو شدن در اين گروه يك 
-نامه با محتويات زير به این آدرس  ارسال كنيد. 
[email protected] 
-    subscribe
-    end
-در اين گروه هر موقع حجم نامه‌ها به 30 
-كيلوبايت رسيد براي تمام اعضاء ارسال مي‌شود.
-گروه پستي بررسي اِشكالات هم وجود دارد. براي 
-عضو شدن در اين گروه يك نامه با محتويات زير به 
[email protected] ارسال كنيد.
-    subscribe
-    end
-گروه پستي مخصوص توسعه دهندگان 
-(برنامه‌نويسان) نيز وجوددارد. براي عضويت در 
-اين گروه يك نامه به آدرس زير با محتويات مشخص 
-شده ارسال كنيد.  [email protected]  
-    subscribe
-    end
-گروههاي پستي ديگري نيز در زمينه PostgreSQL‌ وجود 
-دارد  كه مي‌توانيد در سايت http://www.postgresql.org 
-ببينيد.
-همچنين يك كانال IRC روي Freenode و EFNet بنام PostgreSQL# 
-وجود دارد. شما مي‌توانيد از فرمان يونيكسي irc 
--c '#PostgreSQL' "$USER" irc.phoenix.net. يا irc -c '#PostgreSQL' "$USER" 
-irc.freenode.net استفاده كنيد.
-ليست شركتهايي كه از طريق آنها مي‌توانيد 
-خدمات پشتيباني تجاري در زمينه PostgreSQL دريافت 
-كنيد در اين آدرس http://techdocs.postgresql.org/companies.php 
-موجود است.
-1.7) آخرين نسخه اعلام شده چيست؟
-آخرين نسخه PostgreSQL‌  كه وجود دارد 7.4.3 است.
-هدف ما آن است كه هر 6 ماه تا 8 ماه يك نسخه جديد 
-ارائه شود.
-1.8) چه مستندات و راهنمائيهايي وجود دارند؟
-چندين كتابچه و صفحات راهنما و مثالهاي كوچك 
-همراه با متن اصلي PostgreSQL‌ در شاخه doc وجود 
-دارد. براي ديدن صفحات راهنما مي‌توانيد به 
-سايت http://www.PostgreSQL.org/docs  نيز مراجعه نماييد.
-دو كتاب در زمينه PostgreSQL‌  در آدرس‌هاي 
-http://www.PostgreSQL.org/docs/awbook.htm Ùˆ http://www.commandprompt.com/ppbook 
-وجود دارد. ليستي از كتابهايي كه قابل خريد 
-است در آدرس http://techdocs.PostgreSQL.org/techdocs/bookreviews.php 
-وجود دارد. همچنين ليستي از مقالات فني در 
-مورد PostgreSQL در آدرس http://techdocs.PostgreSQL.org وجود 
-دارد.
-برنامه psql يك دستور d\ دارد كه اطلاعاتي در 
-مورد انواع داده‌هاي قابل تعريف و عملگر‌ها 
-و توابع و ... به ما نشان مي‌دهد. در سايت اصلي 
-ما اطلاعات بيشتري را مي‌توانيد پيدا كنيد.
-1.9) چگونه مي‌توانم ازاشكالات شناخته شده و يا 
-امكاناتي كه در اين پايگاه داده وجود ندارد  
-مطلع شوم؟
-PostgreSQL يك زير مجموعه پيشرفته از SQL-92 را 
-پشتيباني مي‌كند. در ليست  TODO   اِشكالات 
-شناخته شده يا امكاناتي كه وجود ندارد و يا 
-برنامه‌‌هاي آينده آمده است.
-1.10) چگونه مي‌توانم زبان SQL را ياد بگيرم؟
-كتاب PostgreSQL در آدرس SQL http://www.PostgreSQL.org/docs/awbook.html 
-‌را آموزش مي‌دهد. همچنين يك كتاب در آدرس 
-http://www.commandprompt.com/ppbook وجود دارد. يك راهنماي 
-خيلي خوب هم در سايت‌هاي  
-http://www.intermedia.net/support/sql/sqltut.shtm Ùˆ 
-http://ourworld.compuserve.com/homepages/graeme_birchall/HTM_COOK.HTM Ùˆ  
-http://sqlcourse.com در مورد SQL وجود دارد.
-كتاب ديگري كه مي‌توان براي يادگيري SQL از آن 
-استفاده كرد كتاب "SQL را در 21 روز ياد بگيريد،‌ 
-ويرايش دوم" در سايت 
-http://members.tripod.com/er4ebus/sql/index.htm مي‌باشد.
-تعداد زيادي از كاربران كتاب The Practical SQL را 
-ترجيح مي‌دهند. كتاب ديگر The Complete Refrence SQL 
-انتشارات McGraw-Hill مي‌باشد.
-1.11) آيا PostgreSQL مشكل Y2K‌ دارد يا خير؟
-خير،‌PostgreSQL‌ با تاريخ‌هاي قبل و بعد از 2000 
-مشكلي ندارد.
-1.12) چگونه مي‌توانم به تيم برنامه نويس PostgreSQL 
-ملحق شوم؟
-ابتدا،‌آخرين سورس را دونلود كرده و مستندات 
-مربوط به برنامه‌نويسي PostgreSQL را در سايت 
-مطالعه كنيد. سپس به گروههاي پستي ‌ pgsql-patches و 
-pgsql-hackers  عضو شويد. در مرحله آخر وصله‌هاي با 
-كيفيت بالا را به pgsql-patches ارسال كنيد.
-تعداد زيادي از برنامه‌نويسان وجود دارند كه 
-امتياز انجام تغييرات در cvs‌ را دارند. هر 
-كدام از آنها تعداد زيادي وصله‌‌ با كيفيت 
-بالا به گروه ارسال كرده‌اند كه اعتماد 
-گردانندگان PostgreSQL را به دست آورده‌اند.
-1.13) چگونه مي‌توانم يك اِشكال را به گروه 
-برنامه نويس اعلام كنم؟
-لطفاً صفحه مربوط به اِشكالات PostgreSQL را در 
-سايت http://www.PostgreSQL.org/bugs/bugs.php مشاهده‌ كنيد. در 
-اين سايت نحوه گزارش و ارسال يك اشكال توضيح 
-داده شده است.
- همچنين براي ديدن نسخه‌هاي جديدتر PostgreSQL و 
-يا وجود يك وصله جديد از سايت ftp://ftp.PostgreSQL.org/pub 
-بازديد كنيد.
-1.14) وضعيت PostgreSQL‌ در مقايسه با ساير DBMSها به 
-چه صورت است؟
-راههاي مختلفي براي اندازه‌گيري و مقايسه 
-نرم‌افزارها وجود دارد كه عبارتند از 
-امكانات، كارايي، قابليت اعتماد، پشتيباني و 
-قيمت
-    امكانات 
-    PostgreSQL بيشتر امكانات موجود در سيستم‌هاي 
-    پايگاه داده تجاري بزرگ نظير transactions, subselets, 
-    triggers, views, foreign key referential integrity Ùˆ sophisticated 
-    locking‌ را دارد. در PostgreSQL‌‌ امكاناتي وجود 
-    دارد كه پايگاههاي داده ديگر آن را ندارند 
-    نظير user-defined types‌و Inheritance‌و rules‌و multi-version 
-    concurrency control 
-
-  كارايي
-          كارايي PostgreSQL در حد بقيه سيستم‌هاي 
-  تجاري و متن باز است. در بعضي موارد سريعتر و 
-  در بعضي موارد از آنها كندتر است. در مقايسه 
-  با MySQL براي كاربران بيشتر و درخواست‌هاي 
-  پيچيده و بار زياد خواندن/نوشتن سريعتر است. 
-  در درخواست‌هاي ساده SELECT‌ از MySQL كندتر است. 
-  البته MySQL خيلي از امكانات PostgreSQL كه در بالا 
-  به آن اشاره شد را ندارد. هدف اصلي ما امكانات 
-  و قابليت اعتماد بالاست در ضمن آنكه تلاش 
-  مي‌كنيم تا كارايي آن نيز بهبود يابد. در 
-  آدرس http://openacs.org/philosophy/why-not-mysql.html يك مقايسه 
-  جالب بين MySQL و PostgreSQL وجود دارد. از طرف ديگر 
-  MySQL‌ يك شركت است كه محصول خود را به صورت متن 
-  باز ارائه مي‌كند ولي براي نرم‌افزار غير 
-  متن باز خود احتياج به ليسانس تجاري دارد بر 
-  خلاف PostgreSQL كه يك گروه كاملاً متن باز هستند.
-
-    قابليت اطمينان 
-    ما فكر مي‌كنيم كه يك سيستم پايگاه 
-    داده‌اي كه مطمئن نباشد ارزشي ندارد. ما 
-    تمام تلاشمان را براي ارائه كدهاي پايداري 
-    كه به خوبي تست شده باشند و كمترين اِشكالات 
-    را داشته باشند مي‌كنيم. هر نسخه جديدي كه 
-    ارائه مي‌شود حداقل يك ماه را در مرحله تست 
-    بتا مي‌گذراند. ما بر اين باور هستيم كه 
-    قابليت اطمينان PostgreSQL‌ در مقايسه با ساير 
-    سيستم‌هاي پايگاه داده قابل توجه است و 
-    نسخه‌هايي كه تاكنون ارائه شده است نشان 
-    مي‌دهد كه ما توانايي ارائه يك سيستم قوي و 
-    محكم و مطمئن را كه آماده بهره‌برداري است 
-    داريم. 
-    پشتيباني 
-    گروههاي پستي ما امكان ارتباط و تماس به 
-    گروه بزرگي از برنامه نويسان و كاربران را 
-    مي‌دهد كه مي‌توانند در حل مشكلات به 
-    ديگران كمك كنند. دسترسي مستقيم به 
-    برنامه‌نويسان و گروههاي كاربران و 
-    راهنماها و كداصلي باعث مي‌شود كه 
-    پشتيباني PostgreSQL نسبت به ساير پايگاههاي 
-    داده به نحو بهتري انجام شود. همچنين امكان 
-    ارائه خدمات پشتيباني به صورت تجاري نيز 
-    وجود دارد. براي ديدن اطلاعات بيشتر به FAQ 
-    section 1.6  مراجعه كنيد. 
-    قيمت 
-    هم براي استفاده تجاري و هم غير تجاري هيچ 
-    هزينه‌اي نبايد پرداخت شود. هيچ محدوديتي 
-    براي انجام تغييرات در PostgreSQL توسط استفاده 
-    كنندگان وجود ندارد به جز مواردي كه در 
-    ليسانس BSD به آن اشاره شده است. 
-1.15) من چگونه مي‌توانم از نظر مالي به PostgreSQL 
-كمك كنم؟
-PostgreSQL  داراي يك ساختار تشكيلاتي درجه اول است 
-كه آن را مديون Marc Fournier‌ است كه اين ساختار را 
-ايجاد كرده است.
-كيفيت يك ساختار براي يك پروژه متن باز بسيار 
-اهميت دارد. يك ساختار خوب مي‌تواند مانع از 
-حوادثي شود كه در حركت روبه‌جلوي پروژه خللي 
-وارد مي‌كنند.
-البته اين ساختار تشكيلاتي ارزان نيست. 
-هزينه‌هاي ثابت ماهانه و روزمره براي 
-نگهداري و حفظ اين ساختار مورد نياز است. اگر 
-شما يا شركت شما مايل است كه از نظر مالي به 
-اين حركت كمك كند لطفاً به سايت 
-http://store.pgsql.com/shopping مراجعه كرده و كمك خود را 
-اهدا كنيد.
-هر چند در صفحه اصلي عبارت PostgreSQL,Inc‌ ذكر شده 
-است ولي مشاركت عمدتاً براي پشتيباني از 
-پروژه PostgreSQL‌ مي باشد و نه براي يك شركت مشخص. 
-اگر ترجيح مي‌دهيد مي‌توانيد يك چك به آدرس 
-مشخص شده ارسال كنيد.
-اگر يك استفاده موفق از PostgreSQL سراغ داريد 
-لطفاً آن را به سايت http://advocacy.postgresql.org گزارش 
-دهيد.
-
-
-
-سوالات مربوط به استفاده از پايگاه داده
-2.1) آيا هيچ درايور ODBC‌ براي PostgreSQL وجود دارد؟
-دو درايور ODBC بنامهاي psqlODBC‌ و OpenLink براي 
-PostgreSQL‌ وجود دارد.
-براي گرفتن psqlODBC به سايت 
-http://gborg.postgresql.org/project/psqlodbc/projdisplay.php مراجعه 
-كنيد.
-OpenLlink را از اين سايت http://www.openlinksw.com 
-مي‌توانيد بگيريد. اين درايور با 
-نرم‌افزارهاي مختلف ODBC كار مي‌كند بنابراين 
-شما قادر خواهيد بود با استفاده از OpenLink روي 
-اكثر سكو‌هايي كه نرم‌افزارODBC‌دارند بدون 
-مشكل به PostgreSQL نيز متصل شويد.
-اين محصول به كساني كه احتياج به خدمات 
-پشتيباني تجاري دارند فروخته مي‌شود. ولي 
-نسخه آزاد اين نرم‌افزار هميشه در درسترس 
-مي‌باشد. براي كسب اطلاعات بيشتر سوالات خود 
-را به آدرس [email protected] ‌ارسال نماييد.
-2.2) چه ابزارهايي براي استفاده از PostgreSQL‌ با 
-صفحات وب وجود دارد؟
-در سايت http://www.webreview.com براي استفاده از 
-PostgreSQL‌ در صفحات وب راهنماييهاي خوبي وجود 
-دارد.
-براي تركيب و استفاده در صفحات وب زبان PHP‌ يك 
-واسط بسيار مناسب است. اطلاعات بيشتر راجع به 
-PHP‌در سايت http://www.php.net وجود دارد.
-مثالهايي نيز با استفاده از Perl‌ و CGI.pm و mod_perl 
-وجود دارد.
-2.3) آيا PostgreSQL‌ يك واسط كاربري گرافيكي دارد؟
-چند نرم افزار گرافيكي براي PostgreSQL‌ وجود دارد 
-كه شامل pgAccess درسايت http://www.pgaccess.org و pgAdmin III در 
-سايت http://www.pgadmin.org و RHDB Admin در سايت 
-http://sources.redhat.com/rhdb و Rekall در سايت 
-http://www.thekompany.com/products/rekall  مي‌باشد. همچنين يك 
-phpPgAdmin هم در سايت http://phppgadmin.sourceforge.net وجود 
-دارد كه يك واسط وبي براي مديريت PostgreSQL 
-مي‌باشد.
-براي ديدن اطلاعات بيشتر راجع به 
-نرم‌افزارهاي گرافيكي براي PostgreSQL به آدرس 
-http://techdocs.postgresql.org/guides/GUITools مراجعه كنيد.
-2.4) با چه زبانهاي برنامه‌نويسي مي‌توان با 
-PostgreSQL‌ ارتباط برقرار كرد؟
-بيشتر زبانهاي برنامه‌نويسي مي‌توانند با 
-PostgreSQL‌ ارتباط برقرار كنند. به همراه  سورس 
-PostgreSQL تعدادي از واسطهاي مورد نياز براي 
-ارتباط با پايگاه داده از طريق زبانهاي مختلف 
-آمده است كه در زير ليست آنها را مشاهده 
-مي‌كنيد.
-  C (libpq) 
-  Embedded C (ecpg) 
-  Java (jdbc) 
-  Python (PyGreSQL) 
-  TCL (libpgtcl) 
-واسطهاي ديگر در سايت http://gborg.postgresql.org در قسمت 
-Drivers/Interfaces وجود دارد.
-
-
-
-سوالات مديريتي
-3.1) چگونه مي‌توانم PostgreSQL‌ را در شاخه‌اي غير 
-از /usr/local/pgsql/  نصب كنم؟
-موقع اجراي دستور configure از گزينه prefix-- استفاده 
-كنيد.
-3.2) چرا موقعي كه من برنامه postmaster‌ را اجرا مي 
-كنم پيام Bad system call‌ و يا core dump ‌مي‌گيرم؟
-به دلايل مختلف ممكن است اين اتفاق بيفتد. اما 
-در قدم اول شما مطمئن شويد كه كه امكانات 
-اضافه System V‌ در كرنل شما نصب شده باشد. PostgreSQL 
-براي اجرا شدن نياز به استفاده از امكانات 
-حافظه مشترك و سمافورها دارد.
-3.3) چرا موقعي كه من سعي مي‌كنم برنامه postmaster‌ 
-را اجرا كنم خطاي IpcMemoryCreate  مي‌گيرم؟
-احتمالاً‌ قسمت ايجاد حافظه مشترك در كرنل به 
-درستي تنظيم نشده است و يا اينكه بايد فضاي 
-حافظه اشتراكي در كرنل را زياد كرد. ميزان 
-دقيق حافظه مشترك مورد نياز بسته به معماري و 
-نحوه استفاده از بافرها توسط برنامه postmaster 
-دارد. براي بيشتر سيستم‌ها كه با تنظيمات 
-پيش‌فرض كار مي‌كنند مقدار اين حافظه حدود 1 
-مگابايت است. براي ديدن اطلاعات بيشتر راجع به 
-حافظه مشترك و سمافور به PostgreSQL Administrator's Guide 
-مراجعه كنيد.
-3.4) چرا موقعي كه من سعي مي‌كنم برنامه postmaster‌ 
-را اجرا كنم خطاي  IpcSemaphoreCreate مي‌گيرم؟
-اگر پيغام خطا (‌pcSemaphoreCreate: semget failed (No space left on 
-device  باشد به اين معني است كه تعداد سمافورهاي 
-تنظيم شده در كرنل كافي نيست. PostgreSQL‌ براي هر 
-فرايندي كه در backend اجرا مي‌شود به يك سمافور 
-نياز دارد. يك راه حل موقت براي اين مسئله آن 
-است كه postmaster را با اعمال محدوديت روي تعداد 
-فرايندهايي كه مي‌تواند ايجاد كند اجرا كنيم. 
-براي اينكار از گزينه N- و يك عدد كمتر از 32 
-استفاده كنيد. راه حل دائمي اين مشكل آن است كه 
-پارامترهاي SEMMNS, SEMMNI كرنل را افزايش دهيم.
-در زمان دسترسي خيلي زياد به پايگاه داده، ‌ 
-سمافورهاي نامعتبر مي‌توانند باعث crash‌ كردن 
-سيستم شوند.
-اگر پيغام خطا چيز ديگري باشد احتمالاً به 
-دليل آن است كه كرنل از سمافورها پشتيباني 
-نمي‌كند. براي ديدن اطلاعات بيشتر راهنماي 
-مديريتي PostgreSQL را مطالعه كنيد.
-3.5) چگونه مي‌توانم اتصالات ساير ماشينها را 
-كنترل كنم؟
-به صورت پيش فرض فقط از ماشيني كه PostgreSQL روي آن 
-در حال اجراست مي‌توان با استفاده از 
-سوكت‌هاي يونيكسي به آن متصل شد. ساير 
-ماشين‌ها قادر نيستند به PostgreSQL متصل شوند مگر 
-آنكه گزينه tcp_sockets در فايل postgresql.conf فعال شده و 
-همچنين با اصلاح فايل PGDATA/ph_hba.conf هويت‌شناسي 
-مبتني بر ميزبان نيز فعال شود. با اين كار 
-مي‌توان اتصالات TCP/IP به PostgreSQL‌ ايجاد كرد.
-3.6) براي كارايي بالاتر و بهتر پايگاه داده من 
-چه تنظيماتي را بايد انجام دهم؟
-به طور حتم استفاده از انديس‌ها باعث بالا 
-رفتن سرعت پاسخ‌گويي به درخواست‌ها خواهد 
-شد. دستور EXPLAIN ANALYZE به شما امكان ديدن نحوه 
-پردازش يك دستور توسط PostgreSQL را مي‌دهد.
-اگر شما تعداد زيادي INSERT‌ داريد سعي كنيد 
-آنها را با قرار دادن در يك فايل با دستور COPY‌ 
-اجرا كنيد. اين دستور به مراتب از INSERT سريعتر 
-است. حتي‌الامكان سعي كنيد از تراكنشها 
-استفاده نكنيد. تراكنشها مجموعه دستوراتي 
-هستند كه بيند BEGIN و ‍COMMIT مي‌آيند. اگر يك 
-دستور به صورت عادي اجرا شود PostgreSQL خود آن 
-دستور را به صورت يك تراكنش مستقل نگاه كرده و 
-اجرا مي‌كند. موقعی كه تغييرات زيادي در 
-پايگاه داده انجام مي‌شود انديسهاي قبلي را 
-حذف و مجدداً‌ ايجاد كنيد.
-استفاده از گزينه o -F- در فرمان postmaster باعث غير 
-فعال كردن ()fsync مي‌شود. اين دستور بعد از هر 
-تراكنش اطلاعات را روي هاردديسك منتقل 
-مي‌كند.
-براي افزايش تعداد بافرهاي حافظه اشتراكي از 
-گزينه B- به همراه فرمان postmaster استفاده كنيد. 
-توجه كنيد كه اگر اين عدد خيلي بزرگ باشد ممكن 
-است postmaster اصلاً‌ اجرا نشود. هر بافر 8 كيلو 
-بايت حافظه نياز دارد و تعداد بافرها به طور 
-پيش فرض 64 است.
-همچنين مي‌توان با گزينه S-  ميزان حافظه‌اي 
-كه براي مرتب‌سازي‌هاي موقت توسط PostgreSQL 
-استفاده مي‌شود را افزايش داد. مقدار پيش فرض 
-512 كيلو بايت است.
-استفاده از دستور CLUSTER نيز براي بالا بردن 
-كارايي موثر ا ست. دستور راهنماي CLUSTER اطلاعات 
-بيشتري در اين زمينه به شما مي‌دهد.
-3.7) چه امكاناتي براي پيدا كردن اشكال‌ وجود 
-دارد؟
-PostgerSQL‌ امكانات مختلفي براي گزارش دادن 
-وضعيت خود دارد كه براي اشكال زدايي مي‌توان 
-از آنها استفاده كرد.
-با استفاده از گزينه enable-assert-- تعداد زيادي 
-()assert براي مونيتور كردن و توقف برنامه در صورت 
-بروز خطاهاي ناخواسته فعال مي‌شود.
-هم Postmaster و هم postgres گزينه‌هاي زيادي براي 
-اشكال زدايي دارند. موقعي كه postmaster را اجرا 
-مي‌كنيد خروجي استاندارد و خطا را سمت فايل log 
-ارسال كنيد.
-    cd /usr/local/pgsql
-    ./bin/postmaster >server.log 2>&1 &
-اين كار يك فايل log در بالاترين شاخه PostgreSQL‌ 
-ايجاد مي‌كند. اين فايل حاوي اطلاعات مفيدي 
-در مورد مسائل و خطاهايي است كه براي سرور 
-اتفاق افتاده است. براي ديدن جزئيات بيشتر 
-مي‌توان از d-  به همراه فرمان postmaster‌ استفاده 
-كرد. گزينه d- همچنين يك عدد مي‌گيرد كه نشان 
-دهنده سطح جزئياتي است كه در Log‌فايل نوشته 
-مي‌شود. با بالابردن اين عدد حجم اطلاعات 
-توليد شده در Logفايل نيز افزايش مي‌يابد.
-اگر postmaster در حال اجرا نباشد، مي‌توانيم postgres 
-را به طور مستقيم از خط فرمان اجرا كرده و  
-دستورات SQL را به آن بدهيم. اين كار فقط براي 
-اشكال‌يابي توصيه مي‌شود. توجه كنيد كه در 
-اين حالت يك دستور با كاراكتر newline خاتمه پيدا 
-مي‌كند و نه با ;. اگر postmaster را با امكانات 
-اشكال‌يابي كامپيل كرده باشيد مي‌توانيد با 
-استفاده از يك برنامه اشكال‌ياب اجراي 
-برنامه را مونيتور كنيد. 
-اگر postmaster در حال اجرا باشد با دستور psql 
-مي‌توان به postgres متصل شد. با پيدا كردن PID 
-فرايند postgres كه psql به آن متصل شده است مي‌توان 
-آن را مونيتور كرد. براي اينكار بايد يك 
-برنامه اشكال‌ياب را به آن pid متصل كرد. اگر 
-بخواهيم بالا آمدن postgres را مونيتور كنيم كافي 
-است "PGOPTIONS="-W n و psql را اجرا كنيم. اين كار باعث 
-مي‌شود كه postgres با n ثانيه تاخير اجرا شود و در 
-اين فاصله شما مي‌توانيد برنامه اشكال‌ياب 
-را به آن متصل كرده و با قرار دادن يك نقطه 
-توقف  روند اجراي آن را مونيتور كنيد.
-postgres گزينه‌هاي s-‌ و A- و t-‌ دارد كه براي 
-پيدا كردن اشكالات بسيار مناسب هستند.
-شما مي‌توانيد postgreSQL را با امكانات profiling 
-كامپيل كنيد. اين كار باعث مي‌شود كه زمان 
-اجراي دقيق هر تابع در برنامه مشخص شود. 
-خروجي‌هاي توليد شده در اين حالت در فايل 
-DLINUX_PROFILE. ريخته مي‌شود.
-3.8) چرا موقعي كه من مي‌خواهم به پايگاه داده 
-وصل شوم پيام "Sorry, too many clients" ‌مي‌گيرم؟
-شما بايد حداكثر تعداد فرايندهاي همزمان 
-postmaster را افزايش دهيد. مقدار پيش فرض 32 است. 
-براي افزايش آن مي‌توان از گزينه N- استفاده 
-كرد و يا فايل postgresql.conf را اصلاح نمود
-توجه كنيد كه اگر N- مقداري بيشتر از 32 داشته 
-باشد بايد مقدار B- را نيز افزايش دهيم. اين 
-مقدار بايد حداقل دو برابر مقدار N-‌ باشد. 
-براي اعداد خيلي بالا بايد بعضي از 
-پارامترهاي كرنل را نيز اصلاح كرد. 
-پارامترهايي نظير حداكثر اندازه حافظه 
-اشتراكي SHMMAX ، حداكثر تعداد سمافورها SEMMNI‌ و 
-SEMMNS ، حداكثر تعداد فرايندها NPROC، حداكثر 
-فرايندهاي يك كاربر MAXUPRC و حداكثر فايلهاي باز 
-NFILE و NINODE. يكي از دلايلي كه تعداد اتصالات 
-همزمان postgreSQL محدود است آن است كه نيازهاي 
-PostgreSQL بيش از منابع موجود سيستم نباشد.
-3.9) در شاخه  pgsql_tmp  چه چيزي قرار دارد؟
-دراين شاخه فايلهاي موقتي قرار دارد كه با 
-اجراي درخواستها به وجود آمده است. به عنوان 
-مثال اگر براي اجراي دستور order by نياز به انجام 
-مرتب سازي باشد و در صورتي كه حافظه مشخص شده 
-با گزينه S- براي اينكار كافي نباشد سيستم يك 
-فايل موقت در اين شاخه ايجاد مي‌كند تا عمل 
-مرتب سازي را انجام دهد.
-فايلهاي موقت معمولاً به صورت اتوماتيك پاك 
-مي‌شود اما اگر postgreSQL در حين مرتب سازي crash‌ 
-كند آن فايلها باقي مي‌مانند. با stop و start كردن 
-برنامه postmaster اين فايلها پاك مي‌شوند.
-3.10) چرا براي به روز كردن نسخه پايگاه داده من 
-بايد كل داده ها را dump‌ و مجدداً restore كنم؟
-تيم برنامه نويس postgreSQL در نسخه‌هاي ارائه شده 
-كه فقط minor آنها متفاوت است فقط تغييرات كوچكي 
-اعمال مي‌كنند؛ بنابراين براي به روز كردن از 
-نسخه 7.2‌به 7.2.1 نيازي به dump و restore نيست. اما در 
-نسخه‌هايي كه major آنها تغيير مي‌كند غالباً 
-ساختار داخلي جداول و فايلهاي داده تغيير 
-مي‌كند. اين تغييرات معمولاً‌ پيچيده هستند. 
-براي انتقال داده‌هاي موجود در پايگاه داده 
-در اين حالت بايد ‌از dump و restore استفاده كرد.
-در نسخه‌هايي كه ساختار روي ديسك تغييري 
-نمي‌كند مي توان از برنامه pg_upgrade براي به روز 
-كردن پايگاه داده استفاده كرد بدون اينكه 
-نيازي به استفاده از dump و restore  باشد. در 
-يادداشتي كه به همراه هر توزيع مي‌آيد ذكر 
-شده است كه آيا برنامه pg_upgrade براي اين توزيع 
-وجود دارد يا خير.
-3.11) از چه سخت افزاري بايد استفاده كنم؟
-
-چون اكثر سخت‌افزارهاي PC  سازگار هستند مردم 
-فكر مي‌كنند كه كيفيت آنها نيز يكسان است. در 
-حاليكه اينطور نيست. استفاده از هاردهاي SCSI و 
-حافظه‌هاي ECC و مادربردهاي با كيفيت بالا 
-نسبت به سخت افزارهاي ارزانتر نتايج بهتري از 
-نظر كارايي و پايداري سيستم بهمراه خواهد 
-داشت. PostgreSQL روي بيشتر سخت افزارها اجرا 
-مي‌شود اما اگر كارايي و اطمينان فاكتورهاي 
-مهمي هستند بايد سخت افزار مناسب استفاده شود. 
-در گروههاي پستي در مورد سخت افزار مناسب  و 
-انتخاب آن بحث شده است. 
-
-
-
-سوالات عملياتي
-4.1) تفاوت بين binary cursors و Normal cursors چيست؟
-راهنماي دستور DECLARE‌ را مطالعه كنيد.
-4.2) من چگونه مي‌توانم فقط روي چند رديف اول يا 
-يك رديف تصادفي درخواست SELECT‌ بزنم؟
-راهنماي دستور FETCH  يا SELECT...LIMIT را ببينيد.
-در واقع كل درخواست بايد بررسي و ارزيابي شود 
-حتي اگر شما فقط چند رديف اول را بخواهيد. براي 
-مثال درخواست ORDER BY را در نظر بگيريد. اگر 
-انديس يا نمايه‌اي براي ORDER BY وجود داشته 
-باشد،‌postgreSQL‌ ممكن است بتواند فقط چند سطر 
-اول درخواستي را ارزيابي كند و يا اينكه كل 
-درخواست پردازش شود تا تعداد رديف‌هاي 
-درخواستي توليد شود.
-براي انتخاب يك سطر تصادفي به روش زير عمل 
-مي‌كنيم:
-    SELECT col
-    FROM tab
-    ORDER BY random()
-    LIMIT 1;
-4.3) من چگونه مي‌توانم ليستي از جداول يا ساير 
-چيزهايي كه در psql‌ وجود دارد را ببينم؟
-براي ديدن ليست جداول دستور  dt\ را در برنامه 
-psql‌ استفاده كنيد. براي ديدن ليست كامل 
-فرمانها ?\ را اجرا كنيد. راه ديگر خواندن متن 
-برنامه psql‌ است كه در شاخه pgsql/src/bin/psql/describe.c 
-‌قرار دارد. اين فايل حاوي فرامين SQLيي است كه 
-خروجي را براي  دستوراتي كه با \‌در psql شروع 
-مي‌شوند توليد مي‌كنند. راه ديگر اجراي psql با 
-گزينه E-‌است. اينكار باعث مي‌شود كه psql قبل 
-از اجرا هر دستور SQL‌متناظر آن را نشان دهد. 
-PostgreSQL‌همچنين يك برنامه SQLi دارد كه مي‌توان 
-با استفاده از آن  اطلاعات داخلي پايگاه داده 
-را استخراج كرد.
-4.4) چگونه يك ستون جدول را حذف مي‌كنيد؟ چگونه 
-نوع داده آن را عوض كنيم؟
-حذف يك ستون در توزيع 7.3 با استفاده از دستور 
-ALTER TABLE DROP COLUMN اضافه شده است. در نسخه‌هاي 
-قبلي به روش زير عمل كنيد:
-    BEGIN;
-    LOCK TABLE old_table;
-    SELECT ...  -- تمام ستونها غير از ستوني كه مي‌خواهيد آن را حذف كنيد را در اينجا بياوريد
-    INTO TABLE new_table
-    FROM old_table;
-    DROP TABLE old_table;
-    ALTER TABLE new_table RENAME TO old_table;
-    COMMIT;
-براي عوض كردن نوع داده يك ستون به روش زير عمل 
-كنيد:
-    BEGIN;
-    ALTER TABLE tab ADD COLUMN new_col new_data_type;
-    UPDATE tab SET new_col = CAST(old_col AS new_data_type);
-    ALTER TABLE tab DROP COLUMN old_col;
-    COMMIT;
-4.5) حداكثر اندازه يك رديف،‌ جدول و خود 
-پايگاه داده چقدر است؟
-محدوديتها عبارتند از:
-    حداكثر اندازه پايگاه داده             نامحدود (تا 32 ترابايت وجود دارد)
-    حداكثر اندازه يك جدول               32 ترابايت
-    حداكثر ا ندازه يك رديف              1.6 ترابايت
-    حداكثر اندازه يك فيلد                1 گيگا بايت
-    حداكثر اندازه رديفهاي يك جدول  نا محدود
-    حداكثر ستونهاي يك جدول 	بسته به نوع جدول بين 250 تا 6000 
-    حداكثر انديسهاي يك جدول	نا محدود
-البته در حالت نامحدود نيز ما محدود به حجم 
-هاردديسك و فضاي حافظه خواهيم بود. در صورتي 
-که مقادير مشخص شده به عنوان نامحدود به صورت 
-غير معمولي بزرك شوند كارايي سيستم كاهش 
-خواهد يافت.
-براي ذخيره كردن جداول با اندازه خيلي بزرگ 
-نيازي نيست كه سيستم عامل امكان ايجاد 
-فايلهاي بزرگ را داشته باشد. بلكه جداول خيلي 
-بزرگ به صورت فايلهايي به حجم يك گيگا بايت 
-نگاهداري مي‌شوند.
-اگر اندازه بلوكهاي داده را برابر 32 كيلو بايت 
-قرار دهيم حداكثر اندازه جدول و حداكثر تعداد 
-ستونها 4 برابر خواهد شد.
-4.6) چقدر فضاي ديسك سخت براي ذخيره كردن 
-داده‌‌هاي يك فايل متني مورد نياز است؟
-يك پايگاه داده PostgreSQL‌ تا 5 برابر فضايي روي 
-هاردديسك براي نگاهداري يك فايل متني نياز 
-دارد.
-به عنوان مثال يك فايل با 100000 خط را در نظر 
-بگيريد كه در هر خط يك عدد صحيح و يك توضيح 
-متني آمده است. فرض كنيد كه رشته متني به طور 
-متوسط 20 بايت باشد. اندازه فايل برابر 2.8 مگا 
-بايت خواهد بود ولي PostgreSQL براي نگاهداري اين 
-فايل به 6.4 مگا بايت اطلاعات نياز خواهد داشت.
-    32 bytes: اندازه سرايند هر خط به طور تقريبي
-    24 bytes: يك عدد صحيح و يك رشته 24 بايتي
-   + 4 bytes: اشاره گر روي صفحه به يك چندتايي
-   ----------------------------------------
-    60 bytes در هر رديف
-
-اندازه صفحات داده در PostgreSQL برابر با 8 كيلو بايت است
-   8192 تعداد بايت‌ها در هر صفحه
-   -------------------   =  136 تعداد رديف‌ها در يك صفحه پايگاه داده
-     60  تعداد بايت‌هاي هر رديف
-
-   100000  تعداد رديفها
-   --------------------  = تعدادصفحات پايگاه داده
-      128 تعداد رديفها در هر صفحه
-
-735 تعداد صفحات * 8192 تعداد بايت‌هاي هر صفحه  =  6,021,120 مگا بايت
-سربار انديسها يا نمايه‌ها از اين مقدار كمتر 
-است ولي چون شامل خود داده‌ها هم هست ممکن است 
-اندازه آنها هم بزرگ شود.
-NULLها به صورت bitmap ذخيره مي‌شوند و از اينرو 
-فضاي بسيار كمي را اشغال مي‌كنند.
-4.7) چگونه مي‌توانم بفهمم كه چه كاربران،‌ 
-پايگاه داده،‌ نمايه و جداولي در سيستم تعريف 
-شده است؟
-psql تعداد زيادي دستور دارد كه با \ شروع 
-مي‌شوند و اين اطلاعات را در اختيار ما قرار 
-مي‌دهند. براي ديدن آنها دستور ?\  را اجرا 
-كنيد.  همچنين جداول سيستمي كه با نام آنها pg_ 
-‌شروع مي‌شود نيز اين اطلاعات را در خود 
-دارند. اجراي برنامه psql با گزينه l-  نيز باعث 
-نشان دادن ليست تمام پايگاههاي داده مي‌شود.
-همچنين فايل pgsql/src/tutorial/syscat.source نيز فرمانهاي 
-SELECT كه با استفاده از آن مي‌توان اطلاعات 
-پايگاه داده را استخراج كرد شرح داده است.
-4.8) چرا درخواستهاي من كند اجرا مي‌شوند يا 
-چرا از نمايه ها استفاده نمي‌كنند؟
-به طور معمول براي درخواستها از نمايه‌ها 
-استفاده نمي‌شود. تنها در صورتي از نمايه‌ها 
-استفاده مي‌شود كه اندازه جدول از يك اندازه 
-حداقل بزرگتر باشد و درخواست هم فقط قسمتي از 
-رديف‌هاي جدول را انتخاب كرده باشد. دليل اين 
-كار آن است كه دسترسي‌هاي تصادفي به هاردديسك 
-كه به خاطر نمايه‌ها ايجاد مي‌شود ممكن است 
-از خواندن مستقيم جدول يا خواندن ترتيبي 
-ركوردها كندتر باشد.
-براي تعيين اينكه از نمايه استفاده شود يا 
-خير، PostgreSQL بايد اطلاعات آماري را در مورد يك 
-جدول بداند. اين اطلاعات توسط دستور ANALYZE و VACUUM 
-ANALYZE به دست مي‌آيد. با استفاده از اين 
-اطلاعات،‌ بهينه ساز از تعداد رديف‌هاي يك 
-جدول اطلاع پيدا مي‌كند و بهتر مي‌تواند 
-تعيين كند كه آيا از نمايه استفاده شود يا خير. 
-اطلاعات آماري همچنين براي تعيين ترتيب الحاق 
-و روشهاي الحاق به صورت بهينه نيز كاربر دارد. 
-جمع آوري اطلاعات آماري بايد به صورت دوره‌اي 
-همزمان با تغيير داده‌هاي جدول انجام شود.
-نمايه‌ها به طور معمول همراه با دستور ORDER BY 
-به كار برده نمي‌شوند. براي يك جدول بزرگ يك 
-پيمايش ترتيبي همراه با دستور مرتب سازي از به 
-كار بردن نمايه‌ها سريعتر خواهد بود.
-اما اگر همراه با ORDER BY‌ از LIMIT استفاده شود 
-اغلب از نمايه‌ها استفاده مي‌شود چون فقط 
-قسمتي از جدول استفاده مي‌شود. در حقيقت هر 
-چند توابع ()MIN‌ و ()MAX از نمايه‌ها استفاده 
-نمي‌كنند ولي مي‌توانيم با استفاده از دستور 
-زير با استفاده از نمايه‌ها و دستور ORDER BY و 
-LIMIT‌ آنها را به دست آوريم.
-    SELECT col
-    FROM tab
-    ORDER BY col [ DESC ]
-    LIMIT 1;
-اگر شما فكر مي‌كنيد كه بهينه ساز سيستم در 
-انتخاب پيمايش ترتيبي اشتباه كرده است با 
-دستور 'SET enable_seqscan TO 'off'  مي‌توانيد ببينيد آيا 
-استفاده از نمايه‌ها باعث افزايش سرعت 
-درخواست‌ها خواهد شد.
-استفاده از نمايه‌ها هنگامي كه از علائم ويژه 
-نظير LIKE و ~ استفاده مي‌كنيد فقط در بعضي 
-شرايط خاصي كه در اينجا ذكر شده است ممكن است:
-  ابتداي رشته جستجو بايد به طور صريح مشخص 
-  باشد براي مثال: 
-  دستورات LIKE نبايد با علامت % شروع شوند 
-  الگوهاي منظمي كه با ~ مي‌ايد حتماً بايد با 
-  علامت ^ شروع شود 
-  رشته جستجو نبايد با يك مجموعه از 
-  كاراكتر‌ها  مثل [a-e] شروع شود 
-  جستجوهاي غيرحساس به متن مثل  ILIKE‌ و *~ از 
-  نمايه‌ها استفاده نمي‌كنند. در عوض از 
-  توابع نمايه‌اي كه در قسمت 4.12 توضيح داده شد 
-  استفاده مي‌كنند. 
-  مقدار پيش فرض locale‌ بايد در initdb استفاده شود. 
-
-4.9) چگونه مي‌توانم نحوه بررسي درخواست را 
-توسط بهينه‌ساز درخواستها مشاهده كنم؟
-راهنماي دستور EXPLAIN را نگاه كنيد.
-4.10) نمايه R-tree‌ چيست؟
-از نمايه R-Tree  براي انديس كردن داده‌هاي 
-فاصله‌اي استفاده مي‌شود. يك نمايه hash 
-نمي‌توانند جستجوهاي محدوده‌اي را انجام 
-دهد. نمايه "B-tree" نيز براي انجام جستجوي 
-محدوده‌اي در يك جهت قابل استفاده است. اما 
-R-Tree مي‌تواند داده‌هاي چند بعدي را نيز 
-پشتيباني كند. براي مثال استفاده اگر از نمايه 
-R-tree‌ براي گونه Point استفاده شود سرعت 
-درخواست‌هايي نظير "select all points within a bounding 
-rectangle" به مراتب افزايش مي‌يابد.
-مقاله‌اي كه طراحي R-tree را توضيح داده است 
-Guttman, A. "R-trees: A Dynamic Index Structure for Spatial Searching." 
-Proceedings of the 1984 ACM SIGMOD Int'l Conf on Mgmt of Data, 45-57.
-R-tree‌ مي‌تواند چندضلعيها و چند وجهي را 
-پشتيباني كند. در تئوري R-tree مي‌تواند تعداد 
-بعدهاي بالاتر ري نيز پشتيباني كند. در عمل 
-توسعه R-tree‌ نياز به كار بيشتري دارد.
-4.11) بهينه ساز تكويني درخواست چيست؟ (Genetic Query 
-Optimizer)
-استفاده از GEQO سرعت بهينه سازي درخواست را 
-هنگاميكه تعداد زيادي جدول را با استفاده از 
-الگوريتم ژنتيك الحاق مي‌كنيم افزايش 
-مي‌دهد.
-4.12) چگونه از عبارات منظم براي جستجو استفاده 
-كنم؟ چگونه جستجويي انجام دهم كه حساس به متن 
-نباشد؟ چگونه براي يك جستجوي غير حساس به متن 
-از نمايه استفاده كنم؟
-براي جستجوي عبارت منظم از عملگر ~‌ استفاده 
-مي‌كنيم. براي جستجوي غير حساس به متن از 
-عملگر *~ و يا ILIKE‌ استفاده مي‌كنيم.
-روش ديگر انجام جستجوي غير حساس به متن در زير 
-نشان داده شده است.
-    SELECT *
-    FROM tab
-    WHERE lower(col) = 'abc';
-اين از نمايه‌هاي استاندارد استفاده 
-نمي‌كند. ولي شما مي توانيد با دستور زير يك 
-نمايه ايجاد كنيد و از آن استفاده كنيد.
-    CREATE INDEX tabindex ON tab (lower(col));
-4.13) Iچگونه مي‌توانم در يك درخواست تشخيص دهم 
-كه يك فيلد NULL‌ است؟
-با استفاده از توابع IS NULL و IS NOT NULL مي‌توانيم 
-NULL بودن يك فيلد را تست كنيم.
-4.14) تفاوت بين گونه‌هاي مختلف character چيست؟
-Type            Internal Name   Notes
---------------------------------------------------
-VARCHAR(n)      varchar      اندازه، حداكثر طول را نشان مي دهد بدون اضافه شدن كاراكتر اضافه
-CHAR(n)            bpchar       كاراكترهاي بلانك براي پر شدن طول مشخص شده استفاده مي‌شود
-TEXT                text            حداكثر طول را مشخص نمي‌كند
-BYTEA               bytea         آرايه‌اي از بايت با طول متغير
-"char"               char           يك كاراكتر
-نام داخلي گونه‌ها را در system catalogue ‌و بعضي از 
-پيغامهاي خطا مي‌توان ديد.
-چهار گونه اول همگي از نوع varlena هستند (4 بايت 
-اول روي ديسك طول را مشخص مي‌كند كه به دنبال 
-آن داده‌ها قرار دارند.)‌بنابراين فضاي 
-واقعي استفاده شده روي ديسك از اندازه تعريف 
-شده بيشتر است. اما اين گونه‌ها را مي‌توان 
-فشرده كرد كه اينكار باعث مي‌شود فضاي كمتري 
-روي ديسك اشغال كنند.
-براي ذخيره رشته‌هاي با طول متغير(VARCHAR(n‌ 
-بهترين انتخاب است. در اين گونه حداكثر طول 
-رشته محدود است بر خلاف text كه هيچ محدوديتي 
-روي حداكثر اندازه رشته نمي‌گذارد.(در اين 
-گونه حداكثر طول يك رشته يك گيگا بايت خواهد 
-بود)
-گونه (CHAR(n  براي ذخيره داده‌هاي با طول يكسان 
-است.يك گونه‌ي (CHAR(n با كاراكترهاي بلانك 
-(خالي) پر مي‌شود تا به طول مشخص شده برسد در 
-حاليكه گونه VARCHAR كاراكترها را به همان صورت 
-كه هستند ذخيره مي‌كند. گونه BYTEA براي ذخيره 
-داده‌هاي باينري است به خصوص داده‌هاي 
-باينتري كه شامل بايت‌هاي NULL هستند. از نظر 
-كارايي تمام اين گونه‌ها يكسان هستند.
-4.15.1) چگونه مي‌توانم يك فيلد سريال يا 
-افزايشي ايجاد كنم؟
-PostgreSQL از داده‌هاي سريال پشتيباني مي‌كند. 
-براي ايجاد يك فيلد سريال (براي داشتن يك فيلد 
-منحصر به فرد براي هر رديف )به روش زير عمل 
-كنيد:
-    CREATE TABLE person ( 
-        id   SERIAL, 
-        name TEXT 
-    );
-دستور بالا به طور اتوماتيک به دستور زير 
-تبديل مي‌شود:
-    CREATE SEQUENCE person_id_seq;
-    CREATE TABLE person ( 
-        id   INT4 NOT NULL DEFAULT nextval('person_id_seq'),
-        name TEXT 
-    );
-براي ديدن اطلاعات بيشتر به راهنماي دستور 
-create_sequence  مراجعه كنيد. همچنين مي‌توان از 
-OID‌هر رديف به عنوان يك مقدار منحصر به فرد 
-استفاده كرد. اما در اين حالت براي dump كردن و 
-reload‌كردن پايگاه داده بايد دستور pg_dumps‌ را 
-با گزينه o-‌ اجرا كنيد.
-4.15.2) چگونه مي‌توانم مقدار يك درج سريالي را 
-بدانم؟
-يك روش براي گرفتن مقدار بعدي يك فيلد سريال 
-استفاده از تابع ()nextval است. در شبه كُدي كه در 
-ادامه آمده است روش انجام اين كار نشان داده 
-شده است:
-    new_id = execute("SELECT nextval('person_id_seq')");
-    execute("INSERT INTO person (id, name) VALUES (new_id, 'Blaise Pascal')");
-با اجرا دستور فوق مقدار جديد را در متغير new_id 
-نيز خواهيدداشت كه مي‌توانيد آن را در بقيه 
-درخواست‌هاي نيز استفاده كنيد. توجه داشته 
-باشيد كه نام SEQUENCEيي كه به طور اتوماتيك ايجاد 
-شده است به صورت table_serialcolumn_seq‌ خواهد بود. كه 
-در آن table‌ نام جدول و serialcolumn نام فيلد سريال 
-جدول مي‌باشد.
-براي ديدن مقدار نسبت داده شده به فيلد سريال 
-نيز مي‌توان از تابع () currval به صورت زير 
-استفاده كرد. 
-    execute("INSERT INTO person (name) VALUES ('Blaise Pascal')");
-    new_id = execute("SELECT currval('person_id_seq')");
-و سرانجام شما مي‌توانيد از مقدار OID كه خروجي 
-دستور INSERT  است براي ديدن مقدار پيش فرض 
-استفاده كنيد. هر چند اين روش در همه پلتفرمها 
-قابل استفاده نيست و ضمن اينكه فيلد oid‌ بعد 
-از عدد 4 ميليارد دوباره صفر مي‌شود. در زبان 
-perl با استفاده از DBI و DBD::Pg مقدار oid‌را 
-مي‌توانيد به شكل زير استخراج كنيد: بعد از 
-اجراي ()st->execute$ مقدار oid‌ در متغير  sth->pg_oid_status$ 
-ذخيره خواهد شد.
-4.15.3) آیا توابع ()nextval و ()currval منجر به ایجاد 
-شرایط race برای سایر کاربران می شوند؟
-خیر، استفاده از این توابع شرایط race را به 
-وجود نمی آورد.
-4.15.4) چرا اعداد سریالی مربوط به تراکنشهای abort 
-شده مجدداً استفاده نمی شود؟ چرا بین اعداد 
-سریالی یک فاصله خالی ایجاد می شود؟
-برای بالا بردن امکان اجرای همزمان تراکنشها، 
-اعداد سریالی به محض اجرای تراکنش به آنها 
-تخصیص می یابد در این حالت اگر بعضی از 
-تراکنشها abort شوند بین اعداد سریالی استفاده 
-شده یک فاصله خالی به وجود می آید.
-4.16) OID و TID چه هستند؟
-OID راه حل PostgreSQL برای داشتن یک شناسه منحصر به 
-فرد برای هر ردیف است. هر ردیف جدیدی که ایجاد 
-می شود یک OID منحصر به فرد به آن اختصاص می 
-یابد. تمام OIDهایی که در حین initdb ایجاد می شوند 
-از 16384 کمتر هستند و OIDهایی بعداً تولید می شود 
-از این عدد بزرگتر خواهد بود. نکته مهم آن است 
-که OIDها نه تنها در یک جدول شبیه نیستند بلکه 
-در کل پایگاه داده هیچ دو ردیفی دارای OID یکسان 
-نخواهد بود.
-PostgreSQL از OID در سیستم داخلی خود برای ایجاد 
-ارتباط بین ردیفهای جداول مختلف استفاده می 
-کند. توصیه می شود که یک ستون از نوع OID برای 
-ذخیره این فیلد در جدول ایجاد کنید. ساختن یک 
-نمایه برای این فیلد باعث دسترسی سریعتر به آن 
-خواهد شد.
-تمام پایگاههای داده در PostgreSQL برای گرفتن OID 
-جدید از یک ناحیه مرکزی استفاده می کند. ولی 
-اگر بخواهیم OID را به روش دیگری بگیریم و یا 
-اینکه در حین کپی کردن یک جدول بخواهیم OIDهای 
-اصلی آن تغییر نکند به روش زیر می توانیم عمل 
-کنیم:
-
-        CREATE TABLE new_table(mycol int);
-        SELECT oid AS old_oid, mycol INTO tmp_table FROM old_table;
-        COPY tmp_table TO '/tmp/pgtable';
-        COPY new_table WITH OIDS FROM '/tmp/pgtable';
-        DROP TABLE tmp_table;
-OID یک عدد صحیح 4 بایتی است و بنابراین حداکثر 
-مقدار آن 4 میلیارد خواهد بود و بعد از آن 
-مقدار آن سرریز خواهد شد.  البته تا کنون برای  
-کسی  این اتفاق نیفتاده است و تصمیم گرداندگان 
-PostgreSQL آن است که قبل از آنکه این اتفاق رخ دهد 
-این مشکل را برطرف کنند.
-TIDها برای شناسایی محل فیزیکی یک ردیف بر اساس 
-بلوک و آفست می باشد. TIDها بعد از تغییر پیدا 
-کردن یک ردیف و یا بازخوانی آن عوض می شوند. 
-TIDها توسط نمایه ها استفاده می شوند.
-4.17) معني بعضي از ترمها و كلماتي كه در PostgreSQL‌ 
-استفاده مي‌شود چيست؟
-لیست برخی از ترمها و کلماتی که استفاده می 
-شوند:
-  table, relation, class :کلاس، رابطه، جدول
-  row, record, tuple چندتایی، رکورد، ردیف
-  column, field, attribute صفت، فیلد، ستون
-  retrieve, select انتخاب، خواندن
-  replace, updateبه روز کردن، جایگزینی 
-  append, insert درج، اضافه کردن
-  OID, serial value مقدار سریال
-  portal, cursor 
-  range variable, table name, table alias 
-یک لیست عمومی از ترمهای مورد استفاده در 
-پایگاه داده در آدرس  
-http://hea-www.harvard.edu/MST/simul/software/docs/pkgs/pgsql/glossary/glossary.htm 
-وجود دارد.
-4.18) چرا من خطاي "ERROR: Memory exhausted in AllocSetAlloc" 
-مي‌گيرم؟
-این خطا احتمالاً یا به خاطر تمام شدن حافظه 
-مجازی سیستم شماست و یا اینکه کرنل برای 
-برنامه ها در مورد میزان استفاده از حافظه 
-مجازی محدودیت اعمال کرده است. قبل از اجرای 
-برنامه اصلی یکی از دستورات زیر را اجرا کنید.
-    ulimit -d 262144
-    limit datasize 256m
-بسته به نوع شل یکی از این دستورات ممکن است با 
-موفقیت اجرا شود. با اجرای آن دستور محدودیت 
-حافظه مجازی برای برنامه ها برداشته شده و با 
-این کار احتمالاً درخواستی که قبلاً خطا می 
-داده است اجرا خواهد شد.
-4.19) از كجا تشخيص دهم كه ويرايش يا نسخه 
-PostgreSQLيي كه من استفاده مي‌كنم چيست؟
-با اجرای دستور ()SELECT version
-4.20) چرا در حین اجرای عملیات روی large-objectها 
-خطای "invalid large obj descriptor"به وجود می آید؟
-شما باید قبل از شروع دستوراتی که با large-objectها 
-کار می کنند از BEGIN  و بعد از آنها هم یک END 
-بگذارید. در حال حاضر PostgreSQL هندل large-objectها را 
-در زمان نهایی شدن تراکنش (commitشدن) می بندد. به 
-همین دلیل اولین تلاش برای انجام هر کاری با 
-هندل منجر به خطای invalid large obj descriptor خواهد شد. 
-برای جلوگیری از این خطا حتماً باید از یک 
-تراکنش استفاده کنید. این کار همانطور که 
-قبلاً گفته شد با استفاده از قرار دادن BEGIN و END 
-در ابتدا و انتهای دستورات انجام می شود.
-اگر این خطا را در حین استفاده از یک درایور ODBC 
-دریافت کردید احتمالاً باید این دستور را 
-اجرا کنید: set auto-commit off
-4.21) چگونه يك ستون ايجاد كنم كه مقدار زمان 
-جاري را به عنوان مقدار پيش‌فرض داشته باشد؟
-از CURRENT_TIMESTAMP  استفاده کنید در مثال زیر نحوه 
-انجام این کار نشان داده شده است:
-CREATE TABLE test (x int, modtime timestamp DEFAULT CURRENT_TIMESTAMP );
-
-4.22) چرا "زير درخواستهايي" كه از IN استفاده 
-مي‌كنند كند هستند؟
-در نسخه های قبل از 7.4 عمل الحاق زیر درخواست و 
-درخواست اصلی به این صورت انجام می شود که 
-نتایج به دست آمده از زیر درخواست به صورت 
-ترتیبی برای هر ردیف اعمال می شود. اگر 
-زیردرخواست ردیف های کمی را به عنوان خروجی 
-برگرداند و درخواست بیرونی ردیف های زیادی را 
-شامل شود استفاده از IN بهترین روش است در غیر 
-اینصورت بهتر است از EXISTS استفاده شود
-    SELECT *
-    FROM tab
-    WHERE col IN (SELECT subcol FROM subtab);
-به:
-    SELECT *
-    FROM tab
-    WHERE EXISTS (SELECT subcol FROM subtab WHERE subcol = col);
-برای اجرای سریع این درخواست باید برای ستون 
-subcol نمایه ایجاد شده باشد.
-در نسخه های بعد از 7.4 IN برای الحاق از همان 
-تکنیک پیچیده مورد استفاده در دستورات معمولی 
-استفاده می کند و بنابراین استفاده از آن نسبت 
-به EXISTS ارجحیت دارد.
-4.23) چگونه مي‌توانم يك الحاق خارجي (outer join) 
-انجام دهم؟
-برای انجام الحاق خارجی به روش زیر عمل کنید:
-    SELECT *
-    FROM t1 LEFT OUTER JOIN t2 ON (t1.col = t2.col);
-یا
-    SELECT *
-    FROM t1 LEFT OUTER JOIN t2 USING (col);
-درخواستهای بالا t1.col , t2.col را به هم الحاق می 
-کند و همچنین ردیفهای t1 که نظیر آنها در t2 
-نبوده است را نیز برمی گرداند. اگر از RIGHT 
-استفاده شود نتیجه بر عکس است. یعنی ردیفهای t2 
-که نظیر آنها در t1 نباشد را نشان می دهد و اگر 
-از FULL استفاده شود نتیجه هم شامل ردیفهای t1 
-است  و هم شامل ردیفهای t2. استفاده از کلمه OUTER 
-اختیاری است چرا که این کلمه به طور ضمنی 
-دستورهای LEFT, RIGHT, FULL وجود دارد.
-در نسخه های قبلی پایگاه داده می توانیم الحاق 
-خارجی را به کمک دستورهای UNION, NOT IN شبیه سازی 
-کنیم. این کار در مثال زیر نشان داده شده است:
-
-    SELECT tab1.col1, tab2.col2
-    FROM tab1, tab2
-    WHERE tab1.col1 = tab2.col1
-    UNION ALL
-    SELECT tab1.col1, NULL
-    FROM tab1
-    WHERE tab1.col1 NOT IN (SELECT tab2.col1 FROM tab2)
-    ORDER BY col1
-4.24) چگونه مي‌توان درخواستهايي از چند پايگاه 
-داده توليد كرد؟
-در حال حاضر این کار امکان پذیر نیست. PostgreSQL 
-فقط امکان درخواست از پایگاه داده ای را می 
-دهد که در حال حاضر به آن متصل باشید و نمی 
-توان به طور همزمان از دو پایگاه داده استفاده 
-کرد. البته یک برنامه کاربردی خود می تواند به 
-طور همزمان دو  پایگاه داده را مورد استفاده 
-قرار داده و نتایج را با هم ترکیب کند ولی نمی 
-تواند در یک درخواست به هر  دو پایگاه داده 
-رجوع کند.
-4.25) چگونه خروجي يك تابع مي‌تواند  چند رديف 
-يا ستون باشد؟
-در نسخه 7.3 خروجی یک تابع می تواند چند ردیف یا 
-چند ستون باشد. برای دیدن  اطلاعات بیشتر به 
-سایت زیر مراجعه 
-کنید:http://techdocs.postgresql.org/guides/SetReturningFunctions  
-4.26) در توابع PL/PgSQL چرا نمي‌توان با اطمينان 
-جداول موقت را ايجاد يا حذف كرد؟
-PL/PgSQL محتوای توابع را ذخیره (cache) می کند. یک 
-اثر بد جانبی این کار آن است که اگر در تابع از 
-یک جدول موقت استفاده شود و بعداً آن جدول حذف 
-و یک جدول جدید به جای آن ایجاد شود، در 
-فراخوانی مجدد  آن تابع، محتوای ذخیره شده 
-تابع  هنوز به جدول قدیمی اشاره می کند و 
-بنابراین اجرای تابع با اشکال مواجه می شود. 
-راه حل این مشکل آن است که برای جداول موقت از 
-دستور EXECUTE استفاده شود که این کار سبب می شود 
-که درخواست برای هر بار اجرا مجدداً پیمایش و 
-تفسیر شود.
-4.27) چه گزينه‌هايي براي تكرار (replication) وجود 
-دارد؟ 
-There are several master/slave replication options available. These allow only 
-the master to make database changes and the slave can only do database reads. 
-The bottom of http://gborg.PostgreSQL.org/genpage?replication_research lists 
-them. A multi-master replication solution is being worked on at 
-http://gborg.PostgreSQL.org/project/pgreplication/projdisplay.php.
-4.28) چه گزينه‌هايي براي رمزنگاري وجود دارد؟ 
-  contrib/pgcrypto شامل توابع رمزنگاری زیادی است که 
-  می توان از آنها در دستورات SQL استفاده کرد.
-  برای رمز کردن ارتباط بین client و server ، پایگاه 
-  داده حتماً گزینه SSL را بر روی پایگاه داده 
-  فعال کنیم.
-  در نسخه 7.3 به بعد کلمات عبور کاربران به طور 
-  اتوماتیک به صورت رمز شده ذخیره می شود ولی 
-  در نسخه های قبلی باید گزینه PASSWORD_ENCRYPTION  در 
-  فایلpostgresql.conf فعال کنیم. 
-  می توان پایگاههای داده را روی یک فایل سیستم 
-  رمزشده نگاهداری کرد
-
-
-
-Extending PostgreSQL
-5.1) من يك تابع نوشته‌ام. چگونه آن را در psql 
-اجرا كنم؟ چرا با اجراي آن core dump مي‌گيرم؟
-دلایل مختلفی می تواند باعث بروز این مشکل 
-شود. اما قبل از همه تابع خود را به صورت جدا 
-تست کنید.
-5.2) چگونه مي‌توانم در توليد نوع‌ها و توابع 
-جديد و جالب براي PostgreSQL‌ همكاري و مشاركت 
-داشته باشم؟
-کد خود را به گروه پستی pgsql-hackers   ارسال کنید.
-5.3)  چگونه مي‌توانم يك تابع به زبان C بنويسم 
-كه خروجي آن يك ‌tuple  (چند تايي) باشد؟
-در نسخه های 7.3 به بعد یک تابع می تواند یک جدول 
-را به عنوان خروجی برگرداند. این ویژگی در 
-توابعی که به زبانهای C و PL/PgSQL نوشته می شوند 
-به طور کامل وجود دارد. راهنما برنامه نویسان 
-را مطالعه کنید. یک مثال از نحوه برگرداندن یک 
-جدول به عنوان خروجی در contrib/tablefunc آمده است.
-5.4) من يك فايل منبع را عوض كرده ام چرا در 
-عمليات كامپيل مجدد آن تغيير ديده نمي‌شود؟
-Makefile برای فایلهای include شده وابستگیها را به 
-درستی نشان نمی دهد. برای اطمینان از اینکه 
-فایلی که عوض کرده اید حتماً دوباره کامپیل می 
-شود دستور make clean را اجرا کنید. اگر از کامپیلر 
-gcc استفاده می کنید می توانید از گزینه 
-enable-depend-- در موقع اجرای برنامه configure استفاده 
-کنید این گزینه باعث می شود که وابستگیها به 
-طور اتوماتیک تولید شود.
\ No newline at end of file
diff --git a/doc/FAQ_french b/doc/FAQ_french
deleted file mode 100644
index 71f19f0095..0000000000
--- a/doc/FAQ_french
+++ /dev/null
@@ -1,1289 +0,0 @@
-
-                   Foire Aux Questions (FAQ) pour PostgreSQL
-                                       
-   Derni�re mise � jour : vendredi 14 novembre 2004 16:32:47
-   
-   Mainteneur actuel : Bruce Momjian ([email protected])
-   
-   La plus r�cente version de ce document est disponible sur
-   http://www.PostgreSQL.org/docs/faqs/FAQ.html.
-   
-   Les questions sp�cifiques � la plateforme sont r�pondues sur
-   http://www.PostgreSQL.org/docs/index.html.
-     _________________________________________________________________
-   
-                            Questions g�n�rales
-                                      
-   1.1) Qu'est ce que PostgreSQL ? Comment le prononcer ?
-   1.2) Quelle est la licence de PostgreSQL ?
-   1.3) Sous quels environnements Unix PostgreSQL tourne-t-il ?
-   1.4) Sous quels environnements non-Unix PostgreSQL tourne-t-il ?
-   1.5) O� puis-je me procurer PostgreSQL ?
-   1.6) O� puis-je obtenir du support ?
-   1.7) Quelle est la derni�re version ?
-   1.8) Quelle documentation est disponible ?
-   1.9) Comment savoir quels sont les bogues connus ou les
-   fonctionnalit�s manquantes ?
-   1.10) Comment puis-je apprendre le SQL ?
-   1.11) PostgreSQL est-il compatible an 2000 ?
-   1.12) Comment puis-je rejoindre l'�quipe de d�veloppement ?
-   1.13) Comment dois-je soumettre un rapport de bogue ?
-   1.14) Comment PostgreSQL se compare-t'il � d'autres SGBD ?
-   1.15) Comment puis-je aider financi�rement PostgreSQL ?
-   
-                    Questions sur le client utilisateur
-                                      
-   2.1) Y a-t-il des pilotes ODBC pour PostgreSQL ?
-   2.2) Quels outils sont disponibles pour utiliser PostgreSQL avec des
-   pages Web ?
-   2.3) PostgreSQL a-t-il une interface graphique ?
-   2.4) Quels langages sont disponibles pour communiquer avec
-   PostgreSQL ?
-   
-                         Questions administratives
-                                      
-   3.1) Comment installer PostgreSQL ailleurs que sous /usr/local/pgsql ?
-   3.2) Quand je lance postmaster, j'obtiens un Bad System Call ou un
-   message core dumped. Pourquoi ?
-   3.3) Quand je lance postmaster, j'obtiens des erreurs IpcMemoryCreate.
-   Pourquoi ?
-   3.4) Quand je lance postmaster, j'obtiens des erreurs
-   IpcSemaphoreCreate. Pourquoi ?
-   3.5) Comment contr�ler les connexions d'autres machines ?
-   3.6) Comment r�gler le moteur de la base de donn�es pour de meilleures
-   performances ?
-   3.7) Quelles fonctionalit�s de d�boguage sont disponibles ?
-   3.8) Pourquoi est-ce que j'obtiens des messages Sorry, too many
-   clients quand je me connecte ?
-   3.9) Que contient le r�pertoire pgsql_tmp ?
-   3.10) Pourquoi ai-je besoin de faire une sauvegarde des bases et de
-   restaurer pour mettre a jour les versions de PostgreSQL ?
-   3.11) Quels mat�riels dois-je utiliser ?
-   
-                          Questions fonctionnelles
-                                      
-   4.1) Quelle est la diff�rence entre curseur binaire et curseur
-   normal ?
-   4.2) Comment faire un SELECT seulement sur les premi�res lignes d'une
-   requ�te ? Sur une ligne al�atoire ?
-   4.3) Comment obtenir une liste des tables ou d'autres choses que je
-   vois dans psql ?
-   4.4) Comment supprime-t-on une colonne d'une table, ou comment
-   change-t-on son type de donn�es ?
-   4.5) Quelle est la taille maximale pour une ligne, une table et une
-   base de donn�es ?
-   4.6) Combien d'espace disque faut-il pour stocker les donn�es d'un
-   fichier texte typique ?
-   4.7) Comment puis-je savoir quels index, tables, bases de donn�es et
-   utilisateurs sont d�finis ?
-   4.8) Mes requ�tes sont lentes ou ne font pas usage des index.
-   Pourquoi ?
-   4.9) Comment puis-je savoir si l'optimiseur �value mes requ�tes ?
-   4.10) Qu'est-ce qu'un index R-tree ?
-   4.11) Qu'est-ce que l'optimiseur g�n�tique de requ�tes ?
-   4.12) Comment puis-je r�aliser des recherches par des expressions
-   rationnelles ainsi que des recherches non sensibles � la casse ?
-   Comment puis-je utiliser un index lors de recherches non sensibles �
-   la casse ?
-   4.13) Comment puis-je d�tecter si un champ est NULL dans une requ�te ?
-   4.14) Quelle sont les diff�rences entre les nombreux types de
-   caract�res ?
-   4.15.1) Comment puis-je cr�er un champ s�rie, c'est-�-dire
-   s'incr�mentant automatiquement ?
-   4.15.2) Comment puis-je obtenir la valeur d'un SERIAL suite � une
-   insertion ?
-   4.15.3) Est-ce que currval() et nextval() n'am�nent pas des probl�mes
-   lorsque plusieurs utilisateurs les lancent en m�me temps ?
-   4.15.4) Pourquoi mes num�ros de s�quences ne sont pas r�-utilis�s lors
-   d'une annulation de transaction ? Pourquoi existe-t'il des trous dans
-   la num�rotation de ma colonne s�quentielle (SERIAL) ?
-   4.16) Qu'est-ce qu'un OID? Qu'est-ce qu'un TID ?
-   4.17) A quoi correspond certains termes utilis�s avec PostgreSQL ?
-   4.18) Pourquoi ai-je l'erreur ERROR: Memory exhausted in
-   AllocSetAlloc() ?
-   4.19) Comment puis-je conna�tre la version de PostgreSQL que
-   j'utilise ?
-   4.20) Pourquoi ai-je invalid large obj descriptor lors d'op�rations
-   avec des gros objets ?
-   4.21) Comment puis-je cr�er une colonne qui aura par d�faut l'heure
-   actuelle comme valeur ?
-   4.22) Pourquoi mes sous-requ�tes utilisant IN sont-elles si lentes ?
-   4.23) Comment puis-je r�aliser une jointure externe ?
-   4.24) Comment puis-je lancer des requ�tes utilisant plusieurs bases de
-   donn�es ??
-   4.25) Comment puis-je renvoyer plusieurs lignes ou colonnes � partir
-   d'une fonction ?
-   4.26) Pourquoi ne puis-je pas cr�er/supprimer des tables temporaires
-   dans les fonctions PL/PgSQL de fa�on stable ?
-   4.27) Quelles options de cryptage sont disponibles ?
-   
-                             Etendre PostgreSQL
-                                      
-   5.1) J'ai �crit une fonction utilisateur. Lorsque je l'ex�cute avec
-   psql, pourquoi cela finit-il avec un "dump core" ?
-   5.2) Comment puis-je contribuer avec de nouveaux types et fonctions
-   pour PostgreSQL ?
-   5.3) Comment puis-je �crire une fonction C pour r�cup�rer une ligne ?
-   5.4) J'ai modifi� un fichier source. Pourquoi la modification
-   n'est-elle pas visible apr�s la recompilation ?
-     _________________________________________________________________
-   
-                            Questions g�n�rales
-                                      
-    1.1) Qu'est ce que PostgreSQL ? Comment le prononcer ?
-    
-   PostgreSQL se prononce Post-Gres-Q-L. Un fichier audio est disponible
-   sur http://www.postgresql.org/postgresql.mp3 pour ceux souhaitant
-   entendre la prononciation.
-   
-   PostgreSQL est une am�lioration du syst�me de gestion de bases de
-   donn�es POSTGRES (et est toujours quelque fois appel� "Postgres"), un
-   prototype de recherche de SGBD de prochaine g�n�ration. PostgreSQL
-   garde le puissant mod�le de donn�es et les types de donn�es riches de
-   POSTGRES, mais remplace le langage de requ�tes PostQuel par un
-   sous-ensemble �tendu de SQL. PostgreSQL est gratuit et les sources
-   complets sont disponibles.
-   
-   PostgreSQL est �crit par une �quipe de d�veloppeurs qui sont tous
-   inscrits � la liste de diffusion de d�veloppement de PostgreSQL. Le
-   coordinateur actuel est Marc G. Fournier ([email protected] et
-   voir la section 1.6 pour contacter les d�veloppeurs). Cette �quipe est
-   responsable de tout le d�veloppement de PostgreSQL. C'est un projet
-   soutenu par une communaut� sans �tre contr�l� par une soci�t�. Pour y
-   contribuer, voir la FAQ des d�veloppeurs sur
-   http://www.postgresql.org/docs/faqs/FAQ_DEV.html.
-   
-   Les auteurs de PostgreSQL 1.01 �taient Andrew Yu et Jolly Chen.
-   Beaucoup d'autres personnes ont contribu� au portage, aux tests, au
-   d�boguage et � l'am�lioration du code. Le code de Postgres original,
-   duquel PostgreSQL est d�riv�, �tait le fruit de l'effort de nombreux
-   �tudiants dipl�m�s et non dipl�m�s, et de programmeurs travaillant
-   sous la direction du Professeur Michael Stonebraker � l'universit� de
-   Californie, Berkeley.
-   
-   Le nom original du logiciel � Berkeley �tait Postgres. Quand le SQL
-   fut ajout� en 1995, le nom a d� �tre chang� en Postgres95. Fin 1996,
-   le nom fut chang� en PostgreSQL.
-   
-    1.2) Quelle est la licence de PostgreSQL ?
-    
-   PostgreSQL est distribu� sous la licence suivante :
-   
-   PostgreSQL Data Base Management System
-   
-   Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
-   Portions Copyright (c) 1994-6 Regents of the University of California
-   
-   Permission to use, copy, modify, and distribute this software and its
-   documentation for any purpose, without fee, and without a written
-   agreement is hereby granted, provided that the above copyright notice
-   and this paragraph and the following two paragraphs appear in all
-   copies.
-   
-   IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY
-   FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
-   INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND
-   ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN
-   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   
-   THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
-   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
-   PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
-   CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
-   UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-   
-   La licence ci-dessus est la licence BSD, une licence open-source
-   classique.
-   
-    1.3) Sous quels environnements Unix PostgreSQL tourne-t-il ?
-    
-   En g�n�ral, tout environnement compatible Unix moderne devrait pouvoir
-   faire fonctionner PostgreSQL. Les environnements qui ont �t� test�s
-   explicitement sont list�s dans les instructions d'installation.
-   
-    1.4) Sous quels environnements non Unix PostgreSQL fonctionne-t'il ?
-    
-   � partir de la version 8.0, PostgreSQL fonctionne nativement sur les
-   syst�mes d'exploitation Microsoft Windows � base NT comme Win2000,
-   WinXP et Win2003. Un installeur est disponible sur
-   http://pgfoundry.org/projects/pginstaller.
-   
-   Il existe aussi un port sur Novell Netware sur
-   http://forge.novell.com.
-   
-    1.5) O� puis-je me procurer PostgreSQL ?
-    
-   Le site FTP anonyme principal de PostgreSQL est
-   ftp://ftp.PostgreSQL.org/pub. Pour les sites miroirs, voir notre site
-   web principal.
-   
-    1.6) O� puis-je obtenir du support ?
-    
-   La liste de diffusion principale est [email protected].
-   Elle est disponible pour discuter de sujets en rapport avec
-   PostgreSQL. Pour s'y inscrire, il faut envoyer un courriel avec les
-   lignes suivantes dans le corps du message (pas dans la ligne du
-   sujet) :
-    subscribe
-    end
-
-   � [email protected].
-   
-   Il existe aussi un recueil de la liste. Pour s'y inscrire, envoyez un
-   courriel � [email protected] avec dans le
-   corps :
-    subscribe
-    end
-
-   Les recueils sont envoy�s aux membres de cette liste d�s que la liste
-   principale a re�u 30 Ko de messages.
-   
-   Une liste de diffusion de bogues est disponible. Pour s'y inscrire,
-   envoyer un courriel � [email protected] avec dans le
-   corps :
-    subscribe
-    end
-
-   Une liste de diffusion pour les d�veloppeurs est aussi disponible.
-   Pour s'y inscrire, envoyez un courriel �
-   [email protected] avec dans le corps :
-    subscribe
-    end
-
-   Vous pouvez trouver d'autres listes et informations sur PostgreSQL sur
-   le site web de PostgreSQL :
-   
-     http://www.PostgreSQL.org
-     
-   Il y a aussi un canal IRC sur Freenode et EFNet, le canal #PostgreSQL.
-   Vous pouvez utiliser la commande Unix irc -c '#PostgreSQL' "$USER"
-   irc.phoenix.net ou irc -c '#PostgreSQL' "$USER" irc.freenode.net.
-   
-   Une liste de soci�t�s pouvant fournir un support commercial est
-   disponible sur http://techdocs.postgresql.org/companies.php.
-   
-    1.7) Quelle est la derni�re version ?
-    
-   La derni�re version de PostgreSQL est la version 7.4.5.
-   
-   Nous projetons de sortir une version majeure tous les six � huit mois.
-   
-    1.8) Quelle documentation est disponible ?
-    
-   Plusieurs manuels, pages de manuel ainsi que des petits exemples de
-   test sont inclus dans la distribution. Voir le r�pertoire /doc. Vous
-   pouvez aussi acc�der aux manuels en ligne sur
-   http://www.PostgreSQL.org/docs.
-   
-   Deux livres sur PostgreSQL sont disponibles en ligne sur
-   http://www.PostgreSQL.org/docs/awbook.html et
-   http://www.commandprompt.com/ppbook/. Il y a une liste de livres sur
-   PostgreSQL pouvant �tre achet�s sur
-   http://techdocs.PostgreSQL.org/techdocs/bookreviews.php. Il y a aussi
-   une collection d'articles techniques sur PostgreSQL sur
-   http://techdocs.PostgreSQL.org/.
-   
-   psql poss�de des commandes \d pratiques montrant des informations sur
-   les types, op�rateurs, fonctions, aggr�gats, etc.
-   
-   Notre site web contient encore plus de documentations.
-   
-    1.9) Comment savoir quels sont les bogues connus ou les fonctionnalit�s
-    manquantes ?
-    
-   PostgreSQL supporte un sous-ensemble �tendu de SQL-92. Voir notre
-   liste TODO pour les bogues connus, les fonctionnalit�s manquantes et
-   les plans pour le futur.
-   
-    1.10) Comment puis-je apprendre le SQL ?
-    
-   Le livre PostgreSQL sur http://www.PostgreSQL.org/docs/awbook.html
-   enseigne le SQL. Il existe un autre livre PostgreSQL sur
-   http://www.commandprompt.com/ppbook. Il existe de bons tutoriels sur
-   http://www.intermedia.net/support/sql/sqltut.shtm,
-   http://ourworld.compuserve.com/homepages/graeme_birchall/HTM_COOK.HTM
-   et http://sqlcourse.com.
-   
-   Un autre (en anglais uniquement) "Teach Yourself SQL in 21 Days,
-   Second Edition" se trouve sur
-   http://members.tripod.com/er4ebus/sql/index.htm
-   
-   Nombre de nos utilisateurs aiment The Practical SQL Handbook, Bowman,
-   Judith S., et al., Addison-Wesley. D'autres aiment The Complete
-   Reference SQL, Groff et al., McGraw-Hill.
-   
-    1.11) PostgreSQL est-il compatible an 2000 ?
-    
-   Oui, nous manipulons facilement les dates apr�s et avant l'an 2000.
-   
-    1.12) Comment puis-je rejoindre l'�quipe de d�veloppement ?
-    
-   Tout d'abord, t�l�chargez les derniers sources et lisez la
-   documentation pour les d�veloppeurs sur notre site web ou bien dans la
-   distribution. Ensuite, inscrivez-vous aux listes de diffusion
-   pgsql-hackers et pgsql-patches. Et pour finir, soumettez des
-   correctifs de grande qualit� sur pgsql-patches.
-   
-   Environ une douzaine de personnes ont des droits de modification sur
-   l'archive CVS de PostgreSQL. Ils ont chacun soumis tellement de
-   correctifs de qualit� qu'il �tait devenu impossible aux d�veloppeurs
-   de tenir la cadence et nous avions confiance dans le qualit� des
-   correctifs qu'ils soumettaient.
-   
-    1.13) Comment dois-je soumettre un rapport de bogue ?
-    
-   Merci de visiter la page PostgreSQL BugTool sur
-   http://www.PostgreSQL.org/bugs/bugs.php, qui donne des indications sur
-   la fa�on de soumettre un rapport de bogue.
-   
-   De m�me, v�rifiez notre site ftp ftp://ftp.PostgreSQL.org/pub pour
-   voir s'il existe une version PostgreSQL plus r�cente ou des
-   correctifs.
-   
-    1.14) Comment PostgreSQL se compare-til � d'autres SGBD ?
-    
-   Il y a plusieurs mani�res de mesurer un logiciel : les
-   fonctionnalit�s, les performances, la fiabilit�, le support, et le
-   prix.
-   
-   Fonctionnalit�s
-          PostgreSQL poss�de la plupart des fonctionnalit�s pr�sentes
-          dans les SGBD commerciaux, comme les transactions, les requ�tes
-          imbriqu�es, les d�clencheurs, les vues, l'int�grit�
-          r�f�rentielle par cl�s �trang�res, et le verrouillage
-          sophistiqu�. Nous avons des fonctionnalit�s qu'ils n'ont pas,
-          comme les types d�finis par l'utilisateur, l'h�ritage, les
-          r�gles, et le contr�le de concurrence par multi-versionnage
-          pour r�duire les contentions de verrouillage.
-          
-   Performances
-          PostgreSQL a des performances similaires aux autres bases de
-          donn�es commerciales et open source. Il est plus rapide pour
-          certaines op�rations, plus lent pour d'autres. Par rapport �
-          MySQL ou d'autres SGBD plus l�ger, nous sommes plus rapides
-          pour de nombreux utilisateurs, des requ�tes complexes et une
-          charge pour les requ�tes de lecture/�criture. MySQL est plus
-          rapide pour des requ�tes SELECT simples effectu�es par quelques
-          utilisateurs. Bien s�r, MySQL ne poss�de aucune des
-          fonctionnalit�s de la section Fonctionnalit�s ci-dessus.
-          PostgreSQL est construit pour la fiabilit� et les
-          fonctionnalit�s et nous continuons � am�liorer les performances
-          � chaque version. Il y a une page web int�ressante qui compare
-          PostgreSQL � MySQL sur
-          http://openacs.org/philosophy/why-not-mysql.html. De plus,
-          MySQL est une soci�t� qui distribue son produit via l'open
-          source et requiert une licence commerciale pour les logiciels
-          propri�taires, donc pas une communaut� de d�veloppement open
-          source comme PostgreSQL.
-          
-   Fiabilit�
-          Nous somme conscients qu'un SGBD doit �tre fiable ou bien il
-          est inutile. Nous faisons le maximum pour sortir des versions
-          bien test�es, du code stable ne contenant qu'un minimum de
-          bogues. Chaque version a au moins un mois de tests, et notre
-          historique de versions montre que nous pouvons fournir des
-          versions stables et robustes, pr�tes pour une utilisation en
-          environnement de production. Nous pensons que nous nous
-          comparons favorablement aux autres bases de donn�es dans ce
-          domaine.
-          
-   Support
-          Nos listes de diffusion offrent un contact avec un large groupe
-          de d�veloppeurs et d'utilisateurs afin d'aider � la r�solution
-          des probl�mes rencontr�s. Nous ne pouvons garantir un correctif
-          mais les SGBD commerciaux ne le garantissent pas toujours non
-          plus. L'acc�s direct aux d�veloppeurs, � la communaut�
-          d'utilisateurs, aux manuels, et au code source, fait du support
-          pour PostgreSQL un support sup�rieur aux autres SGBD. Un
-          support commercial par incident est disponible pour ceux qui en
-          ont le besoin (voir la section 1.6 de la FAQ).
-          
-   Prix
-          Nous sommes gratuits pour tous les usages, commerciaux et non
-          commerciaux. Vous pouvez inclure notre code dans vos produits
-          sans limitation, except�es celles cit�es dans notre licence de
-          type BSD donn�e plus haut.
-          
-    1.15) Comment puis-je aider financi�rement PostgreSQL ?
-    
-   PostgreSQL poss�de une infrastructure de premi�re classe depuis le
-   d�but en 1996. Ceci gr�ce � Marc Fournier, qui a cr�� et g�r� cette
-   infrastructure des ann�es durant.
-   
-   Une infrastructure de qualit� est importante pour un projet
-   open-source. Cela permet d'emp�cher l'�parpillement qui ralentirait
-   beaucoup l'avancement du projet.
-   
-   Bien s�r, cette infrastructure n'est pas donn�e. Elle requiert un
-   certain nombre de d�penses mensuelles ou ponctuelles. Si vous ou votre
-   soci�t� peut donner de l'argent pour soutenir cet effort, merci de
-   consulter la page web http://store.pgsql.com/shopping/ et de faire une
-   donation.
-   
-   Bien que la page web mentionne PostgreSQL, Inc, les contributions sont
-   exclusivement utilis�es pour soutenir le projet PostgreSQL et ne
-   soutiennent aucune soci�t� que ce soit. Si vous le pr�f�rez, vous
-   pouvez aussi envoyer un ch�que � l'adresse de contact.
-     _________________________________________________________________
-   
-   De plus, si vous avez une histoire de succ�s avec PostgreSQL, merci de
-   la soumettre � notre site d'�vang�lisation sur
-   http://advocacy.postgresql.org.
-   
-                    Questions sur le client utilisateur
-                                      
-    2.1) Existe-t'il des pilotes ODBC pour PostgreSQL ?
-    
-   Il y a deux pilotes ODBC disponibles, PsqlODBC et OpenLink ODBC.
-   
-   Vous pouvez t�l�charger PsqlOBDC depuis
-   http://gborg.postgresql.org/project/psqlodbc/projdisplay.php.
-   
-   OpenLink ODBC peut �tre obtenu depuis http://www.openlinksw.com. Il
-   fonctionne avec leur logiciel client ODBC standard, vous aurez donc
-   PostgreSQL ODBC sur toutes les plateformes client qu'ils supportent
-   (Win, Mac, Unix, VMS).
-   
-   Ils vendront probablement ce produit aux gens qui recherchent une
-   qualit� de support professionnelle mais une version freeware sera
-   toujours disponible. Merci d'envoyer vos questions �
-   [email protected].
-   
-    2.2) Quels outils sont disponibles pour utiliser PostgreSQL avec des pages
-    Web ?
-    
-   Une bonne introduction aux pages Web adoss�s � une base de donn�es se
-   trouve � http://www.webreview.com
-   
-   Pour l'int�gration Web, PHP est une excellente interface. Elle se
-   trouve � http://www.php.net.
-   
-   Pour les cas complexes, beaucoup utilisent l'interface Perl et CGI.pm
-   ou mod_perl.
-   
-    2.3) PostgreSQL a-t-il une interface graphique ?
-    
-   Oui, il y a plusieurs interfaces graphiques disponibles pour
-   PostgreSQL, dont PgAccess http://www.pgaccess.org), PgAdmin III
-   (http://www.pgadmin.org), RHDB Admin (http://sources.redhat.com/rhdb/
-   et Rekall ( http://www.thekompany.com/products/rekall/, propri�taire).
-   Il y a aussi PhpPgAdmin ( http://phppgadmin.sourceforge.net/ ), une
-   interface Web pour PostgreSQL.
-   
-   Voir http://techdocs.postgresql.org/guides/GUITools pour une liste
-   plus d�taill�e.
-   
-    2.4) Quels langages sont disponibles pour communiquer avec PostgreSQL ?
-    
-   La plupart des langages de programmation couramment utilis�s ont une
-   interface pour PostgreSQL. V�rifiez la liste des modules de votre
-   langage.
-   
-   Les interfaces ci-dessous sont incluses dans la distribution :
-     * C (libpq)
-     * Embedded C (ecpg)
-     * Java (jdbc)
-     * Python (PyGreSQL)
-     * TCL (libpgtcl)
-       
-   Interfaces suppl�mentaires disponibles sur http://gborg.postgresql.org
-   dans la section Drivers/Interfaces
-     _________________________________________________________________
-   
-                         Questions Administratives
-                                      
-    3.1) Comment installer PostgreSQL ailleurs que sous /usr/local/pgsql ?
-    
-   Il faut sp�cifier l'option --prefix lors du lancement de configure.
-   
-    3.2) Quand je lance postmaster, j'obtiens un Bad System Call ou un message
-    core dumped . Pourquoi ?
-    
-   Cela peut �tre d� � une vari�t� de probl�mes mais v�rifiez d'abord que
-   vous avez les extensions System V install�es pour votre noyau.
-   PostgreSQL n�cessite le support noyau pour la m�moire partag�e et les
-   s�maphores.
-   
-    3.3) Quand je lance postmaster, j'obtiens des erreurs IpcMemoryCreate.
-    Pourquoi ?
-    
-   Soit vous n'avez pas configur� correctement la m�moire partag�e dans
-   votre noyau, soit vous devez augmenter la m�moire partag�e disponible
-   dans le noyau. Le montant exact dont vous avez besoin d�pend de votre
-   architecture et du nombre de tampons et de processus que vous avez
-   configur� pour postmaster. Pour la plupart des syst�mes avec un nombre
-   par d�faut de tampons et de processus, vous aurez besoin d'un minimum
-   d'environ 1 Mo. Voir le chapitre Administration du manuel PostgreSQL
-   pour des informations plus d�taill�es sur la m�moire partag�e et les
-   s�maphores.
-   
-    3.4) Quand je lance postmaster, j'obtiens des erreurs IpcSemaphoreCreate.
-    Pourquoi ?
-    
-   Si le message d'erreur est IpcSemaphoreCreate: semget failed (No space
-   left on device) alors votre noyau n'est pas configur� avec
-   suffisamment de s�maphores. PostgreSQL a besoin d'un s�maphore par
-   processus serveur potentiel. Une solution provisoire est de lancer
-   postmaster avec une plus petite limite sur le nombre de processus
-   serveur. Utilisez l'option -N avec un param�tre inf�rieur au choix par
-   d�faut de 32. Une solution permanente est d'augmenter les param�tres
-   SEMMNS et SEMMNI de votre noyau.
-   
-   Des s�maphores inop�rantes peuvent aussi provoquer des plantages
-   pendant de gros acc�s � la base de donn�es.
-   
-   Si le message d'erreur est autre chose, vous n'avez peut-�tre pas du
-   tout le support des s�maphores dans votre noyau. Voir le chapitre
-   Administration du manuel PostgreSQL pour des informations plus
-   d�taill�es sur la m�moire partag�e et les s�maphores.
-   
-    3.5) Comment contr�ler les connexions d'autres machines ?
-    
-   Par d�faut, PostgreSQL autorise seulement les connexions de la machine
-   locale en utilisant les sockets de domaine Unix ou les connexions
-   TCP/IP. D'autres machines ne seront pas capables de se connecter sauf
-   si vous modifiez listen_addresses dans postgresql.conf et activez une
-   authentification bas�e sur l'h�te en modifiant le fichier
-   $PGDATA/pg_hba.conf en accord.
-   
-    3.6) Comment r�gler le moteur de la base de donn�es pour de meilleures
-    performances ?
-    
-   Des index acc�l�reront les requ�tes. La commande EXPLAIN ANALYZE vous
-   permet de voir comment PostgreSQL traite votre requ�te et quels index
-   sont utilis�s.
-   
-   Si vous faites beaucoup d'insertions (instruction INSERT), envisagez
-   de les faire en une fois en utilisant la commande COPY. Ceci est plus
-   rapide que des commandes INSERTS individuelles. Deuxi�ment, les
-   requ�tes qui ne sont pas dans des blocs de transaction BEGIN
-   WORK/COMMIT sont consid�r�s comme �tant dans leur propre transaction.
-   Envisagez de faire plusieurs instructions dans un seul bloc de
-   transaction. Ceci r�duira la surcharge apport�e par les transactions.
-   Aussi, envisagez d'abandonner et de recr�er des index lors de grosses
-   modifications de donn�es.
-   
-   Il y a plusieurs options d'optimisations. Vous pouvez d�sactiver
-   fsync() en lan�ant postmaster avec l'option -o -F. Ceci emp�chera les
-   fsync()s d'�crire sur disque apr�s toute transaction.
-   
-   Vous pouvez utiliser l'option -B de postmaster pour augmenter le
-   nombre de tampons de m�moire partag�e utilis�s par les processus
-   serveurs. Si vous fixez ce param�tre trop haut, postmaster ne se
-   lancera pas car vous avez d�pass� la limite de votre noyau sur la
-   quantit� de m�moire partag�e. Chaque tampon fait 8 Ko et le choix par
-   d�faut est de 64 tampons.
-   
-   Vous pouvez utiliser l'option serveur -S pour augmenter la quantit�
-   maximale de m�moire utilis�e par les processus serveurs pour des tris
-   temporaires. La valeur de -S est mesur� en kilooctets et le choix par
-   d�faut est de 512 (c'est-�-dire 512 Ko).
-   
-   Vous pouvez utiliser la commande CLUSTER pour regrouper vos donn�es en
-   tables pour correspondre � un index. Voir la page de manual CLUSTER
-   pour plus de d�tails.
-   
-    3.7) Quelles fonctionalit�s de d�boguage sont disponibles ?
-    
-   PostgreSQL a plusieurs fonctionalit�s qui permettent de recueillir des
-   informations de statut qui peuvent �tre utile pour des intentions de
-   d�boguage.
-   
-   D'abord, en lan�ant configure avec l'option --enable-cassert, beaucoup
-   d'assert()s surveillent le serveur et arr�tent le programme quand
-   quelque chose d'inattendu arrive.
-   
-   Postmaster et postgres ont tous deux plusieurs options de d�boguage de
-   disponible. D'abord, quand vous lancez postmaster, v�rifiez que vous
-   envoyez les sorties standard et d'erreur dans un fichier de traces
-   comme :
-    cd /usr/local/pgsql
-    ./bin/postmaster >server.log 2>&1 &
-
-   Ceci va cr�er un fichier server.log dans le r�pertoire racine de
-   PostgreSQL. Ce fichier contient des informations utiles sur les
-   probl�mes ou erreurs rencontr�s par le serveur. Postmaster dispose
-   d'une option -d qui permet de rapporter des informations encore plus
-   d�taill�es d'�tre rapport�es. L'option -d prend un num�ro qui sp�cifie
-   le niveau de d�boguage. Faites attention au fait que des valeurs
-   �l�v�es de niveau de d�boguage g�nerent des fichiers de traces
-   volumineux.
-   
-   Si postmaster ne tourne pas, vous pouvez lancer le serveur postgres de
-   la ligne de commande et taper votre requ�te SQL directement. Ceci est
-   recommand� seulement pour des fonctions de d�boguage. Notez qu'un
-   retour chariot termine la requ�te, pas un point-virgule. Si vous
-   compilez avec les symboles de d�boguage, vous pouvez utiliser un
-   d�bogueur pour voir ce qui se passe. Parce que le serveur n'a pas �t�
-   lanc� par postmaster, il ne tourne pas dans un environnement identique
-   et les probl�mes d'interaction de verrouillage/serveur ne peuvent �tre
-   dupliqu�s.
-   
-   Si postmaster est en train de tourner, lancez psql dans une fen�tre
-   puis trouvez le PID du processus postgres utilis� par psql. Utilisez
-   un d�bogueur pour l'attacher au PID postgres. Vous pouvez mettre un
-   point d'arr�t dans le d�bogueur et envoyez des requ�tes de psql. Si
-   vous d�boguez le d�marrage de postgres, vous pouvez mettre
-   PGOPTIONS="-W n", puis lancez psql. Ceci va retarder le d�marrage de n
-   secondes pour que vous puissiez attacher un d�bogueur au processus,
-   fixer des points d'arr�t et continuer la s�quence de d�marrage.
-   
-   Le programme postgres a les options -s, -A et -t qui peuvent �tre
-   utile pour des mesures de d�boguage et de performance.
-   
-   Vous pouvez compiler avec les options de performance pour voir quelles
-   fonctions prennent du temps d'ex�cution. Les fichiers de gestion du
-   serveur seront d�pos�s dans le r�pertoire pgsql/data/base/nom_db. Les
-   fichiers de gestion clients seront mis dans le r�pertoire actuel du
-   client. Linux requiert une compilation avec -DLINUX_PROFILE pour une
-   meilleure gestion.
-   
-    3.8) Pourquoi est-ce que j'obtiens des messages Sorry, too many clients
-    quand je me connecte ?
-    
-   Vous pouvez augmenter la limite de postmaster sur le nombre de
-   processus serveur concurrents qu'il peut lancer.
-   
-   La limite par d�faut est de 32 processus. Vous pouvez l'augmenter en
-   relan�ant postmaster avec une valeur -N appropri�e ou en modifiant
-   postgresql.conf.
-   
-   Tenez compte du fait que si vous fixez -N plus grand que 32, vous
-   devez aussi augmenter -B au-dela de sa valeur par d�faut 64 ; -B doit
-   valoir au moins deux fois -N et probablement plus pour une meilleure
-   performance. Pour de grand nombres de processus serveurs vous aurez
-   probablement aussi augmenter plusieurs parametres de configuration du
-   noyau Unix. Les choses a v�rifier incluent la taille maximale des
-   blocs de m�moire partag�e, SHMMAX ; le nombre maximal de s�maphores,
-   SEMMNS et SEMMNI ; le nombre maximal de processus, NPROC ; le nombre
-   maximal de processus par utilisateur, MAXUPRC ; et le nombre maximal
-   de fichiers ouverts, NFILE et NINODE. La raison pour laquelle
-   PostgreSQL a une limite sur le nombre de processus serveurs autoris�s
-   est pour que votre syst�me ne tombe pas � court de ressources.
-   
-    3.9) Que contient le r�pertoire pgsql_tmp ?
-    
-   Ce r�pertoire contient des fichiers temporaires g�n�r�s par le moteur
-   de requ�te. Par exemple, si un tri doit �tre fait pour satisfaire un
-   ORDER BY et que ce tri requiert plus de place que le param�tre -S du
-   serveur n'autorise, alors des fichiers temporaires seront cr��s pour
-   contenir les donn�es n�cessaires.
-   
-   Les fichiers temporaires sont d'habitude effac�s automatiquement mais
-   peuvent rester si un serveur s'arr�te brutalement pendant un tri. Un
-   arr�t et un red�marrage de postmaster effacera les fichiers dans ces
-   r�pertoires.
-   
-    3.10) Pourquoi est-ce que j'ai besoin de faire une sauvegarde des bases et
-    de restaurer pour mettre a jour les versions de PostgreSQL ?
-    
-   L'�quipe PostgreSQL ne fait que des changements mineurs entre des
-   versions mineurs, donc mettre � jour de 7.2 vers 7.2.1 ne n�cessitera
-   pas de sauvegarde et de restauration. Par contre, les sorties majeures
-   (c'est-�-dire de 7.2 vers 7.3) changent souvent le format interne des
-   tables syst�mes et des fichiers de donn�es. Ces modifications sont
-   souvent complexes alors nous ne gardons pas de compatibilit�
-   descendante pour les fichiers de donn�es. Une sauvegarde exportera les
-   donn�es dans un format g�n�rique qui peut ensuite �tre charg� dans le
-   nouveau format interne.
-   
-   Dans les sorties o� le format sur disque ne change pas, le script
-   pg_upgrade peut �tre utilis� pour mettre � jour sans
-   sauvegarde/restauration. Les notes de sorties pr�cisent si pg_upgrade
-   est disponible pour la sortie.
-   
-    3.11) Quels mat�riels dois-je utiliser ?
-    
-   Comme le mat�riel PC est compatible en grosse partie, les gens ont
-   tendance � croire que tous les mat�riels PC sont de m�me qualit�. Ce
-   n'est pas le cas. La RAM ECC, le SCSI et les cartes-m�re de qualit�
-   sont plus fiables et ont de meilleurs performances qu'un mat�riel
-   moins co�teux. PostgreSQL fonctionnera sur � peu pr�s tout mat�riel
-   mais si la fiabilit� et la performance sont importantes pour vous, il
-   est rus� de bien consid�rer les options mat�rielles. Nos listes de
-   diffusion peuvent �tre utilis�es pour discuter des options mat�riels.
-     _________________________________________________________________
-   
-                          Questions fonctionnelles
-                                      
-    4.1) Quelle est la diff�rence entre curseur binaire et curseur normal ?
-    
-   Voir la page DECLARE du manuel pour une description.
-   
-    4.2) Comment faire un SELECT seulement sur les premi�res lignes d'une
-    requ�te ? Sur une ligne al�atoire ?
-    
-   Voir la page FETCH du manuel ou utiliser SELECT ... LIMIT....
-   
-   Il se peut que l'int�gralit� de la requ�te doive �tre �valu�e, m�me si
-   vous voulez seulement les premi�res lignes. Envisagez d'utiliser une
-   requ�te avec une clause ORDER BY. S'il existe un index correspondant �
-   l'ORDER BY, PostgreSQL peut n'�valuer que les premi�res lignes, sinon
-   l'int�gralit� de la requ�te peut �tre �valu�e, jusqu'� g�n�rer les
-   lignes d�sir�es.
-   
-   Pour faire un SELECT sur une ligne al�atoire :
-    SELECT colonne
-    FROM table
-    ORDER BY random()
-    LIMIT 1;
-
-    4.3) Comment obtenir une liste des tables ou d'autres objets que je vois
-    dans psql ?
-    
-   Utilisez la commande \dt pour voir les tables dans psql. Pour une
-   liste compl�te de commandes � l'int�rieur de psql, vous pouvez
-   utiliser \?. Autrement, vous pouvez lire le code source de psql dans
-   le fichier pgsql/src/bin/psql/describe.c. Il contient des commandes
-   SQL qui g�n�rent le contenu des commandes anti-slash de psql. Vous
-   pouvez aussi lancer psql avec l'option -E, afin qu'il imprime les
-   requ�tes qu'il utilise pour ex�cuter les commandes que vous lui
-   passez. PostgreSQL fournit aussi une interface d'informations sur le
-   sch�ma compatible avec SQLi que vous pouvez interroger des
-   informations sur la base de donn�es.
-   
-    4.4) Comment supprime-t-on une colonne d'une table, ou comment change-t-on
-    son type de donn�es ?
-    
-   La fonction DROP COLUMN a �t� ajout�e dans la version 7.3 avec ALTER
-   TABLE DROP COLUMN. Pour les versions pr�c�dentes, vous pouvez faire :
-    BEGIN;
-    LOCK TABLE ancienne_table;
-    SELECT ...  -- s�lectionnez toutes les colonnes sauf celle � supprimer
-    INTO TABLE nouvelle_table
-    FROM ancienne_table;
-    DROP TABLE ancienne_table;
-    ALTER TABLE nouvelle_table RENAME TO ancienne_table;
-    COMMIT;
-
-   Pour changer le type de donn�es d'une colonne, faites :
-    BEGIN;
-    ALTER TABLE table ADD COLUMN nouvelle_colonne nouveau_type_de_donnees;
-    UPDATE table SET nouvelle_colonne = CAST(ancienne_colonne AS nouveau_type_de_donnees);
-    ALTER TABLE table DROP COLUMN ancienne_colonne;
-    COMMIT;
-
-   Apr�s, vous pouvez faire VACUUM FULL tab pour r�cup�rer l'espace
-   disque utilis� par les lignes expir�es.
-   
-    4.5) Quelle est la taille maximale pour une ligne, une table, une base de
-    donn�es ?
-    
-   Les limites sont :
-    Taille maximum pour une base de donn�es     illimit�e (il existe des basesde 32 To)
-    Taille maximum pour une table               32 To
-    Taille maximum pour une ligne               1,6 To
-    Taille maximum pour un champ                1 Go
-    Nombre maximum de lignes dans une table     illimit�
-    Nombre maximum de colonnes dans une table   250-1600, selon le type de colonnes
-    Nombre maximum d'index sur une table        illimit�
-
-   Bien s�r, ces valeurs ne sont pas vraiment illimit�e, elles sont
-   limit�es par l'espace disque disponible, ainsi que par l'espace de
-   m�moire et de swap. Les performances peuvent se d�grader si ces
-   valeurs sont inhabituellement grandes.
-   
-   La taille maximum des tables (32 To) ne n�cessite pas que le syst�me
-   d'exploitation supporte les grands fichiers. Les grandes tables sont
-   stock�es sous forme de fichiers multiples de 1 Go, donc les limites de
-   taille du syst�me de fichier ne sont pas importantes.
-   
-   La taille maximum des tables et le nombre maximum de colonnes peuvent
-   �tre quadripl�s, si la taille des blocs par d�faut est augment�e �
-   32 Ko.
-   
-    4.6) Combien d'espace disque faut-il pour stocker les donn�es d'un fichier
-    texte typique ?
-    
-   Une base de donn�es PostgreSQL peut utiliser jusqu'� cinq fois
-   l'espace n�cessaire pour stocker les donn�es d'un fichier texte.
-   
-   A titre d'exemple, consid�rez un fichier de 100 000 lignes, comportant
-   un entier et une cha�ne de description sur chaque ligne. Supposons que
-   la cha�ne soit longue en moyenne de 20 octets. Le fichier texte serait
-   de 2,8 Mo. La taille du fichier d'une base de donn�es PostgreSQL peut
-   �tre estim�e � 6,4 Mo :
-    32 octets: chaque ligne (approximation)
-    24 octets: un champ 'entier' et un champ 'texte'
-   + 4 octets: pointeur vers le tuple sur la page
-   ----------------------------------------
-    60 octets par ligne
-
-   La taille des pages de donn�es dans PostgreSQL est de 8192 octets (8 KO), donc :
-
-   8192 octets par page
-   ----------------------   = 136 lignes par page de base de donn�es (arrondi � l'entier inf�rieur)
-     60 octets par ligne
-
-   100000 lignes de donn�es
-   -------------------------  =  735 pages de base de donn�es (arrondi � l'entier sup�rieur)
-      128 lignes par page
-
-735 pages de base de donn�es * 8192 octets par page  =  6 021 120 octets (6,4 Mo)
-
-   Les index utilisent moins d'espace, mais ils contiennent les donn�es
-   index�es, ils peuvent donc �galement �tre grands.
-   
-   Les NULL sont stock�s sous forme de bitmap, aussi utilisent-ils tr�s
-   peu d'espace.
-   
-    4.7) Comment puis-je savoir quels index, tables, bases de donn�es et
-    utilisateurs sont d�finis ?
-    
-   psql dispose de plusieurs commandes commen�ant par un anti-slash pour
-   retrouver ces informations. Utilisez \? pour les conna�tre. Il existe
-   aussi des tables syst�mes, qui commencent par pg_ et qui les d�crivent
-   �galement. Aussi, psql -l liste toutes les bases de donn�es.
-   
-   Essayez �galement le fichier pgsql/src/tutorial/syscat.source. Il
-   illustre un grand nombre de commandes SELECT n�cessaires pour
-   r�cup�rer l'information des tables syst�me de la base de donn�es.
-   
-    4.8) Mes requ�tes sont lentes ou ne font pas usage des index. Pourquoi ?
-    
-   Les index ne sont pas automatiquement utilis�s par chaque requ�te. Ils
-   sont utilis�s uniquement si la table est plus grande qu'une certaine
-   taille, et si la requ�te s�lectionne seulement un faible pourcentage
-   des lignes de la table. Ceci est d� au fait qu'un acc�s disque
-   al�atoire caus� par un parcours d'index peut �tre plus lent qu'une
-   simple lecture de la table, ou parcours s�quentiel
-   
-   Pour d�terminer si un index devrait �tre utilis�, PostgreSQL a besoin
-   des statistiques de la table. Ces statistiques sont collect�es en
-   lan�ant VACUUM ANALYZE ou simplement ANALYZE. Avec les statistiques,
-   l'optimiseur sait combien de lignes se trouvent dans la table et peut
-   mieux d�terminer s'il faut utiliser l'index. Les statistiques sont
-   �galement utiles pour d�terminer l'ordre optimal des op�rations de
-   jointure. La collecte des statistiques devrait �tre effectu�e
-   r�guli�rement lorsque le contenu de la table change.
-   
-   Les index ne sont normalement pas utilis�s pour les clauses ORDER BY
-   ou pour les jointures. Un parcours s�quentiel suivi d'un tri explicite
-   est habituellement plus rapide qu'un parcours d'index pour une table
-   importante. Toutefois, LIMIT combin� avec ORDER BY utilisera souvent
-   un index parce que seulement une petite partie de la table est
-   renvoy�e. En fait, bien que MAX() et MIN() n'utilisent pas les index,
-   il est possible de retrouver ces valeurs en utilisant un index avec
-   ORDER BY et LIMIT :
-    SELECT colonne
-    FROM table
-    ORDER BY colonne [ DESC ]
-    LIMIT 1;
-
-   Si vous pensez que l'optimiseur choisit par erreur un parcours
-   sequentiel, utilisez SET enable_seqscan TO 'off' et lancez des tests
-   pour voir si le parcours d'index est effectivement plus rapide.
-   
-   Lorsque vous utilisez des caract�res joker tels que LIKE ou ~, les
-   index peuvent seulement �tre utilis�s dans certaines circonstances :
-     * Le d�but de la cha�ne de recherche doit �tre ancr� au d�part de la
-       cha�ne, c'est-�-dire
-          + Les mod�les pour LIKE ne doivent pas commencer par %.
-          + Les mod�les d'expression r�guli�re pour ~ doivent commencer
-            par ^.
-     * La cha�ne de recherche ne peut pas commencer par une classe de
-       caract�res, c'est-�-dire [a-e].
-     * Les recherches sans casse comme ILIKE et ~* n'utilisent pas les
-       index. Utilisez plut�t les index fonctionnels, d�crit dans la
-       section 4.12.
-     * La locale C par d�faut doit �tre utilis�e lors de initdb.
-       
-   Dans les versions ant�rieures � la 8.0, les indexs ne peuvent souvent
-   pas �tre utilis�s sauf si les types de donn�es correspondent
-   exactement au type de la colonne de l'index. Ceci est particuli�rement
-   vrai pour les index de colonnes de type int2, int8 et numeric.
-   
-    4.9) Comment puis-je savoir si l'optimiseur �value mes requ�tes ?
-    
-   Voir la page EXPLAIN du manuel.
-   
-    4.10) Qu'est-ce qu'un index R-tree ?
-    
-   Un index R-tree est utilis� pour l'indexation des donn�es spatiales.
-   Un index de hachage ne permet pas les recherches par plage. Un index
-   B-tree peut seulement faire des recherches sur une dimension. Les
-   index R-tree peuvent traiter des donn�es multi-dimensionnelles. Par
-   exemple, si un index R-tree peut �tre construit sur un attribut de
-   type point, le syst�me peut plus efficacement g�rer les requ�tes du
-   type "S�lection de tous les points d'un rectangle".
-   
-   L'article de r�f�rence qui d�crit le syst�me R-tree original est :
-   
-   Guttman, A. "R-trees: A Dynamic Index Structure for Spatial
-   Searching." Proceedings of the 1984 ACM SIGMOD Int'l Conf on Mgmt of
-   Data, 45-57.
-   
-   Vous pouvez �galement trouver ce papier dans le livre de Stonebraker
-   "Readings in Database Systems".
-   
-   Les index R-tree int�gr�s peuvent prendre en charge les polyg�nes et
-   les bo�tes. En th�orie, les R-trees peuvent �tre �tendus � un plus
-   grand nombre de dimensions. En pratique, l'extension des R-trees
-   requiert pas mal de travail et nous n'avons pour le moment aucune
-   documentation sur la fa�on de proc�der.
-   
-    4.11) Qu'est-ce que l'optimiseur g�n�tique de requ�tes ?
-    
-   Le module GEQO (acronyme de GEnetic Query Optimizer) acc�l�re
-   l'optimisation des requ�tes lors de jointures de nombreuses tables par
-   un algorithme g�n�tique (GA). Il permet la gestion des grosses
-   requ�tes de jointures en utilisant une recherche non exhaustive.
-   
-    4.12) Comment puis-je r�aliser des recherches sur des expressions
-    rationnelles ainsi que des recherches non sensibles � la casse ? Comment
-    puis-je utiliser un index lors de recherches non sensibles � la casse ?
-    
-   L'op�rateur ~ r�alise des recherches d'expressions rationnelles et ~*
-   le fait sans tenir compte de la casse. La variante de LIKE non
-   sensible � la casse est ILIKE.
-   
-   Des comparaisons d'�galit� non sensibles � la casse sont
-   habituellement exprim�es de cette fa�on :
-    SELECT *
-    FROM table
-    WHERE lower(colonne) = 'abc';
-
-   Ceci n'utilisera pas un index standard. N�anmoins, si vous cr�ez un
-   index fonctionnel, celui-ci sera utilis� :
-    CREATE INDEX tableindex ON table (lower(colonne));
-
-    4.13) Comment puis-je d�tecter si un champ est NULL dans une requ�te ?
-    
-   Il vous suffit de tester la colonne avec IS NULL ou IS NOT NULL.
-   
-    4.14) Quelle sont les diff�rences entre les nombreux types de caract�res ?
-    
-Type            Nom interne     Notes
---------------------------------------------------
-VARCHAR(n)      varchar         n sp�cifie la taille maximum, sans remplissage
-CHAR(n)         bpchar          des espaces sont ajout�s pour obtenir la
-                                longueur fixe sp�cifi�e
-TEXT            text            pas de limite sup�rieure pour la taille
-BYTEA           bytea           tableau d'octets (accepte les octets nuls)
-"char"          char            un caract�re
-
-   Vous verrez le nom interne en examinant les catalogues syst�me et dans
-   quelques messages d'erreur.
-   
-   Les quatres premiers types du dessus sont des types "varlena"
-   (c'est-�-dire que les quatre premiers octets correspondent � la
-   taille, suivi des donn�es). Donc, l'espace r�ellement utilis� est
-   l�g�rement plus grand que la taille d�clar�e. N�anmoins, ces types de
-   donn�es sont aussi sujet � la compression ou � un enregistrement en
-   dehors de la table avec TOAST, donc l'espace occup� sur disque
-   pourrait aussi �tre moindre que ce qu'on pourrait attendre.
-   
-   VARCHAR(n) est bien mieux pour enregistrer des cha�nes de longueurs
-   variables tout en limitant la taille de cette cha�ne. TEXT est utile
-   pour les cha�nes de longueur illimit�e, avec malgr� tout un maximum de
-   1 Go.
-   
-   CHAR(n) est int�ressant pour stocker des cha�nes de taille identique.
-   CHAR(n) compl�te avec des espaces pour arriver � la taille sp�cifi�e
-   alors que VARCHAR(n) n'enregistre que les caract�res donn�s. BYTEA
-   sert � stocker des donn�es binaires, particuli�rement les donn�es
-   incluant des octets NULL. Tous les types d�crits ici ont des
-   performances similaires.
-   
-    4.15.1) Comment puis-je cr�er un champ s�rie, c'est-�-dire s'incr�mentant
-    automatiquement ?
-    
-   PostgreSQL supporte un type de donn�es SERIAL. Il cr�e automatiquement
-   une s�quence. Par exemple, ceci :
-    CREATE TABLE personne (
-        id  SERIAL,
-        nom TEXT
-    );
-
-   est automatiquement traduit en ceci :
-    CREATE SEQUENCE personne_id_seq;
-    CREATE TABLE personne (
-        id  INT4 NOT NULL DEFAULT nextval('personne_id_seq'),
-        nom TEXT
-    );
-
-   Voir la page man de create_sequence pour plus d'informations sur les
-   s�quences. Vous pouvez aussi utiliser le champ OID de chaque ligne
-   comme valeur unique. N�anmoins, si vous avez besoin de sauvegarder
-   puis recharger la base de donn�es, vous devrez utiliser l'option -o ou
-   l'option COPY WITH OIDS de pg_dump pour conserver les OIDs.
-   
-    4.15.2) Comment puis-je obtenir la valeur d'un SERIAL suite � une
-    insertion ?
-    
-   Une approche pour r�cup�rer la prochaine valeur SERIAL � partir de
-   l'objet s�quence est d'utiliser la fonction nextval() avant
-   l'insertion et de l'ins�rer ensuite explicitement. En utilisant la
-   table d'exemple de la section 4.15.1, un exemple dans un
-   pseudo-langage ressemblerait � ceci :
-    nouvelle_id = execute("SELECT nextval('personne_id_seq')");
-    execute("INSERT INTO personne (id, nom) VALUES (nouvelle_id, 'Blaise Pascal')");
-
-   Vous pourriez ensuite utiliser la nouvelle valeur stock�e dans
-   nouvelle_id avec d'autres requ�tes (c'est-�-dire en tant que cl�
-   �trang�re de la table personne). Notez que le nom de la SEQUENCE
-   automatiquement cr��e sera <table>_<colonneserial>_seq, o� table et
-   colonneserial sont les noms respectifs de votre table et de votre
-   colonne SERIAL.
-   
-   Autrement, vous pouvez r�cup�rer la valeur SERIAL affect�e avec la
-   fonction currval() apr�s qu'elle ait �t� ins�r�e par d�faut,
-   c'est-�-dire,
-    execute("INSERT INTO personne (nom) VALUES ('Blaise Pascal')");
-    nouvelle_id = execute("SELECT currval('personne_id_seq')");
-
-   Enfin, vous pouvez utiliser l'OID renvoy� par l'instruction INSERT
-   pour r�cup�rer la valeur par d�faut bien que cela soit l'appoche la
-   moins portable et la valeur de l'OID se r�initialisera aux environs de
-   quatre milliards. En Perl, avec DBI et le module DBD:Pg d'Edmund
-   Mergl, l'ancienne valeur est disponible via $sth->{pg_oid_status}
-   apr�s un $sth->execute().
-   
-    4.15.3) Est-ce que currval() et nextval() n'am�nent pas des probl�mes
-    lorsque plusieurs utilisateurs les lancent en m�me temps ?
-    
-   Non. currval() renvoie la valeur actuelle affect�e par votre
-   processus, et non pas par tous les utilisateurs.
-   
-    4.15.4) Pourquoi mes num�ros de s�quences ne sont pas r�-utilis�s lors
-    d'une annulation de transaction ? Pourquoi existe-t'il des trous dans la
-    num�rotation de ma colonne s�quentielle (SERIAL) ?
-    
-   Pour am�liorer les acc�s concurrents, les valeurs de s�quences sont
-   donn�es aux transactions qui en ont besoin et ne sont pas bloqu�es
-   jusqu'� la fin de la transaction. Ceci cr�e des trous dans le
-   num�rotage pour les transactions annul�es.
-   
-    4.16) Qu'est-ce qu'un OID ? Qu'est-ce qu'un TID ?
-    
-   Les OID sont la r�ponse de PostgreSQL aux identifiants de lignes
-   uniques. Chaque ligne cr��e dans PostgreSQL obtient un OID unique.
-   Tous les OID g�n�r�s pendant initdb sont inf�rieurs � 16384 (voir
-   include/access/transam.h). Tous les OID cr��s par un utilisateur sont
-   sup�rieurs ou �gaux � ceci. Par d�faut, tous ces OID sont uniques non
-   seulement dans une table ou une base mais unique � l'int�rieur d'une
-   installation PostgreSQL enti�re.
-   
-   PostgreSQL utilise les OID dans ses tables syst�me interne pour lier
-   les lignes entre tables. Ces OID peuvent �tre utilis�s pour identifier
-   des lignes utilisateurs sp�cifiques et utilis�s dans des jointures. Il
-   est recommand� que vous utilisiez le type de colonne OID pour stocker
-   des valeurs OID. Vous pouvez cr�er un index sur le champ OID pour un
-   acc�s plus rapide.
-   
-   Les OID sont attribu�s pour toute ligne d'un endroit central qui est
-   utilis� par toutes les bases de donn�es. Si vous voulez changer l'OID
-   en quelque chose d'autre ou si vous voulez faire une copie de la table
-   avec les OID originaux, il n'y a pas de raisons pour ne pas le faire :
-    CREATE TABLE nouvelle_table (macolonne int);
-    SELECT oid AS ancienne_oid, macolonne INTO table_temporaire FROM ancienne_table;
-    COPY table_temporaire FROM '/tmp/tablepg';
-    COPY nouvelle_table WITH OIDS FROM '/tmp/tablepg';
-    DROP TABLE table_temporaire;
-
-   Les OID sont stock�s en tant qu'entiers de quatre octets et
-   d�borderont � quatre milliards. Personne n'a jamais rapport� un tel
-   cas et nous avons pr�vu de retirer la limite avant que cela ne se
-   produise.
-   
-   Les TIDs sont utilis�s pour identifier des lignes physiques
-   sp�cifiques avec des valeurs de bloc et d�calage. Les TID changent
-   apr�s que les lignes aient �t� modifi�s ou recharg�s. Ils sont
-   utilis�s par des entr�es d'index pour pointer vers des lignes
-   physiques.
-   
-    4.17) A quoi correspond certains termes utilis�s avec PostgreSQL ?
-    
-   Une partie du code source et de l'ancienne documentation utilisent des
-   termes dont l'usage est plus commun. Voici quelques exemples :
-     * table, relation, classe
-     * ligne (row), enregistrement (record), tuple
-     * colonne (column), champ (field), attribut
-     * r�cup�re, s�lectionne (select)
-     * remplace (replace), met � jour (update)
-     * ajoute (append), ins�re (insert)
-     * OID, valeur s�quentielle (serial value)
-     * portal, curseur
-     * range variable, table name, table alias
-       
-   Une liste des termes g�n�raux pour le domaine des bases de donn�es est
-   disponible sur :
-   http://hea-www.harvard.edu/MST/simul/software/docs/pkgs/pgsql/glossary
-   /glossary.html
-   
-    4.18) Pourquoi ai-je l'erreur ERROR: Memory exhausted in AllocSetAlloc() ?
-    
-   Vous manquez probablement de m�moire virtuelle sur votre syst�me ou
-   votre noyau a une limite assez basse pour certaines ressources.
-   Essayez ceci avant de lancer postmaster :
-    ulimit -d 262144
-    limit datasize 256m
-
-   Suivant votre shell, seul un d'eux pourrait r�ussir mais cela
-   configurera d'une fa�on plus importante la taille du segment de
-   donn�es de votre processus. Cette commande s'applique au processus
-   actuel et � tous les processus lanc� par celui-ci. Si vous avez des
-   probl�mes avec le client SQL parce que le processus serveur renvoie
-   trop de donn�es, essayez �a avant de lancer le client.
-   
-    4.19) Comment puis-je conna�tre la version de PostgreSQL que j'utilise ?
-    
-   A partir de psql, tapez SELECT version();
-   
-    4.20) Pourquoi ai-je invalid large obj descriptor lors d'op�rations sur des
-    gros objects ?
-    
-   Vous avez besoin de placer BEGIN WORK et COMMIT autour de chaque
-   utilisateur de gros objets, c'est-�-dire pour entourer lo_open ...
-   lo_close.
-   
-   Actuellement, PostgreSQL force cette r�gle en fermant les gros objets
-   lors de la transaction. Donc, le premier essai d'op�rations sur ces
-   objets, fonctionnant habituellement (au moins la plupart du temps)
-   aura un invalid large obj descriptor. Donc le code, auparavant
-   fonctionnel (au moins la plupart du temps), g�n�rera maintenant un
-   message d'erreur si vous n'utilisez pas de transaction.
-   
-   Si vous utilisez une interface client interface comme ODBC, vous aurez
-   peut-�tre besoin de lancer auto-commit off.
-   
-    4.21) Comment puis-je cr�er une colonne qui aura par d�faut l'heure
-    actuelle comme valeur ?
-    
-   Utilisez CURRENT_TIMESTAMP:
-CREATE TABLE test (x int, heuremodif timestamp DEFAULT CURRENT_TIMESTAMP );
-
-    4.22) Pourquoi mes sous-requ�tes utilisant IN sont-elles si lentes ?
-    
-   Dans les versions pr�c�dant la 7.4, les sous-requ�tes ont �t� jointes
-   avec des jointures externes en parcourant s�quentiellement le r�sultat
-   de la sous-requ�te pour chaque ligne de la requ�te externe. Si la
-   sous-requ�te renvoit quelques lignes et que la requ�te externe en
-   renvoit plein, IN sera plus rapide. Pour acc�l�rer les autres
-   requ�tes, remplacez IN avec EXISTS :
-    SELECT *
-    FROM table
-    WHERE colonne IN (SELECT souscolonne FROM soustable);
-
-   to:
-    SELECT *
-    FROM table
-    WHERE EXISTS (SELECT souscolonne FROM soustable WHERE souscolonne = colonne);
-
-   Pour que ceci soit rapide, souscolonne doit �tre une colonne index�e.
-   
-   A partir de la version 7.4, IN utilise actuellement les m�mes
-   techniques sophistiqu�es de jointures comme des requ�tes normales et
-   est pr�f�r� � l'utilisation de EXISTS.
-   
-    4.23) Comment puis-je r�aliser une jointure externe ?
-    
-   PostgreSQL supporte les jointures externes en utilisant la syntaxe SQL
-   standard. Voici deux exemples :
-    SELECT *
-    FROM t1 LEFT OUTER JOIN t2 ON (t1.col = t2.col);
-
-   or
-    SELECT *
-    FROM t1 LEFT OUTER JOIN t2 USING (col);
-
-   Ces requ�tes identiques joignent t1.col � t2.col et renvoient toute
-   colonne non jointe de t1 (celles sans correspondance dans t2). Une
-   jointure droite (RIGHT join) ajoutera les lignes non jointes de t2.
-   Une jointure compl�te (FULL join) renverra les lignes correspondantes
-   ainsi que les lignes non jointes de t1 et t2. Le mot cl� OUTER est
-   optionnelle et assum� dans le cas de jointure LEFT, RIGHT et FULL. Les
-   jointures ordinaires sont appel�es des jointures INNER.
-   
-   Lors des pr�c�dentes versions, les jointures externes peuvent �tre
-   simul�es en utilisant UNION et NOT IN. Par exemple, lors d'une
-   jointure de tab1 et tab2, la requ�te suivante r�alise une jointure
-   externe, outer, des deux tables :
-    SELECT tab1.col1, tab2.col2
-    FROM tab1, tab2
-    WHERE tab1.col1 = tab2.col1
-    UNION ALL
-    SELECT tab1.col1, NULL
-    FROM tab1
-    WHERE tab1.col1 NOT IN (SELECT tab2.col1 FROM tab2)
-    ORDER BY col1
-
-    4.24) Comment puis-je lancer des requ�tes utilisant plusieurs bases de
-    donn�es ?
-    
-   Il n'existe pas de moyens de lancer des requ�tes sur une autre base
-   que la courante. Comme PostgreSQL charge des catalogues syst�mes
-   sp�cifiques � la base de donn�es, sa r�action aux requ�tes inter-base
-   de donn�es est incertaine.
-   
-   contrib/dblink permet les requ�tes entre bases de donn�es en utilisant
-   des fonctions. Bien s�r un client peut r�aliser des connexions
-   simultan�es � plusieurs bases de donn�es et joindre les r�sultats du
-   c�t� client.
-   
-    4.25) Comment puis-je renvoyer plusieurs lignes ou colonnes � partir d'une
-    fonction?
-    
-   A partir de la 7.3, vous pouvez facilement renvoyer plusieurs lignes
-   ou colonnes � partir d'une fonction,
-   http://techdocs.postgresql.org/guides/SetReturningFunctions.
-   
-    4.26) Pourquoi ne puis-je pas cr�er/supprimer des tables temporaires dans
-    les fonctions PL/PgSQL de fa�on stable ?
-    
-   PL/PgSQL cache le contenu des fonctions et un effet de bord malheureux
-   est que si une fonction PL/PgSQL acc�de � une table temporaire, que
-   cette table est ensuite supprim�e et recr��e, et que la fonction est
-   appel�e de nouveau, la fonction �chouera car le contenu de la fonction
-   cach�e pointera toujours vers l'ancienne table temporaire. La solution
-   revient � utiliser EXECUTE pour l'acc�s aux tables temporaires avec
-   PL/PgSQL. Ceci obligera l'analyse de la requ�te � chaque fois.
-   
-    4.27) Quelles options de cryptage sont disponibles ?
-    
-     * contrib/pgcrypto contient de nombreuses fonctions de cryptage, �
-       utiliser dans des requ�tes SQL.
-     * Pour crypter une transmission entre le client et le serveur, le
-       serveur doit avoir positionn� l'option ssl � true dans
-       postgresql.conf, et un enregistrement applicable host ou hostssl
-       doit exister dans pg_hba.conf, et le sslmode du client ne doit pas
-       �tre d�sactiv�e. Notez qu'il est aussi possible d'utiliser un
-       transport crypt� d'une troisi�me partie, tel que stunnel ou ssh,
-       plut�t que les connexions SSL natives de PostgreSQL.
-     * Les mots de passe des utilisateurs sont automatiquement crypt�s
-       depuis la version 7.3. Pour les versions pr�c�dentes, vous devez
-       activer l'option PASSWORD_ENCRYPTION dans postgresql.conf.
-     * Le serveur peut fonctionner avec un syst�me de fichiers crypt�s.
-     _________________________________________________________________
-   
-                             Etendre PostgreSQL
-                                      
-    5.1) J'ai �crit une fonction utilisateur. Lorsque je l'ex�cute avec psql,
-    pourquoi cela finit-il avec un dump core ?
-    
-   Il peut y avoir plusieurs raisons. Essayez tout d'abord votre fonction
-   utilisateur dans un programme de test.
-   
-    5.2) Comment puis-je ajouter de bons nouveaux types ou fonctions �
-    PostgreSQL ?
-    
-   Envoyez vos extensions � la liste de diffusion pgsql-hackers, elles
-   atterriront �ventuellement dans le sous-r�pertoire contrib/.
-   
-    5.3) Comment faire pour �crire une fonction C qui renvoie un tuple ?
-    
-   Dans les versions de PostgreSQL � partir de 7.3, les fonctions qui
-   renvoient une table sont totalement support�es en C, PL/PgSQL, et SQL.
-   Voir le Guide du Programmeur pour plus d'information. Un exemple de
-   fonction renvoyant une table d�finie en C se trouve �
-   contrib/tablefunc.
-   
-    5.4) J'ai modifi� un fichier source. Pourquoi ma recompilation ne voit-elle
-    pas les modifications ?
-    
-   Les Makefiles n'ont pas les d�pendances ad�quates pour les fichiers
-   d'en-t�te. Il vous faut faire make clean puis un autre make. Si vous
-   utilisez GCC, vous pouvez utiliser l'option --enable-depend de
-   configure pour que le compilateur calcule les d�pendances
-   automatiquement.
diff --git a/doc/FAQ_german b/doc/FAQ_german
deleted file mode 100644
index 1459e5a08c..0000000000
--- a/doc/FAQ_german
+++ /dev/null
@@ -1,978 +0,0 @@
-
-                  H�ufig gestellte Fragen (FAQ) zu PostgreSQL
-                                       
-   Current maintainer: Bruce Momjian ([email protected]).
-   
-   Deutsche �bersetzung von Ian Barwick ([email protected]).
-   
-   Letzte Aktualisierung der deutschen �bersetzung: Fr., den 19.10.2007,
-   17:00 MEZ
-   
-   Die aktuellste Version dieses Dokuments liegt auf der
-   PostgreSQL-Website:
-     * http://www.postgresql.org/docs/faqs.FAQ.html (engl.)
-     * http://www.postgresql.org/docs/faqs.FAQ_german.html (dt.)
-       
-   �bersetzungen dieses Dokuments in anderen Sprachen sowie plattform-
-   spezifische FAQs k�nnen unter http://www.postgresql.org/docs/faq/
-   eingesehen werden.
-     _________________________________________________________________
-   
-                             Allgemeine Fragen
-                                      
-   1.1) Was ist PostgreSQL? Wie wird es ausgesprochen?
-   1.2) Wer kontrolliert PostgreSQL?
-   1.3) Welchem Copyright unterliegt PostgreSQL?
-   1.4) Auf welchen Plattformen l�uft PostgreSQL?
-   1.5) Woher bekomme ich PostgreSQL?
-   1.6) Was ist die neueste Version von PostgreSQL?
-   1.7) Wo bekomme ich Support f�r PostgreSQL?
-   1.8) Wie kann ich einen Fehlerbericht abgeben?
-   1.9) Wie erfahre ich von bekannten Bugs oder fehlenden Features?
-   1.10) Welche Dokumentation ist f�r PostgreSQL verf�gbar?
-   1.11) Wie kann ich SQL lernen?
-   1.12) Wie kann ich im Entwicklerteam mitarbeiten?
-   1.13) Wie l�uft PostgreSQL im Vergleich zu anderen Datenbanksystemen?
-   1.14) Kommt PostgreSQL mit den Anpassungen der Sommerzeit in
-   verschiedenen L�ndern klar?
-   
-                        Fragen zu Benutzerprogrammen
-                                      
-   2.1) Welche Schnittstellen gibt es f�r PostgreSQL?
-   2.2) Wie kann man PostgreSQL mit einer Website nutzen?
-   2.3) Hat PostgreSQL eine grafische Benutzerschnittstelle?
-   
-                           Administrative Fragen
-                                      
-   3.1) Wie installiere ich PostgreSQL woanders als in /usr/local/pgsql?
-   3.2) Wie regle ich Zugriffe von anderen Rechnern?
-   3.3) Wie kann ich eine bessere Performanz erreichen?
-   3.4) Welche Debugging-Funktionen sind f�r PostgreSQL verf�gbar?
-   3.5) Ich bekomme die Meldung "Sorry, too many clients", wenn ich eine
-   Verbindung aufzubauen versuche. Warum?
-   3.6) Wie wird PostgreSQL aktualisiert?
-   3.7) Welche Hardware eignet sich f�r den Betrieb mit PostgreSQL?
-   
-                             Fragen zum Betrieb
-                                      
-   4.1) Wie w�hle ich per SELECT-Anweisung nur die ersten paar Zeilen
-   bzw. eine beliebige Zeile in einer Abfrage aus?
-   4.2) Wie finde ich heraus, welche Tabellen, Indexe, Datenbanken oder
-   Benutzer in der Datenbank definiert sind? Wie bekomme ich die von psql
-   verwendeten Abfragen?
-   4.3) Wie �ndere ich den Datentyp einer Spalte?
-   4.4) Was ist die Maximalgr��e f�r eine Zeile, eine Tabelle, eine
-   Datenbank?
-   4.5) Wieviel Plattenplatz wird ben�tigt, um die Daten aus einer
-   typischen Textdatei abzuspeichern?
-   4.6) Meine Abfragen sind langsam oder benutzen die Indexe nicht.
-   Warum?
-   4.7) Auf welche Weise kann ich sehen, wie der Abfrage-Optimierer meine
-   Abfrage auswertet?
-   4.8) Wie verfahre ich bei der Suche mit regul�ren Ausdr�cken und bei
-   einer Suche, bei der Gro�- und Kleinschreibweisen ignoriert werden?
-   Wie verwende ich einen Index bei solchen Suchabfragen?
-   4.9) Wie ermittle ich in einer Abfrage, ob ein Feld NULL ist?
-   4.10) Was ist der Unterschied zwischen den verschiedenen CHAR-Typen?
-   4.11.1) Wie erzeuge ich ein serielles Feld mit automatischer Erh�hung
-   des Wertes?
-   4.11.2) Wie bekomme ich den Wert einer SERIAL-Sequenz?
-   4.11.3) F�hrt currval() zu einer Race-Condition mit anderen Nutzern?
-   4.11.4) Warum werden die Sequenzwerte nach einem Transaktionsabbruch
-   nicht zur�ckgesetzt? Warum gibt es L�cken in der Nummerierung meiner
-   Sequenz-/SERIAL-Spalte?
-   4.12) Was ist ein OID? Was ist ein CTID?
-   4.13) Wieso bekomme ich den Fehler: "FATAL: Memory exhausted in
-   AllocSetAlloc()"?
-   4.14) Wie kann ich feststellen, welche PostgreSQL-Version bei mir
-   l�uft?
-   4.15) Wie kann ich eine Spalte erstellen, deren Default-Wert immer die
-   aktuelle Uhrzeit enthalten soll?
-   4.16) Wie f�hre ich eine OUTER JOIN durch?
-   4.17) Wie kann ich Abfragen �ber mehrere Datenbanken hinweg ausf�hren?
-   4.18) Wie kann ich mehrere Zeilen bzw. Spalten von einer Funktion
-   zur�ckgeben lassen?
-   4.19) Warum bekomme ich eine Fehlermeldung wie
-   "relation with OID ##### does not exist" wenn ich tempor�re Tabellen
-   in
-   PL/PgSQL-Funktionen benutze?
-   4.20) Welche Replikationsl�sungen gibt es?
-   4.21) Warum werden die Tabellen- und Spaltennamen in meiner Abfrage
-   nicht erkannt? Warum werden Gro�buchstaben umgewandelt?
-     _________________________________________________________________
-   
-                             Allgemeine Fragen
-                                      
-  1.1) Was ist PostgreSQL? Wie wird es ausgesprochen?
-  
-   Die (englische) Aussprache ist "Post-Gres-Q-L". Im allgemeinen
-   Sprachgebrauch hat sich die Kurzform "Postgres" auch durchgesetzt.
-   (F�r diejenigen, die es interessiert: eine MP3-Datei mit der
-   amerikanischen Aussprache befindet sich hier:
-   http://www.postgresql.org/files/postgresql.mp3
-   
-   PostgreSQL ist ein objektrelationales Datenbanksystem, das die Vorz�ge
-   von kommerziellen Datenbanksystemen mit zukunftsweisenden Innovationen
-   kombiniert. PostgreSQL ist freie Software und dessen kompletter
-   Quellcode ist �ffentlich verf�gbar.
-   
-   Die PostgreSQL-Entwicklung wird von einem Team von meist freiwilligen
-   Entwicklern durchgef�hrt. Dieses Team ist f�r die Gesamtentwicklung
-   von PostgreSQL verantwortlich. Es handelt sich um ein
-   Gemeinschaftsprojekt, das nicht von einer bestimmten Firma
-   kontrolliert wird. Lesen Sie die Entwickler-FAQ:
-   http://www.postgresql.org/docs/faqs.FAQ_DEV.html wenn Sie an einer
-   Mitarbeit interessiert sind.
-   
-  1.2) Wer kontrolliert PostgreSQL?
-  
-   Falls Sie nach dem Namen eines etwaigen Inhabers bzw. nach einem
-   allm�chtigen Zentralkommittee suchen - sparen Sie sich die M�he, sowas
-   existiert gar nicht. Es gibt zwar das "Core Committee" sowie
-   Entwickler, die CVS-Schreibberechtigung haben, jedoch haben diese
-   Gruppen eher nur eine administrative Rolle. Das Projekt wird durch die
-   Community gesteuert, die aus den Entwicklern sowie nat�rlich auch den
-   Nutzern besteht - jeder kann daran teilnehmen. (Lesen Sie die
-   Entwickler-FAQ: http://www.postgresql.org/docs/faqs.FAQ_DEV.html wenn
-   Sie an der PostgreSQL-Entwicklung teilnehmen m�chten).
-   
-  1.3) Welchem Copyright unterliegt PostgreSQL?
-  
-   PostgreSQL wird unter der klassischen BSD-Lizenz herausgegeben. Im
-   Grunde genommen erlaubt diese den Nutzern, beliebig mit dem Code
-   umzugehen, auch der Weiterverkauf von Bin�rversionen ohne Quellcode
-   ist erlaubt. Die einzige Einschr�nkung besteht darin, dass PostgreSQL
-   auf keinen Fall f�r etwaige Probleme mit der Software haftet. Au�erdem
-   mu� der Copyright- Text in allen Kopien der Software enthalten sein.
-   Dies ist der Originaltext der BSD-Lizenz:
-   
-   PostgreSQL Data Base Management System
-   
-   Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
-   Portions Copyright (c) 1994-6 Regents of the University of California
-   
-   Permission to use, copy, modify, and distribute this software and its
-   documentation for any purpose, without fee, and without a written
-   agreement is hereby granted, provided that the above copyright notice
-   and this paragraph and the following two paragraphs appear in all
-   copies.
-   
-   IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY
-   FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
-   INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND
-   ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN
-   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   
-   THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
-   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
-   PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
-   CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
-   UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-   
-   Es gilt die Copyright-Klausel im Original!
-   
-  1.4) Auf welchen Plattformen l�uft PostgreSQL?
-  
-   Normalerweise kann PostgreSQL auf jeder modernen UNIX-kompatiblen
-   Plattform eingesetzt werden. Diejenigen Plattformen, die bei der
-   jeweiligen Versionsfreigabe getestet wurden, sind in den
-   Installationsanleitungen aufgelistet.
-   
-   PostgreSQL l�uft auch auf Microsoft NT-basierten Betriebssystemen wie
-   Windows 2000 SP4, XP und Server 2003. Ein vorgefertigtes
-   Installationspaket kann von http://pgfoundry.org/projects/pginstaller
-   heruntergeladen werden. DOS-basierte Windows-Versionen (Win95, Win98,
-   WinMe) k�nnen PostgreSQL nur mit Hilfe der Cygwin-Umgebung ausf�hren.
-   
-   Eine Portierung f�r Novell Netware 6 gibt es unter
-   http://forge.novell.com sowie eine OS/2 (eComStation) version unter
-   http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&button=Search&key=postgre
-   SQL&stype=all&sort=type&dir=%2F.
-   
-  1.5) Woher bekomme ich PostgreSQL?
-  
-   Per Web-Browser hier: http://www.postgresql.org/ftp/ und per FTP hier:
-   ftp://ftp.postgresql.org/pub/.
-   
-  1.6) Was ist die neueste Version von PostgreSQL?
-  
-   Die neueste Version von PostgreSQL ist 8.2.5.
-   
-   Die Freigabe einer neuen Hauptversion erfolgt in der Regel j�hrlich,
-   kleinere Korrekturversionen alle paar Monaten.
-   
-  1.7) Wo bekomme ich Support f�r PostgreSQL?
-  
-   Die PostgreSQL-Community bietet Unterst�tzung per Mailing-Liste. Die
-   Web-Seite http://www.postgresql.org/community/lists/ bietet einen
-   �berblick. Die Listen general und bugs bieten einen guten Einstieg.
-   
-   Eine deutschsprachige Mailing-Liste gibt es hier:
-   http://archives.postgresql.org/pgsql-de-allgemein/.
-   
-   Der wichtigsten IRC-Channel ist #postgresql auf Freenode
-   (irc.freenode.net). Unter UNIX/Linux k�nnen Sie mit z.B. irc -c
-   '#postgresql' "$USER" irc.freenode.net. daran teilnehmen. Auf Freenode
-   gibt es einen spanischsprachigen Channel #postgresql-es, einen
-   franz�sischen, #postgresqlfr sowie einen brasilianischen,
-   #postgresql-br . Es gibt au�erdem einen PostgreSQL-Channel bei EFNet.
-   
-   Eine Liste von Unternehmen, die Support f�r PostgreSQL auf
-   kommerzieller Basis leisten, kann unter
-   http://www.postgresql.org/support/professional_support eingesehen
-   werden.
-   
-  1.8) Wie kann ich einen Fehlerbericht abgeben?
-  
-   Nutzen Sie das Formular unter
-   http://www.postgresql.org/support/submitbug. Schauen Sie aber vorher
-   unter ftp://ftp.postgresql.org/pub/ nach, ob es mittlerweile eine
-   neuere PostgreSQL-Version gibt, in der der Fehler behoben wurde.
-   
-   Bugs, die �ber das Formular bzw. eine der Mailing-Listen
-   bekanntgegeben wurden, erhalten typischerweise einer der folgenden
-   Reaktionen:
-     * es ist kein Bug, der Grund wird benannt
-     * es ist ein bereits bekannter Bug, der bereits auf der TODO-Liste
-       aufgenommen wurde
-     * der Bug wurde in der aktuellen Version behoben
-     * der Bug wurde bereits behoben, befindet sich aber noch nicht in
-       einer offiziell ver�ffentlichten Version
-     * es wird um eingehendere Informationen gebeten, z.B.:
-          + Betriebssystem
-          + PostgreSQL-Version
-          + reproduzierbarer Fallbeispiel
-          + Debugging-Information
-          + Debugger-Backtrace-Ausgabe
-     * der Bug ist neu. Folgendes k�nnte passieren:
-          + ein Patch wird erstellt und in der n�chsten Version
-            eingebaut;
-          + oder der Bug kann nicht sofort behoben werden und wird auf
-            die TODO-Liste gesetzt
-       
-  1.9) Wie erfahre ich von bekannten Bugs oder fehlenden Features?
-  
-   PostgreSQL unterst�tzt eine erweiterte Teilmenge von SQL:2003. Siehe
-   unsere TODO-Liste unter http://www.postgresql.org/docs/faqs.TODO.html
-   f�r eine Auflistung der bekannten Bugs, fehlenden Features und
-   zuk�nftigen Pl�ne.
-   
-   Eine Anfrage nach einem neuen Feature f�hrt normalerweise zu einer der
-   folgenden Antworten:
-     * das Feature ist bereits auf der TODO-Liste
-     * das Feature ist nicht w�nschenswert, weil:
-          + es vorhandene Funktionalit�t dupliziert, welche bereits dem
-            SQL-Standard folgt
-          + es w�rde die Komplexit�t der Code-Basis erh�hen, ohne
-            nennenswerte Vorteile zu bringen
-          + es w�re unsicher bzw. unzuverl�ssig
-     * das neue Feature wird der TODO-Liste hinzugef�gt
-       
-   PostgreSQL verwendet kein Bugtracking-System, da es sich als
-   effizienter erwiesen hat, E-Mails direkt zu beantworten und die
-   TODO-Liste aktuell zu halten. In der Praxis werden Bugs sehr schnell
-   beseitigt, und diejenigen Bugs, die Auswirkungen auf eine gro�e Anzahl
-   von Nutzern haben, werden meist kurzfristig korrigiert. Der einzige
-   �berblick �ber alle �nderungen, Verbesserungen und Korrekturen in
-   einer PostgreSQL-Version befindet sich in den CVS-Log-Meldungen. Auch
-   die Release-Notes listen nicht jede �nderung in der Software auf.
-   
-  1.10) Welche Dokumentation ist f�r PostgreSQL verf�gbar?
-  
-   PostgreSQL bietet umfangreiche Dokumentation, darunter ein gro�es
-   Handbuch, man-Pages und einige kleine Testprogramme. Siehe das /doc-
-   Verzeichnis. Ausserdem sind alle Handb�cher online unter
-   http://www.postgresql.org/docs/ verf�gbar.
-   
-   Zwei B�cher zu PostgreSQL sind online verf�gbar unter
-   http://www.postgresql.org/docs/books/awbook.html und
-   http://www.commandprompt.com/ppbook/ .
-   
-   Eine Liste lieferbarer PostgreSQL-B�cher befindet sich unter
-   http://www.postgresql.org/docs/books Diverse technische Artikel
-   befinden sich unter http://www.postgresql.org/docs/techdocs .
-   
-   psql hat einige n�tzliche \d-Befehle, um Informationen �ber Typen,
-   Operatoren, Funktionen, Aggregate, usw. zu zeigen.
-   
-   Die PostgreSQL-Website enth�lt noch mehr Dokumentation.
-   
-  1.11) Wie kann ich SQL lernen?
-  
-   Die oben erw�hnten PostgreSQL-spezifische B�cher bieten einen guten
-   Einstieg. Viele PostgreSQL-Anwender m�gen "The Practical SQL Handbook"
-   (Bowman et al., Addison Wesley). Andere dagegen m�gen "The Complete
-   Reference SQL" (Groff et al., McGraw-Hill).
-   
-   Es gibt ausserdem einige n�tzliche Online-Tutorials:
-     * http://www.intermedia.net/support/sql/sqltut.shtm
-     * http://sqlcourse.com
-     * http://www.w3schools.com/sql/default.asp
-     * http://mysite.verizon.net/Graeme_Birchall/id1.html
-       
-  1.12) Wie kann ich im Entwicklerteam mitarbeiten?
-  
-   Lesen Sie in der Entwickler-FAQ unter
-   http://www.postgresql.org/docs/faqs.FAQ_DEV.html nach.
-   
-  1.13) Wie l�uft PostgreSQL im Vergleich zu anderen Datenbanksystemen?
-  
-   Es gibt verschiedene Methoden, Software zu messen: Eigenschaften,
-   Performanz, Zuverl�ssigkeit, Support und Preis.
-   
-   Eigenschaften
-          PostgreSQL besitzt die meisten Eigenschaften - wie
-          Transaktionen, Unterabfragen (Subqueries), Trigger, Views,
-          referenzielle Integrit�t bei Fremdschl�sseln und verfeinertes
-          Locking - die bei gro�en kommerziellen DBMS vorhanden sind. Es
-          bietet au�erdem einige anderen Eigenschaften, die diese nicht
-          immer haben, wie benutzerbestimmte Typen, Vererbung, Regeln,
-          und die Multi-Versionen-Steuerung zum Verringern
-          konkurrierender Locks.
-          
-   Performanz
-          Die Performanz von PostgreSQL ist mit der von kommerziellen und
-          anderen Open-Source-Datenbanken vergleichbar. In manchen
-          Bereichen ist es schneller, in anderen langsamer. In der Regel
-          betr�gt der Unterschied +/-10%.
-          
-   Zuverl�ssigkeit
-          Es ist selbstredend, dass ein DBMS wertlos ist, wenn es nicht
-          zuverl�ssig arbeitet. Daher bem�hen wir uns, nur streng
-          gepr�ften und best�ndigen Code freizugeben, der nur ein Minimum
-          an Programmfehlern aufweist. Jede Freigabe hat mindestens einen
-          Monat Betatest-Phase hinter sich, und unsere Freigabehistorie
-          beweist, dass wir stabile und solide Versionen freigeben, die
-          im Produktionsbetrieb genutzt werden k�nnen. Wir glauben, dass
-          wir im Vergleich mit anderer Datenbanksoftware vorteilhaft
-          dastehen.
-          
-   Support
-          Unsere Mailinglisten bieten die M�glichkeit, gemeinsam mit
-          einer gro�en Gruppe von Entwicklern und Benutzern m�gliche
-          Probleme zu l�sen. Wir k�nnen nicht immer eine Fehlerbehebung
-          garantieren, kommerzielle DBMS tun dies aber auch nicht. Der
-          direkte Kontakt zur Entwickler- und Benutzergemeinschaft und
-          der Zugriff auf die Handb�cher und den Quellcode erm�glicht
-          einen im Vergleich zu anderen DBMS h�herwertigeren Support. Es
-          gibt jedoch auch Anbieter von kommerziellen Support-Leistungen
-          (siehe FAQ-Punkt 1.7).
-          
-   Preis
-          PostgreSQL ist frei verf�gbar, sowohl f�r die kommerzielle wie
-          auch f�r die nicht-kommerzielle Nutzung. Sie k�nnen den
-          PostgreSQL-Code ohne Einschr�nkungen (au�er denjenigen, die in
-          der oben angegebene BSD-artigen Lizenz erw�hnt werden) in Ihr
-          Produkt integrieren.
-          
-  1.14) Kommt PostgreSQL mit den Anpassungen der Sommerzeit in verschiedenen
-  L�ndern klar?
-  
-   �nderungen bei der US-Sommerzeit sind ab PostgreSQL Version 8.0.4
-   ber�cksichtigt. �nderungen in Canada und Western Australia sind ab
-   8.0.10 bzw. 8.1.6 ber�cksichtigt. PostgreSQL-Versionen vor 8.0 nutzen
-   die Zeitzonendatenbank des Betriebssystems, um die Sommerzeit zu
-   berechnen.
-   
-                        Fragen zu Benutzerprogrammen
-                                      
-  2.1) Welche Schnittstellen gibt es f�r PostgreSQL?
-  
-   Die PostgreSQL-Installation stellt nur Schnittstellen f�r C und
-   Embedded C bereit. Alle weitere Schnittstellen sind unabh�ngige
-   Projekte, die einzeln heruntergeladen werden werden m�ssen. Diese
-   Trennung erm�glicht individuelle Entwickler-Teams und
-   Entwicklungszyklen f�r die jeweiligen Projekte.
-   
-   Einige Programmiersprachen wie PHP haben eine PostgreSQL-
-   Schnittstelle bereits eingebaut. Schnittstellen f�r Sprachen wie Perl,
-   TCL, Python und viele anderen sind unter http://gborg.postgresql.org
-   im Bereich Drivers/Interfaces verf�gbar sowie per Internet-Suche.
-   
-  2.2) Wie kann man PostgreSQL in einer Website nutzen?
-  
-   Eine nette Einf�hrung zu datenbank-gest�tzten Webseiten kann unter
-   http://www.webreview.com (engl.) eingesehen werden.
-   
-   F�r die Web-Integration ist PHP eine ausgezeichnete Schnittstelle. PHP
-   gibt es bei http://www.php.net
-   
-   F�r komplexere Aufgaben bietet sich die Perl-Schnittstelle mit CGI.pm
-   oder mod_perl.
-   
-  2.3) Hat PostgreSQL eine grafische Benutzerschnittstelle?
-  
-   Es gibt eine gro�e Anzahl von GUI-Programmen f�r PostgreSQL - sowohl
-   kommerziell als auch Open-Source. Eine ausf�hrliche Liste befindet
-   sich unter http://www.postgresql.org/docs/techdocs.54 .
-     _________________________________________________________________
-   
-                           Administrative Fragen
-                                      
-  3.1) Wie installiere ich PostgreSQL woanders als in /usr/local/pgsql?
-  
-   Bei der Ausf�hrung von configure die Option --prefix mit dem
-   Zielverzeichnis angeben.
-   
-  3.2) Wie regle ich Zugriffe von anderen Rechnern?
-  
-   PostgreSQL ist standardm��ig so eingestellt, dass Verbindungen nur vom
-   lokalen Rechner �ber Unix Domain Sockets bzw. TCP/IP m�glich sind.
-   Verbindungen von anderen Rechnern werden erst dann erm�glicht, wenn
-   Sie in der Datei postgresql.conf die Einstellung listen_addresses
-   anpassen, in der Datei $PGDATA/pg_hba.conf host-basierte
-   Authentifizierung einschalten und den Server neu starten.
-   
-  3.3) Wie kann ich eine bessere Performanz erreichen?
-  
-   Es gibt drei gro�e Bereiche, in denen Performanzverbesserungen erzielt
-   werden k�nnen:
-   
-   Abfrageoptimierung
-          Die Modifizierung von Abfragen kann eine bessere Performanz
-          erzielen:
-          
-          + Erstellung von Indexen, einschliesslich partieller Indexe
-            sowie Expressionsindexe
-          + Einsatz von COPY anstelle multipler INSERT-Anweisungen
-          + Gruppierung von mehreren Abfragen innerhalb einer
-            Transaktion, um Aufwand beim Abschluss von Transaktionen
-            einzusparen
-          + Einsatz von CLUSTER beim Holen von einer gro�en Anzahl von
-            Datenreihen aus einem Index
-          + Einsatz von LIMIT, um eine Untermenge der Abfragen-
-            ergebnisse zur�ckzuliefern
-          + Einsatz von vorbereiteten Befehlen (prepared queries)
-          + Einsatz von ANALYZE, um die Datenbankstatistik f�r den
-            Abfragenplaner aktuell zu halten
-          + Regelm��iger Einsatz von VACUUM bzw. pg_autovacuum
-          + Bei gro�en Datenver�nderungen die L�schung von Indexen
-            
-   Server-Konfiguration
-          Einige Einstellungen in der Datei postgresql.conf wirken auf
-          die Performanz aus. Das Handbuch enth�lt unter
-          http://www.postgresql.org/docs/current/static/runtime-config.ht
-          ml eine komplette Auflistung. Kommentare zu den jeweiligen
-          Einstellungen gibt es unter
-          http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_co
-          nf_e.html und
-          http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html.
-          
-   Hardware-Auswahl
-          Die Auswirkung von Hardware auf Performanz wird unter
-          http://momjian.us/main/writings/pgsql/hw_performance/index.html
-          und http://www.powerpostgresql.com/PerfList/ erl�utert.
-          
-  3.4) Welche Debugging-Funktionen sind f�r PostgreSQL verf�gbar?
-  
-   Unter den Optionen f�r die Server-Konfigurierung gibt es zahlreiche
-   log_*-Variablen, die die Ausgabe von Abfrage- und Prozessstatistiken
-   erm�glichen. Diese k�nnen f�r Debugging-Zwecke sowie Performanz-Tests
-   sehr n�tzlich sein.
-   
-  3.5) Ich bekomme die Meldung "Sorry, too many clients", wenn ich eine
-  Verbindung aufzubauen versuche. Warum?
-  
-   Ihr System hat die maximal zul�ssige Anzahl von Datenbankverbindungen
-   erreicht (Voreinstellung 100). Sie m�ssen die maximale Anzahl der
-   gleichzeitig ausf�hrbaren Backend-Prozesse hochsetzen, indem Sie in
-   postgresql.conf den Wert max_connections �ndern und den Server
-   neustarten.
-   
-  3.6) Wie wird PostgreSQL aktualisiert?
-  
-   Allgemeine Informationen zur Aktualisierung von PostgreSQL gibt es auf
-   der Seite http://www.postgresql.org/support/versioning. Detaillierte
-   technische Informationen gibt es auf der Seite
-   http://www.postgresql.org/docs/current/static/install-upgrading.html
-   
-  3.7) Welche Hardware eignet sich f�r den Betrieb mit PostgreSQL?
-  
-   PostgreSQL l�uft auf fast jeder Hardware-Kombination. Im PC-Bereich
-   gibt es allerdings sehr gro�e Abweichungen in der Qualit�t. F�r einen
-   Arbeitsplatz- oder Entwicklungsrechner mag dies nicht so bedeutend
-   sein, im Server-Betrieb jedoch lohnt sich auf jeden Fall die
-   Investition in teurere Bestandteile (Stichw�rter ECC-Speicher, SCSI,
-   Hauptplatinen und Netzteile von namhaften Herstellern). Nutzen Sie
-   unsere Mailing-Listen, um Hardware-Optionen zu diskutieren.
-     _________________________________________________________________
-   
-                             Fragen zum Betrieb
-                                      
-  4.1) Wie w�hle ich per SELECT-Anweisung nur die ersten paar Zeilen bzw. eine
-  beliebige Zeile in einer Abfrage aus?
-  
-   Wenn Sie bei der Ausf�hrung der Abfrage die Anzahl der anzufordenden
-   Reihen bereits kennen, nutzen Sie LIMIT. Wenn die ORDER BY- Anweisung
-   mit einem Index verwendet wird, ist es m�glich, dass die gesamte
-   Abfrage nicht ausgef�hrt werden muss. Wenn Sie die Anzahl der der
-   anzufordenden Reihen nicht kennen, verwenden Sie einen Cursor und
-   FETCH.
-   
-   Um eine beliebige Zeile auszuw�hlen, nutzen Sie ORDER BY random():
-       SELECT spalte
-         FROM tabelle
-     ORDER BY random()
-        LIMIT 1
-
-
-  4.2) Wie finde ich heraus, welche Tabellen, Indexe, Datenbanken oder Benutzer
-  in der Datenbank definiert sind? Wie bekomme ich die von psql verwendeten
-  Abfragen?
-  
-   In psql zeigt der Befehl \dt eine Liste der Datenbanktabellen. Weitere
-   psql-Befehle lassen sich mit \? anzeigen. Sie k�nnen sich die Datei
-   pgsql/src/bin/psql/describe.c mit dem Quellcode f�r psql ansehen. Sie
-   enth�lt die SQL-Abfragen, die die Backslash-Kommandos (\) ausf�hren.
-   Sie k�nnen psql auch mit der -E Option starten. Danach gibt psql die
-   Abfragen aus, die es bei der Ausf�hrung der Befehle benutzt. Au�erdem
-   biete PostgreSQL ein SQL-kompatibles INFORMATION SCHEMA, das
-   Metainformation �ber die Datenbank zur Verf�gung stellt.
-   
-   Mit psql -l k�nnen Sie alle Datenbanken anzeigen lassen.
-   
-   Die Datei pgsql/src/tutorial/syscat.source enth�lt au�erdem viele
-   SELECT- Abfragen, mit deren Hilfe man Information �ber die
-   Systemtabellen erhalten kann.
-   
-  4.3) Wie �ndere ich den Datentyp einer Spalte?
-  
-   Ab Version 8.0 kann der Datentyp einer Spalte mit ALTER TABLE ALTER
-   COLUMN TYPE ge�ndert werden, sofern der neue Datentyp die Werte des
-   alten Datentype aufnehmen kann.
-   
-   Bei fr�heren Versionen gehen Sie wie folgt vor:
-       BEGIN;
-       ALTER TABLE tabelle ADD COLUMN neue_spalte neuer_datentyp;
-       UPDATE tabelle SET neue_spalte = CAST(alte_spalte AS neuer_datentyp);
-       ALTER TABLE tabelle DROP COLUMN alte_spalte;
-       COMMIT;
-
-
-   Um den Speicherplatz freizugeben, der von der gel�schten Spalte
-   verwendet wurde, f�hren Sie VACUUM FULL aus.
-   
-  4.4) Was ist die Maximalgr��e f�r eine Zeile, eine Tabelle, eine Datenbank?
-  
-   Es bestehen folgende Obergrenzen:
-    Maximale Gr��e eine Datenbank?           unbeschr�nkt (es existieren
-                                               Datenbanken mit 32 TB)
-    Maximale Gr��e einer Tabelle?            32 TB
-    Maximale Gr��e einer Zeile?              400 GB
-    Maximale Gr��e einer Spalte?             1 GB
-    Maximale Anzahl von Zeilen in einer Tabelle?
-                                             unbeschr�nkt
-    Maximale Anzahl von Spalten in einer Tabelle?
-                                             250-1600 je nach Spaltentyp
-    Maximale Anzahl von Indexen f�r eine Tabelle?
-                                             unbeschr�nkt
-
-   Selbstverst�ndlich sind dies theoretische Werte, die oft durch die
-   verf�gbaren Platten- und Speicherressourcen beschr�nkt werden. Extreme
-   Gr��en k�nnen zu Leistungseinbu�en f�hren.
-   
-   Die maximale Tabellengr��e von 32 TB ben�tigt keine
-   Large-File-Unterst�tzung im Betriebssystem. Gro�e Tabellen werden in
-   Dateien mit einer Gr��e von je 1 GB aufgeteilt, wodurch etwaige
-   dateisystem-bedingte Beschr�nkungen nicht relevant sind.
-   
-   Die maximale Tabellengr��e und die maximale Anzahl von Spalten k�nnen
-   vervierfacht werden, indem man die Default-Blockgr��e auf 32 KB
-   heraufsetzt. Die Tabellengr��e kann auch durch Tabellenpartitionierung
-   vergr��ert werden.
-   
-   Eine Einschr�nkung ist, dass Indexe nur auf Spalten erstellt werden
-   k�nnen, die bis etwa 2.000 Zeichen gro� sind. Um auf gr��ere Spalten
-   eine UNIQUE-Constraint setzen zu k�nnen, nutzen Sie einen funktionalen
-   Index mit dem MD5-Hash-Wert der Spalte. Um innerhalb einer gro�en, mit
-   Text belegten Spalte suchen zu k�nnen, verwenden Sie einen
-   Volltext-Index.
-   
-  4.5) Wieviel Plattenplatz wird ben�tigt, um die Daten aus einer typischen
-  Textdatei abzuspeichern?
-  
-   Eine PostgreSQL-Datenbank kann beim Abspeichern einer einfachen
-   Textdatei bis zu f�nfmal mehr Platz gegen�ber der eigentlichen Gr��e
-   der Datei beanspruchen.
-   
-   Betrachten wir eine Datei mit 100.000 Zeilen mit einem Integer und
-   einer Textbeschreibung pro Zeile. Gehen wir davon aus, dass die
-   durchschnittliche L�nge der Textbeschreibung 20 Byte betr�gt. Die
-   einfache Datei w�rde 2,8 MB gro� sein. Die Gr��e der
-   PostgreSQL-Datenbankdatei, die diese Daten enth�lt, liegt ungef�hr bei
-   5,2 MB:
-    24 Bytes: jeder Zeilenkopf (ungef�hr)
-   +24 Bytes: ein Integer-Feld und ein Textfeld
-   + 4 Bytes: Zeiger auf der Datenseite auf den Tupel
-   -----------------------------------------------
-    52 Bytes pro Zeile
-
-   Die Gr��e einer Datenseite in PostgreSQL betr�gt 8192 Bytes (8 KB),
-   also:
-   8192 Bytes pro Seite
-   ---------------------   =  146 Zeilen pro Seite (abgerundet)
-     52 Bytes pro Zeile
-
-   100.000 Datenzeilen
-   ------------------------  =  685 Datenbankseiten (aufgerundet)
-       158 Zeilen pro Seite
-
-   633 Datenbankseiten * 8192 Bytes pro Seite  =  5,185,536 bytes (5,2 MB)
-
-   Indexe beanspruchen nicht so viel Platz. Da sie jedoch die Daten
-   beinhalten, die sie indizieren, k�nnen auch sie sehr gro� werden.
-   
-   NULL-Werte werden als Bitmaps gespeichert, wodurch sie sehr wenig
-   Platz in Anspruch nehmen.
-   
-  4.6) Meine Abfragen sind langsam oder benutzen die Indexe nicht. Warum?
-  
-   Indexe werden nicht automatisch bei jeder Abfrage verwendet. Indexe
-   werden nur dann verwendet, wenn die abzufragende Tabelle eine
-   bestimmte Gr��e �bersteigt, und die Abfrage nur eine kleine
-   Prozentzahl der Tabellenzeilen abfragt. Der Grund hierf�r ist der,
-   dass die durch einen Index verursachten Festplattenzugriffe manchmal
-   l�nger dauern w�rden als ein einfaches Auslesen aller Tabellenzeilen
-   (sequentieller Scan).
-   
-   Um festzustellen, ob ein Index verwendet werden soll, braucht
-   PostgreSQL Statistiken �ber die Tabelle. Diese Statistiken werden
-   durch die Anweisungen VACUUM ANALYZE bzw. ANALYZE berechnet. Anhand
-   der Statistiken kennt der Abfragenoptimierer die Anzahl der
-   Tabellenzeilen und kann besser entscheiden, ob Indexe verwendet werden
-   sollen. Statistiken sind auch bei der Ermittlung der optimalen
-   JOIN-Reihenfolgen und -Methoden wertvoll. Daher sollten diese
-   regelm�ssig durchgef�hrt werden, da sich der Inhalt einer Tabelle ja
-   auch ver�ndert.
-   
-   Indexe werden normalerweise nicht in ORDER BY-Abfrage oder in JOINs
-   verwendet. Ein sequentieller Scan mit anschlie�endem explizitem
-   Sortiervorgang ist normalerweise schneller als ein Index-Scan einer
-   gro�en Tabelle. Jedoch wird bei einer Abfrage, in der LIMIT zusammen
-   mit ORDER BY verwendet wird, oftmals ein Index verwendet, da nur ein
-   kleiner Abschnitt der Tabelle zur�ckgeliefert wird.
-   
-   Sollte es danach aussehen, also ob der Optimierer irrt�mlich einen
-   sequentiellen Scan ausf�hrt, f�hren Sie SET enable_seqscan TO 'off'
-   aus und pr�fen Sie, ob die Indexabfrage dadurch scheller geworden ist.
-   
-   Bei der Nutzung von Wildcard-Operatoren wie LIKE oder ~, k�nnen Indexe
-   nur unter bestimmten Umst�nden verwendet werden:
-     * Das Suchmuster muss sich an Anfang des Strings befinden, d.h.:
-          + LIKE-Suchmuster d�rfen nicht mit % anfangen;
-          + ~ (regul�re Ausdr�cke) m�ssen mit ^ anfangen.
-     * Das Suchmuster darf nicht mit einer Zeichenklasse (z.B. [a-e])
-       beginnen.
-     * Suchmuster, die Gross- und Kleinschreibung nicht ber�cksichtigen
-       (z.B. ILIKE bzw. ~*), verwenden keine Indexe. Stattdessen k�nnen
-       funktionale Indexe verwendet werden, die im Punkt 4.8 beschrieben
-       werden.
-     * Die Standard-Locale "C" muss w�hrend der Datenbank-Initialisierung
-       mit initdb verwendet worden sein, da andere locales den
-       n�chstgr��ten Wert nicht ermitteln k�nnen. Es ist allerdings
-       m�glich, einen besonderen text_pattern_ops-Index f�r solche F�lle
-       zu erstellen.
-       
-   In Versionen vor 8.0 werden Indexe oft nicht benutzt, wenn die
-   jeweiligen Datentypen nicht genau �bereinstimmen. Dies gilt besonders
-   f�r Indexe auf Spalten mit den Datentypen INT2, INT8 und NUMERIC
-   
-  4.7) Auf welche Weise kann ich sehen, wie der Abfrage-Optimierer meine
-  Abfrage auswertet?
-  
-   Vgl. die EXPLAIN Man-Page.
-   
-  4.8) Wie verfahre ich bei der Suche mit regul�ren Ausdr�cken und bei einer
-  Suche, bei der Gro�- und Kleinschreibweisen ignoriert werden? Wie verwende
-  ich einen Index bei solchen Suchabfragen?
-  
-   Der Operator ~ wendet einen regul�ren Ausdruck an und ~* wendet ihn
-   an, ohne die Gro�- und Kleinschreibung zu beachten. Ebenso beachtet
-   LIKE die Gro�- und Kleinschreibung, und ILIKE nicht.
-   
-   Gleichheitsvergleiche, die Gro�- und Kleinschreibung ignorieren,
-   werden in der Regel so ausgedruckt:
-      SELECT *
-        FROM tabelle
-       WHERE LOWER(spalte) = 'abc'
-
-   Hier wird kein normaler Index benutzt. Legt man hingegen einen
-   funktionalen Index an, so wird er auf jeden Fall verwendet:
-      CREATE INDEX tabelle_index ON tabelle (LOWER(spalte))
-
-   Falls der obige Index als einen UNIQUE-Index angelegt wird, k�nnen
-   keine Werte in die Spalte eingef�gt werden, die sich nur durch ihre
-   Gro�- und Kleinschreibung unterscheiden. Um Fehler zu vermeiden mu�
-   ein CHECK-Constraint oder ein Trigger eingesetzt werden.
-   
-  4.9) Wie ermittle ich in einer Abfrage, ob ein Feld NULL ist? Kann nach der
-  NULL-Belegung sortiert werden?
-  
-   Testen Sie die Spalte mit IS NULL bzw. IS NOT NULL.
-      SELECT *
-        FROM tabelle
-       WHERE spalte IS NULL
-
-   Um die Spalte danach zu sortieren, ob sie mit NULL belegt ist oder
-   nicht, verwenden Sie die Bedingungen IS NULL bzw. IS NOT NULL in der
-   ORDER BY-Klausel. Da Bedingungen, die wahr sind, h�her als das
-   Gegenteil sortiert werden, bewirkt die folgende Abfrage, dass die
-   NULL-Spalten zuerst gelistet werden:
-      SELECT *
-        FROM tabelle
-    ORDER BY (spalte IS NOT NULL)
-
-  4.10) Was ist der Unterschied zwischen den verschiedenen CHAR-Typen?
-  
-Typ           interner Name   Bemerkungen
--------------------------------------------------
-VARCHAR(n)    varchar         die Gr��e legt die Maximall�nge fest; kein
-                              Auff�llen mit Leerzeichen
-CHAR(n)       bpchar          mit Leerzeichen gef�llt bis zur angegebenen L�nge
-TEXT          text            keine obere Schranke f�r die L�nge
-BYTEA         bytea           Bytearray mit variabler L�nge (auch f�r
-                              '\0'-Bytes geeignet)
-"char"        char            1 Zeichen
-
-   Der interne Name kommt vor allem in den Systemkatalogen und in manchen
-   Fehlermeldungen vor.
-   
-   Die ersten vier Typen sind "varlena"-Typen (d.h. die ersten vier Bytes
-   geben die L�nge an, gefolgt von den Daten). Daher ist der tats�chlich
-   belegte Platz immer etwas mehr als die deklarierte Feldgr��e.
-   Allerdings wird unter Umst�nden auf diese Datentypen Datenkompression
-   durch das TOAST- Verfahren angewendet, womit der tats�chlich belegte
-   Platz auch geringer als erwartet ausfallen kann.
-   
-   F�r die Speicherung von Zeichenketten variabler L�nge empfiehlt sich
-   VARCHAR(n). Die maximale L�nge eines VARCHAR(n)-Felds wird bei der
-   Tabellendefinition festgelegt. TEXT setzt keine L�ngengrenze,
-   allerdings gibt es eine systembedingte Obergrenze von 1 GB.
-   
-   CHAR(n) ist geeignet f�r die Speicherung von Zeichenketten, die alle
-   die gleiche L�nge haben. Bitte beachten Sie, dass CHAR(n) automatisch
-   Zeichenketten bis zur definierten Feldl�nge mit Leerzeichen ausf�llt,
-   w�hrend bei VARCHAR(n) nur die tats�chlich eingegebene Zeichenkette
-   gespeichert wird.
-   
-   BYTEA ist f�r bin�re Daten, besonders f�r Werte, die NULL-Bytes haben.
-   
-   Alle der hier erw�hnten Typen weisen �hnliche Performanzeigenschaften
-   auf.
-   
-  4.11.1) Wie erzeuge ich ein serielles Feld mit automatischer Erh�hung des
-  Wert?
-  
-   PostgreSQL bietet einen SERIAL-Datentyp. Dieser erzeugt automatisch
-   eine Sequenz auf die angegebene Spalte. Zum Beispiel:
-      CREATE TABLE person (
-          id   SERIAL,
-          name TEXT
-      )
-
-   wird automatisch in:
-      CREATE SEQUENCE person_id_seq;
-      CREATE TABLE person (
-        id   INT4 NOT NULL DEFAULT nextval('person_id_seq'),
-        name TEXT
-      );
-
-   umgewandelt.
-   
-   Die create_sequence Man-Page liefert weitere Informationen �ber
-   Sequenzen.
-   
-  4.11.2) Wie bekomme ich den Wert einer SERIAL-Sequenz?
-  
-   Eine M�glichkeit w�re, mit der nextval()-Funktion den n�chsten
-   SERIAL-Wert von dem Sequenzobjekt vor der Auszuf�hrung einer
-   INSERT-Anweisung anzufordern und ihn dann explizit in die
-   INSERT-Anweisung einzubinden. Anhand der Beispieltabelle in 4.11.1
-   k�nnte dieser Vorgang in einer Pseudosprache so aussehen:
-    new_id = output of execute("SELECT nextval('person_id_seq')");
-    execute("INSERT INTO person (id, name) VALUES (new_id, 'Blaise Pascal')");
-
-   Danach st�nde der neue Wert in der Variablen new_id f�r die Verwendung
-   in weiteren Abfragen zur Verf�gung, zum Beispiel als Fremdschl�ssel
-   zur Tabelle 'person'). Bitte beachten Sie, dass der Name des
-   automatisch erstellten SEQUENCE-Objektes folgenden Name hat:
-   �table�_�serialcolumn�_seq wobei 'table' und 'serialcolumn' die Namen
-   der jeweils betreffenden Tabelle / Spalte darstellen.
-   
-   Als weitere M�glichkeit k�nnen Sie nach einer INSERT-Anweisung den
-   automatisch eingef�gten SERIAL-Wert mit der currval()-Funktion
-   zur�ckgeben lassen:
-    execute("INSERT INTO person (id, name) VALUES (new_id, 'Blaise Pascal')");
-    new_id = output of execute("SELECT currval('person_id_seq')");
-
-  4.11.3) F�hrt currval() zu einer Race-Condition mit anderen Nutzern?
-  
-   Nein. currval() liefert einen Wert zur�ck, der von Ihrer
-   Datenbank-Session bestimmt wird, und der anderen Sessionen nicht zur
-   Verf�gung steht.
-   
-  4.11.4) Warum werden die Sequenzwerte nach einem Transaktionsabbruch nicht
-  zur�ckgesetzt? Warum gibt es L�cken in der Nummerierung meiner
-  Sequenz-/SERIAL-Spalte?
-  
-   Um die gleichzeitige Abarbeitung von Transaktionen zu verbessern,
-   werden Sequenzen gerade nicht f�r andere Transaktionen gesperrt,
-   sondern die Sequenznummern werden den laufenden Transaktionen sofort
-   zugeteilt. L�cken in der Sequenznummerierung werden durch abgebrochene
-   Transaktionen verursacht.
-   
-  4.12) Was ist ein OID? Was ist ein CTID?
-  
-   Jede Zeile, die in PostgreSQL erzeugt wird, bekommt eine eindeutige
-   OID, sofern die Tabelle nicht mit der Option WITHOUT OIDS angelegt
-   wurde. OIDs sind automatisch zugewiesene 4-Byte-Integer, die innerhalb
-   der gesamten Datenbank einmalig sind. Allerdings laufen sie bei einem
-   Wert von ungef�hr 4 Milliarden �ber. PostgreSQL verwendet OIDs, um
-   seine interne Systemtabellen zu verbinden.
-   
-   Um einmalige Idenfikatoren in Datentabellen zu erstellen, wird
-   allerdings empfohlen, statt OIDs Werte zu verwenden, die vonSERIAL-
-   Sequenzen erzeugt werden. SERIAL-Sequenzen sind innerhalb einer
-   Tabelle einmalig und daher weniger anf�llig f�r �berl�ufe. Au�erdem
-   k�nnen 8-Byte-Sequenzwerte mit SERIAL8 erzeugt werden.
-   
-   CTIDs werden benutzt, um bestimmte physikalische Zeilen durch Block
-   und Offset Werte zu identifizieren. CTIDs ver�ndern sich, sobald
-   Zeilen ver�ndert oder zur�ckgeladen werden. Sie werden in
-   Indexeintr�gen benutzt um auf die physikalischen Zeilen zu zeigen.
-   
-  4.13) Wieso bekomme ich einen Fehler: "ERROR: Memory exhausted in
-  AllocSetAlloc()"?
-  
-   Wahrscheinlich gibt es keinen virtuellen Speicher mehr in Ihrem System
-   oder Ihr Kernel hat niedrige H�chstgrenzen f�r bestimmte Ressourcen.
-   Probieren Sie vor dem Start von postmaster folgendes:
-      ulimit -d 262144
-      limit datasize 256m
-
-   Je nach benutzter Shell wird nur einer dieser Befehle erfolgreich
-   ausgef�hrt werden. Auf jedem Fall wird die Grenze des Datensegments
-   f�r Prozesse erh�ht werden und eventuell die erfolgreiche Ausf�hrung
-   der Abfrage erm�glichen. Falls Sie ein Problem mit dem SQL-CLient
-   haben, weil das Backend zu viele Daten zur�ckliefert, versuchen Sie
-   dies vor dem Start des SQL-Clients.
-   
-  4.14) Wie kann ich feststellen, welche PostgreSQL-Version bei mir l�uft?
-  
-   Geben Sie in psql SELECT VERSION(); ein.
-   
-  4.15) Wie kann ich eine Spalte erstellen, deren Default-Wert immer die
-  aktuelle Uhrzeit enthalten soll?
-  
-   Dazu verwenden Sie CURRENT_TIMESTAMP:
-      CREATE TABLE test (x INT, modtime TIMESTAMP DEFAULT CURRENT_TIMESTAMP );
-
-  4.16) Wie f�hre ich eine OUTER JOIN durch?
-  
-   PostgreSQL unterst�tzt OUTER JOINs nach dem SQL- Standardsyntax. Hier
-   zwei Beispiele:
-      SELECT *
-        FROM tabelle_1 t1
-             LEFT OUTER JOIN tabelle_2 t2 ON (t1.spalte = t2.spalte)
-
-   bzw.:
-      SELECT *
-        FROM tabelle_1 t1
-             LEFT OUTER JOIN tabelle_2 t2 USING (spalte)
-
-   Diese identischen Abfragen verkn�pfen tabelle_1 mit tabelle_2 �ber die
-   Spalte 'spalte' und geben au�erdem alle unverkn�pften Zeilen in
-   tabelle_1 (diejenigen, die keine Entsprechung in tabelle_2 haben)
-   zur�ck. Ein RIGHT JOIN w�rde hingegen alle unverkn�pften Zeilen in
-   tabelle_2 hinzuf�gen und ein FULL JOIN w�rde alle verkn�pften Zeilen
-   sowie jeweils alle unverkn�pften Zeilen aus den beiden Tabellen
-   zur�ckliefern. Die Angabe von OUTER ist nicht zwingend und kann in
-   LEFT, RIGHT und FULL-Verkn�pfungen weggelassen werden. Normale
-   Verkn�pfungen sind INNER JOINs.
-   
-  4.17) Wie kann ich Abfragen �ber mehrere Datenbanken hinweg ausf�hren?
-  
-   Es gibt keinen Weg, innerhalb einer Abfrage auf mehr als eine
-   Datenbank zuzugreifen. Da PostgreSQL datenbank-spezifische
-   Systemkataloge l�dt, ist eine datenbank�bergreifende Abfrage nicht
-   m�glich.
-   
-   contrib/dblink ist eine Erweiterung, die datenbank�bergreifende
-   Abfragen �ber Funktionsaufrufe erm�glicht.
-   
-  4.18) Wie kann ich mehrere Zeilen bzw. Spalten von einer Funktion zur�ckgeben
-  lassen?
-  
-   Funktionen k�nnen mehrere Zeilen und Spalten zur�ckgeben, vgl.:
-   http://www.postgresql.org/docs/techdocs.17.
-   
-  4.19) Warum bekomme ich eine Fehlermeldung wie "relation with OID ##### does
-  not exist" wenn ich tempor�re Tabellen in PL/PgSQL-Funktionen benutze?
-  
-   In PostgreSQL-Versionen vor 8.3 verarbeitet PL/PgSQL Funktionen in
-   einer Cache. Dies hat eine unangenehme Nebenwirkung, n�mlich dass wenn
-   eine PL/PgSQL-Funktion auf eine tempor�re Tabelle zugreift, und diese
-   Tabelle anschlie�end gel�scht bzw. neu erstellt wird, die Funktion
-   fehlschlagen wird, da die gecachten Funktionsinhalte noch auf die alte
-   tempor�re Tabelle zeigen. Die L�sung f�r diese Probleme besteht darin,
-   in der PL/PgSQL- Funktion mittels EXECUTE auf tempor�re Tabellen
-   zuzugreifen. Dies bewirkt, dass bei jedem Funktionsruf die betreffende
-   Abfrage neu geparst wird.
-   
-   Dieses Problem taucht in PostgreSQL 8.3 und sp�teren Versionen nicht
-   mehr auf.
-   
-  4.20) Welche Replikationsl�sungen gibt es?
-  
-   Der Begriff "replikation" umfasst mehrere verschiedene Technologien,
-   jede mit eigenen Vor- und Nachteilen.
-   
-   Mit "Master/slave"-Replikation werden �nderungen in einer
-   Hauptdatenbank durchgef�hrt und an "Sklaven" verteilt, die im
-   Nur-Lese-Modus arbeiten. Die popul�rste L�sung f�r PostgreSQL ist
-   Slony-I.
-   
-   "Multi-master replication" erm�glicht sowohl lesende als auch
-   schreibende Zugriffe �ber mehrere Datenbank-Server hinweg. Allerdings
-   hat diese Art von Replikation eine negative Auswirkung auf die
-   Performanz durch die Notwendigkeit, �nderungen zwischen Servern zu
-   synchronisieren. Pgcluster ist die popul�rste freie L�sung f�r
-   PostgreSQL.
-   
-   Es gibt auch einige kommerzielle und hardware-basierte
-   Replikationsl�sungen f�r verschiedene Arten der Replikation.
-   
-  4.21) Warum werden die Tabellen- und Spaltennamen in meiner Abfrage nicht
-  erkannt? Warum werden Gro�buchstaben umgewandelt?
-  
-   Die h�ufigste Ursache ist die Verwendung von G�nsef��chen bei der
-   Anlegung von Tabellen, z.B.:
-       CREATE TABLE "Tabelle"
-                   ("SPALTE1" INT)
-
-   Dadurch werden Tabellen- und Spaltennamen (sog. Identifikatoren) in
-   genau der Schreibweise gespeichert (vgl. Dokumentation), was dazu
-   f�hrt, dass man sie danach immer in G�nsef��chen angeben muss. Im
-   obigen Beispiel muss man also immer etwa SELECT * FROM "Tabelle"
-   verwenden. Um dieses Problem zu vermeiden, m�ssen Sie immer eines der
-   folgenden Punkte beachten:
-     * bei der Tabellenanlegung keine G�nsef��chen verwenden;
-     * in Identifikatoren nur Kleinschreibung verwenden;
-     * immer Identifikatoren mit G�nsef��chen versehen
-     _________________________________________________________________
-   
-  Anmerkungen des �bersetzers
-  
-   Die englische Vorlage dieser FAQ wird st�ndig �berarbeitet. Daher
-   liegt die �bersetzung nicht immer auf dem aktuellsten Stand.
-   
-   Die aktuellste Version der deutschen �bersetzung befindet sich immer
-   unter http://sql-info.de/de/postgresql/FAQ_german.html. Diese
-   "Arbeitsversion" enth�lt eventuell �nderungen, die noch nicht auf der
-   PostgreSQL-Website eingebunden worden sind.
-   
-   �ber Verbesserungshinweise und Korrekturvorschl�ge sowie
-   Verst�ndnisfragen zum Inhalt der FAQ freue ich mich. Ich nehme auch
-   allgemeine Fragen zu PostgreSQL gerne entgegen, verweise jedoch auf
-   die Mailing-Listen als schnelle und zuverl�ssige Anlaufstellen.
diff --git a/doc/FAQ_hungarian b/doc/FAQ_hungarian
deleted file mode 100644
index 99f5ba4c63..0000000000
--- a/doc/FAQ_hungarian
+++ /dev/null
@@ -1,1234 +0,0 @@
-                                PostgreSQL GyIK
-
- Utolso modos�t�s d�tuma: 2005 m�jus 9.
-
- Ford�t�s aktualiz�l�sa: 2005 j�nius
-
- A GyIK karbantartoja: Bruce Momjian ([email protected])
-
- Ford�to: Horny�k L�szlo
- ([email protected])
-
- A legfrissebb verzio itt �rhet� el (angol):
-
- http://www.PostgreSQL.org/docs/faq-english.html.
-
- Legfrissebb magyar nyelv� verzio:
-
- http://hackers.forgeahead.hu/space/PostgreSQL/GYIK
-
- Platform specifikus k�rd�sek:
-
- http://www.PostgreSQL.org/users-lounge/docs/faq.html.
-
-     ----------------------------------------------------------------------
-
-�ltal�nos k�rd�sek
-
-   1.1 Mi a PostgreSQL? Hogy kell kimondani?
-   1.2 Mik a PostgreSQL felhaszn�l�si felt�telei?
-   1.3 Milyen UNIX oper�cios rendszereken fut PostgreSQL?
-   1.4 Milyen nem UNIX oper�cios rendszerek el�rhet�ek?
-   1.5 Hogyan tudok PostgreSQL-t szerezni?
-   1.6 Hogyan kapok term�kt�mogat�st?
-   1.7 Melyik a legfrissebb kiad�s?
-   1.8 Milyen dokument�cio �ll rendelkez�sre?
-   1.9 Hogyan tal�lok inform�ciot hib�krol vagy hi�nyzo funkcional�t�srol?
-   1.10 Hogy tanuljam meg az SQL nyelvet?
-   1.11 A PostgreSQL 2000. �v kompatibilis?
-   1.12 Hogyan lehet csatlakozni a fejleszt� csapathoz?
-   1.13 Hogyan k�ldjek hibajelent�st?
-   1.14 Milyen a PostgreSQL m�s DBMS-ekkel �sszehasonl�tva?
-   1.15 Hogyan tudom �zletileg segiteni a PostgreSQL-t?
-   1.16 Ki ir�ny�tja a PostgreSQL-t?
-
-Felhaszn�loi kliens k�rd�sek
-
-   2.1 Van ODBC meghajto PostgreSQL-hez?
-   2.2 Milyen eszk�z�k �llnak rendelkez�sre PostgreSQL Web fejleszt�sekhez?
-   2.3 Van a PostgreSQL-hez grafikus felhaszn�loi fel�let ? Riport gener�tor?
-   Be�gyazott lek�rdez� nyelv fel�let?
-   2.4 Milyen programoz�si nyelvekkel lehet el�rni a PostgreSQL szervert?
-
-Adminisztr�cios k�rd�sek
-
-   3.1 Hogyan tudom a PostgreSQL-t /usr/local/pgsql -t�l elt�r� helyre
-   install�lni?
-   3.2 AMikor elind�tom a postmaster-t, egy "Bad System Call"-t vagy core
-   dump-ot kapok. Mi�rt?
-   3.3 Amikor megprob�lom inditani a postmaster-t, "IpcMemoryCreate" hib�kat
-   kapok. Mi�rt?
-   3.4 Amikor megprob�lom inditani a postmaster-t, "IpcSemaphoreCreate"
-   hib�kat kapok. Mi�rt?
-   3.5 Hogyan tudom kontroll�lni a m�s g�pekr�l �rkez� kapcsolat k�r�seket?
-   3.6 Hogyan tudom nagyobb teljes�tm�nyre hangolni az adatb�zisomat?
-   3.7 Milyen hibakeres� lehet�s�gek �rhet�ek el?
-   3.8 Mi�rt kapok "Sorry, too many clients" hib�t csatlakoz�sn�l?
-   3.9 Mi van pgsql_tmp k�nyvt�rban?
-   3.10 Mi�rt kell dumpolni �s �jrat�lteni PostgreSQL kiad�s v�lt�s�n�l?
-
-M�k�dtet�si k�rd�sek
-
-   4.1 Mi a k�l�nbs�g a bin�ris �s a norm�l kurzorok k�z�tt?
-   4.2 Hogyan tudom select-elni a lek�rdez�s els� p�r sor�t?
-   4.3 Hogy tudom kilist�zni a t�bl�kat vagy m�s dolgokat a PostgreSQL-ben?
-   4.4 Hogyan tudok elt�vol�tani egy oszlopot egy t�bl�bol?
-   4.5 Mi a maxim�lis m�rete egy sornak, egy t�bl�nak vagy egy adatb�zisnak?
-   4.6 Mekkora adatb�zis lemez ter�let sz�ks�ges egy tipikus sz�veg �llom�ny
-   t�rol�s�hoz?
-   4.7 Hogy tudhatom meg milyen t�bl�k, indexek, adatb�zisok vagy
-   felhaszn�lok vannak defini�lva?
-   4.8 A lek�rdez�seim lass�ak, vagy nem haszn�lj�k az indexeket. Mi�rt?
-   4.9 Hogy tudom ellen�rizni, hogy optimaliz�lta a lek�rdez�s optimaliz�lo a
-   lek�rdez�sem?
-   4.10 Mi az R-tree index?
-   4.11 Mi a Genetic Query Optimizer?
-   4.12 Hogyan tudok regexp keres�st �s case-insensitive regexp keres�st
-   haszn�lni? Hogyan tudok indexet haszn�lni case-insensitive keres�shez?
-   4.13 Hogyan tudom �szlelni egy lek�rdez�sban, ha egy mez� NULL?
-   4.14 Mi a k�l�nbs�g a k�l�nb�z� karaktert�pusok k�z�tt?
-   4.15.1 Hogyan tudok l�trehozni automatikusan n�vekv� �rt�k� mez�t?
-   4.15.2 Hogyan kaphatom meg egy SERIAL besz�r�s �rt�k�t?
-   4.15.3 A currval() �s a nextval() nem teremt holtpont vesz�lyes helyzetet
-   a felhaszn�lok k�z�tt?
-   4.15.4 Mi�rt nem haszn�lodnak fel �jra a sequence sz�mok tranzakcio abort
-   eset�n? Mi�rt vannak probl�m�k a serial oszlopok sz�moz�s�val?
-   4.16 Mi a OID? Mi a TID?
-   4.17 Mi a PostgreSQL-ben haszn�lt kifejez�sek jelent�se?
-   4.18 Mi�rt kapom ezt a hib�t: "ERROR: Memory exhausted in
-   AllocSetAlloc()"?
-   4.19 Hogyan tudhatom meg PostgreSQL, milyen verziot futtatok?
-   4.20 Mi�rt kapok "invalid large obj descriptor" hib�t nagy objektumok
-   kezel�s�n�l?
-   4.21 Hogy hozhatok l�tre olyan oszlopot, aminek alap�rtelmezett �r�tke a
-   jelenlegi id�?
-   4.22 Mi�rt olyan lass�ak az al-lek�rdez�seim IN-nel?
-   4.23 Hogyan tudok outer join-t v�grehajtani?
-   4.24 Hogyan tudok t�bb adatb�zison v�grehajtani lek�rdez�st?
-   4.25 Hogy tudok t�bb soros vagy oszlopos eredm�nyt visszaadni egy
-   funkciobol?
-   4.26 Mi�rt nem tudom megbizhatoan l�trehozni �s t�r�lni az �tmeneti
-   t�bl�kat a PL/pgSQL funkciokban?
-   4.27 Milyen replik�cios lehet�s�gek vannak?
-   4.28 Milyen kodol�si lehet�s�gek vannak?
-
-A PostgreSQL kiterjeszt�se
-
-   5.1) �rtam egy felhaszn�loi funkciot. Mi�rt core dumpol az adatb�zis
-   amikor haszn�lom?
-   5.2) Hogyan lehet �j adatt�pusokat �s funkciokat hozz�adni a PostgreSQL
-   disztrib�ciohoz?
-   5.3) Hogyan lehet olyan C funkciot �rni, ami Tuple-t ad vissza? (t�bb
-   soros t�bb oszlopos eredm�nyek)
-   5.4) Megv�ltoztattam egy forr�s �llom�nyt. Mi�rt nem v�ltozik a bin�ris
-   �jraford�t�s ut�n?
-
-     ----------------------------------------------------------------------
-
-�ltal�nos k�rd�sek
-
-   1.1 Mi a PostgreSQL? Hogy kell kimondani?
-
-   �gy ejstd ki: Post-Gres-Q-L.
-
-   (Vagy tal�n ink�bb t�ltsd le a kis mp3-at a PostgreSQL homepage-r�l)
-
-   A PostgreSQL a POSTGRES adatb�zis management rendszer egy kieg�sz�t�se,
-   ami egy k�vetkez� gener�cios DBMS kutat�si protot�pus. Megtartja a
-   POSTGRES adatmodell�t �s gazdag adatt�pus v�laszt�k�t, de a PostQuel
-   lek�rdez� nyelvet az SQL egy kiterjesztett verzioj�val helyettes�ti. A
-   PostgreSQL szabad �s a teljes forr�skod hozz�f�rhet�.
-
-   A PostgreSQL fejleszt�s�t egy csapat v�gzi, amelynek minden tagja
-   megtal�lhato a PostgreSQL fejleszt�i levelez�si list�n. A jelenlegi
-   koordin�tor Marc G. Fournier ([email protected]). Ez a csapat
-   felel�s minden fejleszt�s�rt. <>A PostgreSQL 1.01 alkotoi Andrew Yu �s
-   Jolly Chen voltak. Sokan j�rultak hozz� portol�ssal, tesztel�ssel,
-   hibakeres�ssel �s fejleszt�ssel. Az eredeti Postgres kod, amib�l a
-   PostgreSQL sz�rmazik Michael Stonebraker professzor ir�ny�t�sa alatt
-   fejlesztettek az egyetem programozoi, tanuloi �s v�gzett tanuloi. <>
-
-   A szoftver eredeti neve Postgres volt. Amikor SQL funkcional�t�ssal
-   eg�sz�tett�k ki 1995-ben, a nev�t Postgres95-re v�ltoztatt�k. 1996 v�g�n
-   kapta mai nev�t.
-
-   1.2 Mik a PostgreSQL felhaszn�l�si felt�telei?
-
-    Az eredeti angol copyright sz�veg:
-
-    --------------------
-
-    PostgreSQL is subject to the following COPYRIGHT:
-
-    PostgreSQL Data Base Management System
-
-    Portions copyright (c) 1996-2002, PostgreSQL Global Development Group
-
-    Portions Copyright (c) 1994-6 Regents of the University of California
-
-    Permission to use, copy, modify, and distribute this software and its
-
-    documentation for any purpose, without fee, and without a written
-
-    agreement is hereby granted, provided that the above copyright notice
-
-    and this paragraph and the following two paragraphs appear in all
-
-    copies.
-
-    IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY
-
-    FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
-
-    INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND
-
-    ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN
-
-    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
-
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-
-    MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
-
-    PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
-
-    CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
-
-    UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-
-    --------------------
-
-   Ami nagyon leegyszer�s�tve azt jelenti, hogy jogod van haszn�lni a
-   szoftvert mindenf�le ellenszolg�ltat�s (p�nz, stb) n�lk�l, a forr�s kodot
-   modos�thatod, �s tov�bbadhatod, DE semmilyen, a szoftver haszn�lat�bol
-   k�vetkez� k�rosod�s�rt nem v�llal garanci�t a fejleszt�. A fenti a BSD
-   licensz, egy klasszikus nyilt-forr�skod licensz. Nem tartalmaz
-   megszor�t�sokat arra, hogy a forr�skodot hogyan haszn�lod fel.
-
-   Kedvelj�k ezt a licensz form�t �s nem �ll sz�nd�kunkban megv�ltoztatni.
-
-   1.3 Milyen UNIX oper�cios rendszereken fut PostgreSQL?
-
-   �ltal�ban minden UNIX-kompatibilis oper�cios rendszer k�pes arra hogy
-   futtassa a PostgreSQL-t. Azokat a platformokat, amiken tesztelt�k a
-   kiad�st megtal�lhatod a install�cios utas�t�sok k�z�tt.
-
-   1.4 Milyen nem UNIX oper�cios rendszerek el�rhet�ek?
-
-   Kliens
-
-   A libpq C f�ggv�nyk�nyvt�rat, a psql-t �s m�s fel�leteket le lehet �gy
-   ford�tani, hogy fussanak MS Windows oper�cios rendszereken. Ebben az
-   esetben a kliens MS Windows-on fut �s TCP/IP seg�ts�g�vel kommunik�l a
-   Unixon futo szerverrel. A "win32.mak" �llom�ny a kiad�s r�sze, ennek
-   seg�ts�g�vel lehet Win32 platformokra leford�tani a libpq-t �s a psql-t. A
-   PostgreSQL ODBC kliensekkel is k�pes kommunik�lni.
-
-   Szerver
-
-   <>Az adatb�zis szerver Cygwin seg�ts�g�vel fut Windows NT �s Win2k
-   rendszereken. Tov�bbi inform�cio tal�lhato a pgsql/doc/FAQ_MSWIN
-   �llom�nyban �s a MS Windows FAQ-ban a k�vetkez� helyen:
-   http://www.PostgreSQL.org/docs/faq-mswin.html.  Nat�v MS Windows
-   NT/2000/XP portok jelenleg fejleszt�s alatt �llnak.
-
-   1.5 Hogyan tudok PostgreSQL-t szerezni?
-
-   Az els�dleges anonim ftp oldal: ftp://ftp.PostgreSQL.org/pub.
-
-   A t�k�r oldalak list�ja megtal�lhato a f� weboldalunkon.
-
-   1.6 Hogyan kapok term�kt�mogat�st?
-
-   Az els�dleges lista a [email protected]. Ez haszn�lhato a
-   PostgreSQL-lel kapcsolatos p�rbesz�dekre. Ha fel szeretn�l �ratkozni,
-   k�ldj egy levelet a k�vetkez� tartalommal (nem t�rggyal) a
-   [email protected] c�mre:
-
- subscribe
-
- end
-
-   Van egy hib�kkal kapcsolatos levelez�si lista is:
-   [email protected] a k�vetkez� tartalommal:
-
- subscribe
-
- end
-
-   A fejleszto"i levelez�si lista: [email protected] a
-   k�vetkez� tartalommal:
-
- subscribe
-
- end
-
-   Egy�b levelez�si list�k tal�lhatoak a weboldalunkon:
-   http://www.PostgreSQL.org
-
-   Van egy IRC csatorna is #PostgreSQL n�ven ahol felteheted k�r�dseid. A
-   k�vetkez� unix paranccsal csatlakozhatsz:
-
-   irc -c '#PostgreSQL' "$USER" irc.phoenix.net.
-
-   A kereskedelmi term�kt�mogat�st ny�jto c�gek list�ja el�rhet� itt:
-   http://www.PostgreSQL.org/users-lounge/commercial-support.html
-
-   Magyar nyelvu" levelez�si lista nincs, de ha tudok segiteni a fenit e-mail
-   cimemen el�rheto" vagyok.
-
-   1.7 Melyik a legfrissebb kiad�s?
-
-   A legfrissebb PostgreSQL kiad�s a 8.0.
-
-   A tervek szerint minden �vben lesz egy nagyobb fejleszt�seket tartalmazo
-   kiad�s, m�g a kisebb fejleszt�seket n�h�ny havonta adjuk ki.
-
-   1.8 Milyen dokument�cio �ll rendelkez�sre?
-
-   Sz�mos k�zik�nyv, man oldalak �s kis teszt p�ld�k tal�lhatoak a kiad�sban
-   a doc/ k�nyvt�r alatt. Az interneten is olvashatod a dokument�ciot a
-   k�vetkez� c�men:
-
-   http://www.PostgreSQL.org/users-lounge/docs/.
-
-   K�t PostgreSQL k�nyv �rhet� el az interneten a
-   http://www.PostgreSQL.org/docs/awbook.html �s a
-   http://www.commandprompt.com/ppbook/ c�meken. A megv�s�rolhato k�nyvek
-   list�ja itt tal�lhato: http://www.ca.PostgreSQL.org/books/. A
-   PostgreSQL-lel kapcsolatos technikai jelleg� cikkek gy�jtem�nye:
-   http://techdocs.PostgreSQL.org/.
-
-   A psql parancs rendelkezik n�h�ny \d utas�t�ssal, amellyekkel list�zhatoak
-   az oper�torok, a funkciok, stb.
-
-   A website is tartalmaz tov�bbi dokument�ciokat.
-
-   1.9 Hogyan tal�lok inform�ciot hib�krol vagy hi�nyzo funkcional�t�srol?
-
-   A PostgreSQLaz SQL-92 szabv�ny egy kieg�sz�t�se. N�zd meg a TODO list�kat
-   ha �rdekelnek az ismert hib�k.
-
-   1.10 Hogy tanuljam meg az SQL nyelvet?
-
-   A PostgreSQL k�nyv a http://www.PostgreSQL.org/docs/awbook.html c�men
-   tartalmaz SQL alapokat. El�rhet� egy m�sik SQL k�nyv is a
-   http://www.commandprompt.com/ppbook c�men. Egy sz�p oktato anyag tal�lhato
-   a http://www.intermedia.net/support/sql/sqltut.shtm, a
-   http://ourworld.compuserve.com/homepages/graeme_birchall/HTM_COOK.HTM �s a
-   http://sqlcourse.com oldalakon.
-
-   Egy m�sik lehet�s�g a "Tan�tsd magad 21 nap alatt SQL-re, m�sodik kiad�s"
-   a http://members.tripod.com/er4ebus/sql/index.htm.
-
-   Sok felhaszn�lonak tetszett a gyakorlati SQL k�nyv ("The Practical SQL
-   Handbook").
-
-   1.11 A PostgreSQL 2000. �v kompatibilis?
-
-   Igen, k�nnyed�n kezeli a 2000 ut�ni �s id�sz�m�t�sunk el�tt 2000 el�tti
-   d�tumokat is.
-
-   1.12 Hogyan lehet csatlakozni a fejleszt� csapathoz?
-
-   El�ssz�r is t�ltsd le a forr�skodot, �s olvasd el a PostgreSQL
-   fejleszt�i dokumnet�ciot a web oldalunkon vagy a kiad�sban. Ezut�n
-   �ratkozz fel a pgsql-hackers �s a pgsql-patches levelez�si list�kra.
-   V�g�l pedig k�ldj be magas szinvonal� patch-eket a pgsql-patches list�ra.
-
-   Van egy p�r ember, akiknek commit privil�giumuk a PostgreSQL CVS f�n.
-   �k olyan sok magas szinvonal� patch-et k�ldtek be, hogy az addigi
-   csapat m�r nem tudta k�vetni, �s nem volt k�ts�g�nk arrol, hogy a
-   patch-ek amiket �k k�ldenek jo min�s�g�.
-
-   1.13 Hogyan k�ldjek hibajelent�st?
-
-   L�togass el a BugTool oldalra:
-   http://www.PostgreSQL.org/bugs/bugs.php
-   Itt megtal�lod k�vetend� utas�t�sokat.
-
-   Ellen�rizd az ftp oldalunkon is, hogy nincs-e �jabb verzio vagy folt.
-   ftp://ftp.PostgreSQL.org/pub
-
-   1.14 Milyen a PostgreSQL m�s DBMS-ekkel �sszehasonl�tva?
-
-   Sz�mos n�z�pontbol lehet vizsg�lni a szoftvert: k�pess�gek, teljes�tm�ny
-   megb�zhatos�g, t�mogatotts�g �s �r.
-
-   K�pess�gek: A PostgreSQL rendelkezik a nagy, kereskedelmi DBMS-ek
-   k�pess�geivel: tranzakciok, al-lek�rdez�sek, triggerek, n�zetek, k�ls�
-   kulcsok, integr�t�s �s kifinoult z�rmechanizmusok. Van n�h�ny k�pess�ge,
-   ami a kereskedelmi adatb�zisokbol hi�nyzik, mint p�ld�ul a felhaszn�lo
-   �ltal defini�lt t�pusok, �r�kl�d�s, szab�lyok �s verzio kontroll a
-   z�rol�si vit�k reduk�l�s��rt.
-
-   Teljes�tm�ny: A PostgreSQL teljes�tm�nye hasonl�t a kereskedelmi �s m�s
-   ny�lt adatb�zis szerverek�hez. Lehet bizonyos esetekben lassabb, m�sokban
-   gyorsabb. A MySQL nev� tanulo RDBMS p�ld�ul gyorsabban hajt v�gre
-   insert/update m�veleteket, mivel a tranzakciokat elsum�kolja. Persze a
-   MySQL nem rendelkezik a k�pess�gek r�szben felsoroltak nagy r�sz�vel. Mi a
-   megb�zhatos�gra �s a k�pess�gekre �p�t�nk, b�r a teljes�tm�ny is n� minden
-   kiad�ssal. Van egy �rdekes oldal a MySQL �s a PostgreSQL
-   �sszehasonl�t�s�val a http://openacs.org/philosophy/why-not-mysql.html
-   c�men.
-
-   Megb�zhatos�g: Tudjuk hogy ha egy DBMS nem megb�zhato, akkor teljesen
-   haszontalan. Igyeksz�nk jol tesztelt, stabil kodot kiadni, amiben a lehet�
-   legkevesebb hiba van. Minden kiad�s el�tt eltellik legal�bb 1 honap b�ta
-   teszt, �s a kiad�si t�rt�net is azt mutatja, hogy stabil kodot adunk ki,
-   ami k�szen �ll a produkt�v felhaszn�l�sra. �gy gondoljuk, fel�lm�lunk m�s
-   adatb�zis szoftvereket ezen a t�ren.
-
-   T�mogat�s: A levelez�si list�ink kapcsolatot teremtenek a fejleszt�k �s
-   felhaszn�lok csoportj�val , akik seg�tenek a probl�m�k megold�s�ban. B�r
-   nem tudjuk garant�lni hogy ki tudjuk jav�tani a hib�t, m�s, kereskedelmi
-   adatb�zis c�gek sem tudj�k. A fejleszt� csoport k�zvetlen el�r�si
-   lehet�s�ge, a k�z�ss�g, a dokument�cio �s a forr�skod gyakran t�mogat�st
-   biztos�t, mint m�s adatb�zisokn�l. Van kereskedelmi, alkalmi t�mogat�s
-   azoknak, akiknek sz�ks�ge van r� (l�sd: 1.6).
-
-   �r: A PostgreSQL szabad b�rmilyen felhaszn�l�sra, ak�r kereskedelmire is.
-   A term�khez hozz�adhatod a saj�t forr�skodjaidat korl�toz�s n�lk�l.
-
-   1.15 Hogyan tudom �zletileg segiteni a PostgreSQL-t?
-
-   A PostgreSQL els� oszt�ly� infrastrukt�r�val rendelkezik, amit 1996-ban
-   ind�tottunk el. Mindent Marc Fourniernek k�sz�nhet�nk, aki l�trehozta �s
-   karbantartja a rendszert.
-
-   A min�s�gi infrastrukt�ra nagyon fontos egy nyilt forr�s� szoftver
-   eset�ben. Megv�d az olyan fennakad�soktol, amelyek komoly k�s�seket
-   okoznak a fejleszt�sekben. Term�szetesen ez az infrastrukt�ra nem olcso.
-   Sz�mos havi �s �llando kiad�sunk van. Ha a c�gednek van p�nze, amivel
-   t�mogatn� er�fesz�t�seinket, k�rlek l�togass el a
-   http://store.pgsql.com/shopping/ oldalra.
-
-   B�r a weboldal "PostgreSQL, Inc"-k�nt eml�ti, a hozz�j�rul�sok kiz�rolag a
-   PostgreSQL fejleszt�sre �rtendoek, �s nem egy meghat�rozott c�gnek. Ha
-   jobban tetszik, k�ldhetsz csekket is a kapcsolati c�mek b�rmelyik�re.
-
-   1.16 Ki ir�ny�tja a PostgreSQL-t?
-
-   Ha k�zponti bizotts�got, ellen�rzo" c�get keresel a PostgreSQL m�g�tt, add
-   fel, nincs ilyesmi. L�tezik egy mag �s CVS commiter csoport, de ez ink�b
-   adminisztrativ mint ellen�rzo" c�l�. A projectet fejleszto"k �s
-   felhaszn�lok k�z�ss�ge ir�ny�tja, amihez b�rki csatlakozhat. Csup�n annyit
-   kell tenned hogy fel�ratkozol a levelezo"list�kra �s r�szt veszel a
-   besz�lget�sekben.
-
-     ----------------------------------------------------------------------
-
-Felhaszn�loi kliens k�rd�sek
-
-   2.1 Van ODBC meghajto PostgreSQL-hez?
-
-   K�t ODBC meghajto �rhet� el: PsqlODBC �s a OpenLink ODBC.
-
-   A PsqlODBC a PostgreSQL kiad�s r�sze. Tov�bbi inform�cio tal�lhato a 
-   ftp://ftp.PostgreSQL.org/pub/odbc/ oldalon.
-
-   Az OpenLink ODBC-t a http://www.openlinksw.com c�mr�l t�ltheted le. Ez az
-   � szabv�nyos ODBC kliens szoftver�kkel m�k�dik, �gy minden
-
-   �ltaluk t�mogatott platformon (Win, Mac, Unix, VMS) el�rhet� lesz  a
-   PostgreSQL szerver.
-
-   Tal�n olyan vev�knek fogj�k eladni, akik kereskedelmi min�s�g� term�ket
-   szeretn�nek kapni, de a freeware verzio mindig el�rhet� lesz. K�rd�seidet
-   a term�kkel kapcsolatban a [email protected] c�men teheted fel.
-
-   Olvasd el az ODBC fejezetet is a programozok k�zik�nyv�ben!
-
-   2.2 Milyen eszk�z�k �llnak rendelkez�sre PostgreSQL Web fejleszt�sekhez?
-
-   Egy sz�p bemutato olvashato az adatb�zissal t�mogatott web oldalanrol a
-   http://www.webreview.com weboldalon.
-
-   A web integr�ciohoz a PHP egy kiv�llo szoftver. Let�lthet� a
-   http://www.php.net c�mr�l.
-
-   Komplexebb esetekre sokan haszn�lj�k a Perl fel�letet �s a CGI.pm vagy a
-   mod_perl-t.
-
-   2.3 Van a PostgreSQL-hez grafikus felhaszn�loi fel�let?
-
-   Van egy sz�p PgAccess nev� grafikus fel�let�nk, ami riport gener�tork�nt
-   is haszn�lhato. A weboldal�t megtal�lod a http://www.pgaccess.org/ c�men.
-
-   A http://techdocs.postgresql.org/guides/GUITools oldalon tal�lhatsz egy
-   pontos �s r�szltes list�t.
-
-   2.4 Milyen programoz�si nyelvekkel lehet el�rni a PostgreSQL szervert?
-
-   A k�vetkez�k:
-
-     * C (libpq)
-     * C++ (libpq++)
-     * Embedded C (ecpg)
-     * Java (jdbc)
-     * Perl (DBD::Pg and perl5)
-     * ODBC (odbc)
-     * Python (PyGreSQL)
-     * TCL (libpgtcl)
-     * C Easy API (libpgeasy)
-     * PHP ('pg_' functions, Pear::DB)
-   Tov�bbi programoz�si fel�letek �rhet�ek el a
-   http://www.PostgreSQL.org/interfaces.html �s a
-   http://gborg.PostgreSQL.org oldalakon.
-
-     ----------------------------------------------------------------------
-
-Adminisztr�cios k�rd�sek
-
-   3.1 Hogyan tudom a PostgreSQL-t /usr/local/pgsql -t�l elt�r� helyre
-   install�lni?
-
-   A configure script --prefix param�ter�nek haszn�lat�val.
-
-   3.2 AMikor elind�tom a postmaster-t, egy "Bad System Call"-t vagy core
-   dump-ot kapok. Mi�rt?
-
-   Sz�mos probl�ma lehet, de legel�ssz�r ellen�rizd le, hogy a kerneled
-   System V kieg�sz�t�sekkel rendelkezik-e. A PostgreSQL haszn�lja a kernel
-   osztott memoria �s szemafor API-j�t.
-
-   3.3 Amikor megprob�lom inditani a postmaster-t, "IpcMemoryCreate" hib�kat
-   kapok. Mi�rt?
-
-   Vagy nincs megfelel�en konfigur�lva a kerneled osztott memoria t�mogat�sa
-   vagy meg kell nagyobb�tanod a maxim�lis osztott memoria m�retet.
-
-   A pontos m�ret sz�ks�glet f�gg az architekt�r�dtol �s attol hogy h�ny
-   buffert �s processzt konfigur�lsz a postmasternek. Legal�bb 1 MB ter�letre
-   sz�ks�ged van. A PostgreSQL Adminisztr�cio k�zik�nyvben olvashatsz
-   r�szletesebb inform�ciokat az osztott memori�rol �s a szemaforokrol.
-
-   3.4) Amikor megprob�lom inditani a postmaster-t, "IpcSemaphoreCreate"
-   hib�kat kapok. Mi�rt?
-
-   Ha a hiba�zenet ez: " IpcSemaphoreCreate: semget failed (No space left on
-   device)", akkor a kerneled konfigur�cioja nem tesz lehet�v� elegend�
-   szemafort. A PostgreSQL szerver processzenk�nt 1 szemafort ig�nyel. Egy
-   �tmeneti megold�s lehet az hogy a postmastert kevesebb maxim�lis processz
-   sz�mmal inditod el. Haszn�ld a -D param�tert. Egy sokkal megfelel�bb
-   megold�s az ha n�veled a kerneled SEMMNS �s SEMMNI param�tereit.
-
-   A hib�s szemaforok is adat�zis lerobban�s�hoz is vezethet nagy terhel�s
-   eset�n.Ha a hiba�zenet valami m�s, lehet hogy nincs szemaforok t�mogat�s
-
-   forditva a kerneledbe. Olvasd el a PostgreSQL adminisztr�torok
-   k�zik�nyv�ben az osztott memori�rol �s a szemaforokrol szolo fejezetet.
-
-   3.5) Hogyan tudom kontroll�lni a m�s g�pekr�l �rkez� kapcsolat k�r�seket?
-
-   Alap�rtelmez�sben a PostgreSQL a helyi kapcsolatokat Unix socketekkel
-   valos�tja meg. M�s g�pek nem lesznek k�pesek csatlakozni, ha nem
-   enged�lyezed azt -i opcioval a postmasternek, �s nem �ll�tod be host a
-   alap� azonos�t�st a pg_hba.conf �llom�nyban. Ezzel v�lnak lehet�v� a
-   TCP/IP kapcsolatok.
-
-   3.6) Hogyan tudom nagyobb teljes�tm�nyre hangolni az adatb�zisomat?
-
-   Az indexel�s felt�tlen�l gyors�tja a lek�rdez�seket. Az EXPLAIN parancs
-   lehet�v� teszi hogy l�sd, hogy a PostgreSQL mik�nt interpret�lja a
-   lek�rdez�st �s melyik indexet haszn�lja.
-
-   Ha sok INSERT m�veletet hajtassz v�gre, csin�ld nagy k�tegekben a COPY
-   paranccsal. Ez sokkal gyorsabb mint az egyedi INSERT parancsok. M�sodszor:
-   Azok a m�veletek, amelyek nincsenek tranzakcio blokkon bel�l, azok saj�t
-   tranzakciot ind�tanak. Sok m�veletet �rdemes egy tranzakcion bel�l
-   v�grehajtani. Ez cs�kkenti a tranzakcio kezel�s t�bbletidej�t. Az
-   indexeket javasolt a nagy adatv�ltoz�sok el�tt elt�vol�tani, majd �jra
-   l�trehozni.
-
-   Sz�mos teljes�tm�ny jav�to lehet�s�g van. Kikapcsolhatod az fsync()
-   m�veletet a postmaster -o -F opciokval valo ind�t�sakor. �gy nem fog az
-   amugy lass� fsync() f�ggv�ny megh�vodni minden tranzakcio v�g�n.
-
-   Haszn�lhatod a postmaster -B opcioj�t is az osztott memoria szegmens
-   m�ret�nek n�vel�s�hez. Ha az �rt�ket t�l magasra �ll�tod, lehet hogy a
-   postmaster nem indul el, mert t�ll�pted az oper�cios rendszer �ltal 
-   megengedett m�retet. Minden buffer 8K m�ret� �s alap�rtelmez�sban 64
-   buffer van.
-
-   A -S opcioval n�velheted a szerver �tmeneti rendez�sekre fenntartott
-   memoria ter�let�t. Az �rt�ket kilobyteban add meg. Az alap�rtelmezett
-   �rt�k 512K.
-
-   Haszn�lhatod a CLUSTER utas�t�st is, hogy a t�bl�kat egy indexnek
-   megfelel�en csoportos�tsd. Olvasd el a CLUSTER k�zik�nyv oldalt tov�bbi
-   r�szletek�rt.
-
-   Hardver kiv�laszt�s�ban seg�thet:
-   http://candle.pha.pa.us/main/writings/pgsql/hw_performance/index.html �s
-   http://www.powerpostgresql.com/PerfList/.
-
-   A postgresql.conf be�llit�saival kapcsolatos tudnivalok:
-   http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_conf_e.html
-   �s http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html.
-
-   3.7) Milyen hibakeres� lehet�s�gek �rhet�ek el?
-
-   A PostgreSQL sz�mos lehet�s�ggel rendelkezik ami �rt�kes lehet a
-   hibakeres�sn�l.
-
-   El�ssz�r is, futtathatod a configure scriptet --enable-cassert opcioval,
-   sok assert() funkciohiv�s ellen�rzi a program fut�s�t �s meg�llitja ha
-   valami v�ratlan hiba t�rt�nik.
-
-   Mind a postmaster �s a postgres sz�mos hibakeres� lehet�s�ggel
-   rendelkezik. Mindig amikor elinditod a postmastert, gy�z�dj meg rola, hogy
-   a kimenetet log �llom�nyba k�ld�d. Igy:
-
-   cd /usr/local/pgsql
-
-   ./bin/postmaster >server.log 2>&1 &
-
-   Ez egy server.log �llom�nyt hoz l�tre a fels� PostgreSQL k�nyvt�rban. Ez
-   az �llom�ny tartlamaz majd sz�mos hasznos inform�ciot a szerverrel
-   kapcsolatos probl�m�krol �s hib�krol. A postmaster -d opcioj�val lehet
-   r�szletesebb hibakeres� inform�ciot kapni. A -d opciohoz meg kell
-   hat�rozni egy hiba szintet. Vigy�zz, a magas hibakeres� szint nagy log
-   �llom�nyt okozhat.
-
-   Ha a postmaster nem fut, akkor futtathatod a postgres szervert
-   parancssorbol is, �s az SQL kifejez�st k�zvetlen�l ennek adhatod �t. Ez
-   csak hibakeres�s eset�ben javasolt. Az �j sor a kifejez�s v�g�t jelenti,
-   nem a pontosvessz�. Ha hibakeres� opciokkal forditottad a szervert,
-   haszn�lhatsz egy debuggert is hogy l�sd hogy mi t�rt�nik. Mivel igy a
-   szervert nem a postmaster inditotta, nem t�bbfelhaszn�los k�rnyezetk�nt
-   fut, igy a z�rol�si �s a szerverek k�z�tti kommunik�cios hiba jelens�gek
-   nem jelentkeznek.
-
-   Ha m�r fut a postmaster, indits egy psql-t, �s n�zd meg a szerver processz
-   PID-j�t! Egy debuggert haszn�lhatsz a processzhez csatlakoz�shoz.
-   Be�llithatsz t�r�spontokat �s elindithatsz lek�rdez�seket. Ha a postgres
-   indit�sban keresel hib�t, a PGOPTIONS k�rnyezeti v�ltozot �llitsd be "-W
-   n" �rt�kre. Ez n m�sodperc v�rakoz�st id�z el�, igy tudsz csatlakozni a
-   processzhez, el tdsz hejezni t�r�spontokat, majd folytathatod a ind�t�st.
-
-   A postgres program -s, -A �s -t opcioi is nagyon hasznosak lehetnek
-   hibakeres�sn�l �s teljes�tm�ny m�r�sn�l.
-
-   Profiling leht�s�ggel is fordithatod a szervert, hogy l�sd melyik funkciok
-   foglalj�k el a fut�si id�t. A szerver profile �llom�nyai a
-   pgsql/data/base/dbname k�nzvt�rba ker�lnek, a kliens profile �llom�nyok az
-   aktu�lis k�nyvt�rba. Linuxon ehhez sz�ks�ges a -DLINUX_PROFILE ford�t�si
-   direktiva.
-
-   3.8) Mi�rt kapok "Sorry, too many clients" (T�l sok kliens)
-   hib�t csatlakoz�sn�l?
-
-   N�velned kell a postmaster egyidej�leg futtatott szerver processz sz�m
-   korl�tj�t.
-
-   Az alap�rtelmezett korl�t 32 processz. Ezt n�velhetjed �gy, hogy
-   �jrainditod a postmastert �s -N opcioval meghat�rotod az �j �rt�ket, vagy
-   modositod a postgresql.conf-ot.
-
-   Ne felejtsd el, hogy ha n�veled a szerver processzek maxim�lis sz�m�t,
-   akkor bufferek sz�m�t is n�velned kell, legal�bb a processzek sz�m�nak
-   k�tszeres�re. Nagy processz sz�mokeset�ben valoszin�leg a Unix
-   konfigur�cios param�tereken is n�velni kell. Ellen�rizd a SHMMAX (az
-   osztott memoria szegmensek maxim�lis m�rete), a SEMMNS �s a SEMMNI (a
-   szemaforok maxim�lis sz�ma), az NPROC (a processzek maxim�lis sz�ma), a
-   MAXUPRC (felhaszn�lonk�nti maxim�lis processz sz�m) �s a NFILE �s NINODE
-   (a megnzitott �llom�nzok maxim�lis sz�ma) param�tereket. A PostgreSQL
-   az�rt korl�tozza k�l�n a processz sz�mot, hogy a rendszeredet ne
-   terhelhesse meg t�ls�gosan.
-
-   A PostgreSQL 6.5 verzioban a maxim�lis szerver processz sz�m 64 volt �s a
-   modosit�shoz bele kellett irni a include/storage/sinvaladt.h �llom�nyba �s
-   �jra kellett forditani a servert.
-
-   3.9) Mi van pgsql_tmp k�nyvt�rban?
-
-   Ez a k�nyvt�r a lek�rdez�s v�grehajto �ltal l�trehezott �tmeneti
-   �llom�nyokat tartalmazza. P�ld�ul ha egy rendez�st kell v�grehajtani egy
-   ORDER BY kifejez�s miatt �s a m?velet t�bb memori�t vesz ig�nybe, mint
-   amennyit a -S param�ter megenged, akkor az �tmeneti k�nyvt�rban hoz l�tre
-   egy �llom�nyt a fennmarado adat t�rol�s�ra.
-
-   Az �tmeneti �llom�nyok t�bbnyire t�rl?dnek, de meg is maradhat ha p�ld�ul
-   v�ratlan hib�val le�ll a szerver egy rendez�s k�zben. Indit�skor �s
-   le�llit�skor ezeket az �llom�nyokat t�rli a postmaster.
-
-   3.10) Mi�rt kell dumpolni �s �jrat�lteni PostgreSQL kiad�s v�lt�s�n�l?
-
-   A PostgreSQL csapat csak aprobb v�ltoztat�sokat hajt v�gre a kisebb
-   kiad�sok k�z�tt, igy ha 7.2 verziorol �llsz �t 7.2.1 verziora, akkor nem
-   sz�ks�ges kidumplonod az adatb�zist. A nagy kiad�sok eset�ben (p�ld�ul
-   verziorol 7.3-ra �tt�r�sn�l) v�ltozik a belsi� adatstrukt�r�k �s
-   adat�llom�nyok form�tuma. Ezek a v�ltoz�sok gyakran nagyon �sszetettek,
-   ez�rt ink�b nem tartunk fenn visszafel� kompatibilit�st. A dump az adatot
-   �ltal�nos form�tumban irja ki, majd az �j form�tumban lehet azt
-   visszat�leni.
-
-   Azokban a kiad�sokban, amelyek k�z�tt az adat form�tum nem v�ltozik, a
-   pg_upgrade program haszn�lhato dumpol�s �s helyre�llit�s n�lk�l.
-
-     ----------------------------------------------------------------------
-
-M�k�dtet�si k�rd�sek
-
-   4.1) Mi a k�l�nbs�g a bin�ris �s a norm�l kurzorok k�z�tt?
-
-   N�zd meg a DECLARE dokument�cioj�t.
-
-   4.2) Hogyan tudom select-elni a lek�rdez�s els� p�r sor�t?
-
-   Olvasd el a FETCH dokument�cioj�t, vagy haszn�ld a SELECT LIMIT-et.
-
-   Az eg�sz lek�rdez�st v�gre kell hajtani, m�g akkor is, ha csak az els� p�r
-   sort akarod megkapni. Gondolj arra, hogy a lek�rdez�sben lehet ORDER BY
-   is. Ha van olyan index, ami megfelel az ORDER BY kifejez�sednek, a
-   PostgreSQL k�pes lehet az els� n�h�ny rekord visszaad�s�ra, vagy a teljes
-   lek�rdez�snek le kell futnia, amig a k�rt rekordok le nem gener�lodnak.
-
-   4.3) Hogy tudom kilist�zni a t�bl�kat vagy m�s dolgokat a PostgreSQL-ben?
-
-   Elolvashatod a psql forr�s kodj�ban a pgsql/src/bin/psql/describe.c
-   �llom�nyban. Ez SQL parancsokat tartalmaz, amelyek azokat a kimeneteket
-   �llitj�k el�, amiket a per jellel kezd�d� parancsok adnak vissza.
-
-   4.4) Hogyan tudok elt�vol�tani egy oszlopot egy t�bl�bol?
-
-   Ez a funkcionalit�s a 7.3 verziot�l kezdve �rhet� el az ALTER TABLE DROP
-   COLUMN -nal. A r�gebbi vertiokban igy lehet v�grehajtani:
-
- BEGIN;
-
- LOCK TABLE old_table;
-
- SELECT ... -- minden oszlopot, kiv�tel amit t�r�lni szeretn�l
-
- INTO TABLE new_table
-
- FROM old_table;
-
- DROP TABLE old_table;
-
- ALTER TABLE new_table RENAME TO old_table;
-
- COMMIT;
-
-    4.5) Mi a maxim�lis m�rete egy sornak, egy t�bl�nak vagy egy adatb�zisnak?
-
-   A korl�tok:
-
-     * adatb�zis: korl�tlan (1 TB az �ltalunk ismert lagnagyobb)
-
-     * t�bla: 16 TB
-
-     * rekord/sor 1.6TB
-
-     * mez� 1 GB
-
-     * a t�bla sorainak sz�ma: korl�tlan
-
-     * a t�bla oszlopainak sz�ma: 250-1600 az oszlop nevekt�l f�gg�en
-
-     * A t�bla indexeinek sz�ma: korl�tlan
-
-   Term�szetesen nem igaz�n korl�tlan, de a t�rter�let, memoria �s egy�b
-   k�ls� t�nyez�k korl�tozz�k. A teljesitm�ny romolhat, ha ezek az �rt�kek
-   szokatlanul nagyok.
-
-   A 16 TB-os legnagyobb t�bla m�ret nem ig�nyel nagy �llom�ny t�mogat�st. A
-   nagy t�bl�k t�bb 1 GB m�ret� �llom�nyba ker�lnek, igy az �llom�ny rendszer
-   korl�tai nem l�nyegesek.
-
-   A maxim�lis t�bla m�ret �s az oszlopok maxim�lis oszlop sz�m n�velhet�, ha
-   az alap�rtelmezett blokkm�retet 32k-ra n�veled.
-
-   4.6) Mekkora adatb�zis lemez ter�let sz�ks�ges egy tipikus sz�veg �llom�ny
-   t�rol�s�hoz?
-
-   A PostgreSQL ak�r a sz�veg �llom�ny helyig�ny�nek �tsz�r�s�t is
-   elfoglalhatja.
-
-   K�pzelj el p�ld�ul, egy 100.000 soros sz�veget, aminek minde sora egy
-   sz�mbol �s egy sz�vegb�l �ll. Tegy�k el, hogy �tlagosan 20 byte hossz�
-   sz�vegek. Ez a sz�veg�llom�ny k�r�lbel�l 2.8 MB helyet foglalna el. A
-   t�bla ami a fenti adatszerkezetet elt�roln�, k�r�lbel�l 6.4 MB-os lenne.
-   Ezt a k�vetkez�k�ppen sz�molhatjuk ki:
-
-   36 byte: sor fejl�c
-
- 24 byte: egy int mez� + egy sz�veg mez�
-
- 4 byte: mutato
-
- ---------------------------------------
-
- 64 byte soronkent.
-
-   Az adat oldal m�rete a PostgreSQL-ben 8192 byte, igy 8192 / 64 = 128
-   rekord adatb�zis oldalank�nt (lefel� kerekitve).
-
- 100000 rekord / 128 rekord oldalank�nt = 782 adat oldal
- (felel� kerekitve).
-
- 782 adatb�zis oldal * 8192 byte olalank�nt = 6,406,144
- byte (6.4 MB)
-
-   Az indexek nem foglalnak t�l sokat, de tartalmazz�k az indexelt adatot,
-   igy ezek is lehetnek nagyok.
-
-   A NULL �rt�kek bitt�rk�pben vannak t�rolva, igy kev�s helyet foglanak.
-
-   4.7) Hogy tudhatom meg milyen t�bl�k, indexek, adatb�zisok vagy
-   felhaszn�lok
-
-   vannak defini�lva?
-
-   A psql-ben tal�lsz sz�mos '\' karakterrel kezd�d� utas�t�st az ilyen
-   inform�ciok list�z�s�ra. A '\?' segits�g�vel tudot kilist�zni ezeketa
-   parancsokat. Ezen kiv�l vannak rendszer t�bl�k, amelyek nevei 'pg_'-vel
-   kezd�dnek.
-
-   Prob�ld ki a pgsql/src/tutorial/syscat.source �llom�nyt is. Ez sok p�ld�t
-   tartalmaz az rendszert�bl�kon v�grehajtott SELECT-ekr�l.
-
-   4.8) A lek�rdez�seim lass�ak, vagy nem haszn�lj�k az indexeket. Mi�rt?
-
-   Az indexeket nem haszn�lja a szerver minden lek�rdez�sn�l automatikusan.
-   Csak akkor haszn�l indexet, ha a t�bla m�rete egy megadott also hat�r
-   felett van, �s a lek�rdez�s csak a sorok egy kis r�sz�t �rinti. Ez az�rt
-   van, mert a v�letlen hozz�f�r�s m�g mindig lassabb lehet mint az t�bla
-   szekvenci�lis olvas�sa.
-
-   Hogy a PostgreSQL meg tudja hat�rozni hogy kell-e indexet haszn�lni,
-   l�teznie kell egy statisztik�nak a t�bl�rol. Ez a statisztikai adatok a
-   VAACUM ANALYZE vagy az egyszer� ANALYZE m�veletek sor�n j�nnek l�tre. A
-   statisztikai adatok felhaszn�l�s�val az optimaliz�lo meg tudja hat�rozni,
-   hogy h�ny sor van a t�bl�ban, �s el tudja d�nteni, hogy haszn�ljon-e
-   indexet. A statisztiaki adatgy�jt�st id�nk�nt v�gre kell hajtani, ahogy a
-   t�bla adatai v�ltoznak.
-
-   Az indexeket norm�lis esetben nem haszn�lja az ORDER BY vagy az OUTER
-   JOIN. A szekvenci�lis olvas�s �ltal�ban gyorsabb, mint az index keres�s
-   egy nagy t�bl�ban. B�r a LIMIT az ORDER BY-val kombin�lva haszn�lhat
-   indexet, mert a t�bla csak kis r�sze �rintett. B�r a MIN �s MAX SQL
-   funkciok sem haszn�lj�k az indexeket, ezeket az �rt�keket egy ORDER BY +
-   LIMIT lek�rdez�ssel is le lehet k�rdezni:
-
- SELECT col
-
- FROM tab
-
- ORDER BY col [ DESC ]
-
- LIMIT 1;
-
-   Amikor helyettes�t� jel oper�torokat haszn�lsz, mint a LIKE kulcsszo vagy
-   a ~, az indexeket csak bizonyos k�r�lm�nyek k�z�tt lehet haszn�lni:
-
-   A keres� string kezdete a keres�si minta elej�n kell hogy legyen. P�ld�ul:
-
-     * A LIKE mint�k nem kezd�dhetnek % jellel.
-     *  ~ (regexp) kifejez�sek nem kezd�dhetnek ^ jellel.
-     * A keres�si kifejez�s nem kezd�dhet karakter oszt�llyal.
-     * A case-insensitive keres�s (ILIKE, ~*) nem haszn�lnak indexet ehelyett
-       funkcion�lis indexet haszn�lnak, amit a 4.12 pontban tal�lhatsz.
-     * Az alap�rtelmezett C hellyel kell futtatni az initdb-t.
-   4.9) Hogy tudom ellen�rizni, hogy optimaliz�lta a lek�rdez�s optimaliz�lo
-   a lek�rdez�sem?
-
-   Olvasd el a dokument�cio EXPLAIN-rol szolo r�sz�t.
-
-   4.10) Mi az R-tree index?
-
-   Az R-tree index a t�rbeli adat indexel�s�re alkalmas. Egy hash index nem
-   k�pes tartom�ny keres�sekre. A B-tree index csak egy dimenzion kezeli a
-   tartom�ny keres�seket. P�ld�ul ha az indexet egy pont (point adatt�pus)
-   t�pus� mez.re �p�tj�k, gyorsabban kezeli az olyan jelleg� lek�rdez�seket,
-   mint egy adott k�rben
-
-   tal�lhato pontok.
-
-   Az R-tree tervez�si mint�t eredetileg le�ro sz�veg: Guttman, A. "R-trees:
-   A Dynamic Index Structure for Spatial Searching." Proceedings of the 1984
-   ACM SIGMOD Int'l Conf on Mgmt of Data, 45-57.
-
-   Ezt olvashatod Stonebraker "Readings in Database Systems" c. k�nyv�ben.
-
-   A be�p�tett R-tree kezelni tudj�k a soksz�geket (polygon adatt�pus) �s a
-   dobozokat (box). Elm�letileg, az R-tree kiterjeszthet� tov�bbi dimenziokra
-   is. Gyakorlatilag ezen dolgoznod kell egy kicsit, �s m�g nincs
-   dokument�cionk arrol hogy az hogyan m�k�dik.
-
-   4.11) Mi a Genetic Query Optimizer?
-
-   A GEQO modul a lek�rdez�s optimaliz�cio sebess�g�t n�veli nagy mennyis�g�
-   t�bla �sszekapcsol�sa eset�n. Lehet�v� teszi a nagy lek�rdez�sek
-   v�grehajt�s�t nem teljes keres�ssel.
-
-   4.12) Hogyan tudok regexp keres�st �s case-insensitive regexp keres�st
-   haszn�lni? Hogyan tudok indexet haszn�lni case-insensitive keres�shez?
-
-   A ~ oper�tor hajt v�gre regul�ris kifejez�s (regexp) �rtelmez�st, a ~*
-   ennek case-insensitive v�ltozata. A LIKE case-insensitive v�ltozata az
-   ILIKE.
-
-   A case-insensitive egyenl�s�g m�veleteket �ltal�ban igy hajtjuk v�gre:
-
-   SELECT *
-
- FROM tab
-
- WHERE lower(col) = 'abc';
-
-   Ez nem fog indexet haszn�lni, b�r l�trehozhatsz egy funkcio indexet:
-
- CREATE INDEX tabindex ON tab (lower(col));
-
-   4.13) Hogyan tudom �szlelni egy lek�rdez�sben, ha egy mez� NULL?
-
-   Haszn�ld "IS NULL"-t �s az "IS NOT NULL"-t.
-
-   4.14) Mi a k�l�nbs�g a k�l�nb�z� karaktert�pusok k�z�tt?
-
-     * "char" egy karakter hossz� string
-     * CHAR(n) bpchar �res hellyel a megadott n hossz�s�gig
-     * VARCHAR(n) varchar m�ret maxim�lis hossz meghat�roz�s�val, a lefogllat
-       ter�let is v�ltozo hossz� lesz
-     * TEXT nincs meghat�rozott felso" korl�t
-     * BYTEA v�ltozo hossz�s�g� byte-t�mb
-
-   L�tni fogod a bels� elnevez�s�ket, ha tanulm�nyozod a rendszert�bl�kat�s
-   n�h�ny hiba�zenetet.
-
-   Az utobbi n�gy a "varlena" t�pusok, ami a t�rol�suk modj�ra utal: az els�
-   4 byte a lemezen a hossz�s�g, a t�bbi az adat. A valodi m�ret teh�t
-   nagyobb mint a deklar�lt hossz�s�g.Ezek azadatok t�m�ritve t�rolodnak el,
-   igy kevesebb helyet foglalnek el az el�re sz�mitottn�l.
-
-   A CHAR(n) a legjobb megold�s, ha stabil hossz�s�g� stringet t�rolsz. A
-   VARCHAR(n) jo arra az esetekre, ha a hossz�s�g v�ltozik, de van fels�
-   korl�tja. A TEXT t�pus korl�tlan hossz�s�g� (1 GB-ig) sz�vegek t�rol�s�ra
-   alklamas. A BYTEA bin�ris adatok t�rol�s�ra van. A teljesitm�ny mutatoi
-   hasonloak ezenek a t�pusoknak.
-
-   4.15.1) Hogyan tudok l�trehozni automatikusan n�vekv� �rt�k� mez�t?
-
-   A PostgreSQL rendelkezik egy SERIAL adatt�pussal. Ez egy szekvenci�t �s
-   egy indexet hoz l�tre az oszlopon. P�ld�ul ez:
-
- CREATE TABLE person (
-
- id SERIAL,
-
- name TEXT
-
- );
-
-   ugyanezt jelenti:
-
- CREATE SEQUENCE person_id_seq;
-
- CREATE TABLE person (
-
- id INT4 NOT NULL DEFAULT nextval('person_id_seq'),
-
- name TEXT
-
- );
-
- CREATE UNIQUE INDEX person_id_key ON person ( id );
-
-   A szekvenci�kkal kapcsolatban olvasd el a create_sequence man oldalt. A
-   sor OID-j�t is haszn�lhatod egyedi azonositok�nt, b�r ebben az esetben
-   figyelj a pg_gump haszn�lat�n�l a -o opciora (COPY WITH OIDS, m�sol�s
-   OID-dal), hogy meg?rizd az �rt�keket.
-
-   4.15.2) Hogyan kaphatom meg egy SERIAL besz�r�s �rt�k�t?
-
-   Egy megold�s erre az, ha a nextval() funkcioval megszerzed az �rt�ket m�g
-   miel�tt besz�rn�d az adatot a t�bl�ba. Erre itt l�thatsz egy p�ld�t:
-
- new_id = execute("SELECT nextval('person_id_seq')");
-
- execute("INSERT INTO person (id, name) VALUES (new_id, 'Blaise
- Pascal')");
-
-   Esetleg lek�rdezheted a szekvencia �llapot�t a sor besz�r�sa ut�n.
-
- execute("INSERT INTO person (name) VALUES ('Blaise Pascal')");
-
- new_id = execute("SELECT currval('person_id_seq')");
-
-   V�g�l pedig, haszn�lhatod a visszaadott OID �rt�ket is, b�r ez a lehet�
-   legkev�sb� portolhato. Perl DBI-ben, Edmund Mergl DBD::Pg modulj�ban az
-   OID �rt�k haszn�lhato a $sth->execute() ut�n ($sth->{pg_oid_status}).
-
-   4.15.3) A currval() �s a nextval() nem teremt holtpont vesz�lyes helyzetet
-   a felhaszn�lok k�z�tt?
-
-   Nem. A currval() funkcio a szerver processzed �ltal adott �rt�ket adja
-   vissza, nem pedig a t�bbi szerver processz �ltal adottat.
-
-   4.15.4) Mi�rt nem haszn�lodnak fel �jra a sequence sz�mok tranzakcio abort
-   eset�n?
-
-   Mi�rt vannak probl�m�k a serial oszlopok sz�moz�s�val?
-
-   A p�rhuzamoss�g fejleszt�se �rdek�ben a sorozat sz�mokat k�r�sre adja ki a
-   szerver futo tranzakcioknak, �s azokat nem z�rja, amig a tranzakcio v�get
-   nem �r. Ez jukakat okoz a sz�moz�sokban a visszaforditott tranzakciok
-   miatt.
-
-   4.16) Mi a OID? Mi a TID?
-
-   Az OID a PostgreSQL egyedi sor azonositoja. Minden sor, ami l�trej�n a
-   szerveren, kap egy OID-t. Minden OID, amit az initdb alatt j�n l�tre 16384
-   alatt van (l�sd include/access/transam.h). Minden, felhaszn�lo �ltal
-   l�trehozott OID legal�bb ennyi. Alap�rtelmez�sben, az OID nem csak a
-   t�bl�ban vagy az adatb�zisban egyedi, hanem a teljes PostgreSQL adatb�zis
-   rendszerben.
-
-   A PostgreSQL az OID-okat a bels� t�bl�iban haszn�lja a sorok t�bl�k k�z�tt
-   �sszekapcsol�s�hoz. Ezek az OID-k haszn�lhatoak a rekordok azonosit�s�ra
-   is amikor t�bl�kat csatol �ssze a szerver (JOIN). Az OID-ot haszn�lhatod
-   mez� t�pusk�nt is, �s indexelheted is.
-
-   Az OID �rt�k egy k�zponti ter�letr�l sz�rmazik, amit minden szerver
-   processz haszn�l. Ha az OID-ot valami m�sra szeretn�d cser�lni:
-
-   CREATE TABLE new_table(old_oid oid, mycol int);
-
- SELECT old_oid, mycol INTO new FROM old;
-
- COPY new TO '/tmp/pgtable';
-
- DELETE FROM new;
-
- COPY new WITH OIDS FROM '/tmp/pgtable';
-
-   Az OID 4 byte-os integer �rt�kk�nt t�rolodik, igy 4 milli�rdn�l
-   t�lcsordul. M�g soha senki nem jelezte hogy ez t�rt�nt volna, �s ezt a
-   korl�tot igyeksz�nk elt�volitani, m�g miel�tt b�rki �szrevenn�.
-
-   A TID a fizikai sorok blokk �s offszet c�mmel valo azonosit�s�ra szolg�l.
-   A TID v�ltozik minden rekord modosit�s �s t�rl�s alkalm�val. Ezeket az
-   indexek haszn�lj�k hogy a fizikai sort gyorsan megtal�lj�k.
-
-   4.17) Mi a PostgreSQL-ben haszn�lt kifejez�sek jelent�se?
-
-   N�hol a forr�s kodban �s a dokumnet�cioban tal�lhatoak kifejez�sek,
-   amelyek �ltal�nosabb jelent�ssel b�rnak. Itt van n�h�ny:
-
-     * t�bla (table), rel�cio (relation), oszt�ly (class)
-     * sor (row), rekord (record), tuple (nincs magyar jelent�s)
-     * oszlop (column), mez� (field), attributum (attribute)
-     * retrieve, select
-     * helyettesit (replace), modosit (update)
-     * hozz�f�z (append), besz�r (insert)
-     * OID, sorozat �rt�k (serial value)
-     * portal, cursor
-     * range variable, t�bla n�v, t�bla alias
-   Az �ltal�nos adatb�zis kifejez�sek �sszefoglaloj�t itt olvashato:
-
-   http://hea-www.harvard.edu/MST/simul/software/docs/pkgs/pgsql/glossary/glossary.html
-
-   4.18) Mi�rt kapom ezt a hib�t: "ERROR: Memory exhausted in
-   AllocSetAlloc()"?
-
-   Lehet hogy elfogyott a virtu�lis memori�d, vagy a kerneled er�forr�s
-   korl�tai alacsonyak. Prob�ld ki ezt miel�tt elinditan�d a postmastert:
-
- ulimit -d 262144
-
- limit datasize 256m
-
-   A shellt�l f�gg�en ezek k�z�l csak az egyik fut majd le, de a processzek
-   adatszegmens�t sokkal magasabbra �llitja, ami tal�n el�g lesz a lek�rdez�s
-   v�grehajt�s�hoz. Ez az utas�t�s a jelenlegi processzre (a shelled)
-   �rv�nyes, �s minden �ltala l�trehozott processzre. Ha probl�m�d van az SQL
-   klienssel, mert a szerver t�l nagy adatot k�ld vissza, prob�ld meg e
-   klienssel is ugyanezt.
-
-   4.19) Hogyan tudhatom meg PostgreSQL, milyen verziot futtatok?
-
-   A psql programban select version();
-
-   4.20) Mi�rt kapok "invalid large obj descriptor" hib�t nagy objektumok
-   kezel�s�n�l?
-
-   A nagy objektumok kezel�s�t egy tranzakcios blokkban helyezd el. (BEGIN �s
-   COMMIT k�z�tt)
-
-   Jelenleg a PostgreSQL ezt a szab�lyt azzal teszi k�telez�v�, hogy a
-   tranzakcio v�g�n a nagy objektumokat lez�rja, igy a tranzakcio ut�n az
-   els� m�velet amit az objektumon v�grahajtan�l hib�s lesz.
-
-   Ha olyan programoz�si fel�letet haszn�lsz mint az ODBC vagy a JDBC akkor
-   valoszin�leg ki kell kapcsolnod az auto-commit-ot.
-
-   4.21) Hogy hozhatok l�tre olyan oszlopot, aminek alap�rtelmezett �r�tke a
-   jelenlegi id�?
-
-   Haszn�ld a CURRENT_TIMESTAMP -ot:
-
- CREATE TABLE test (x int, modtime timestamp DEFAULT CURRENT_TIMESTAMP );
-
-   4.22) Mi�rt olyan lass�ak az al-lek�rdez�seim IN-nel?
-
-   Jelenleg az al-lek�rdez�seket a k�ls� lek�rdez�shez csatoljuk. Ha az
-   allek�rdez�s csak kev�s sort eredm�nyez �s a k�ls� lek�rdez�s sokat, akkor
-   az IN is gyors. Az EXISTS kulcsszo haszn�lat�val gyorsithatod a
-   lek�rdez�seket.
-
-   SELECT *
-
- FROM tab
-
- WHERE col IN (SELECT subcol FROM subtab);
-
-   EXISTS haszn�lat�val:
-
- SELECT *
-
- FROM tab
-
- WHERE EXISTS (SELECT subcol FROM subtab WHERE subcol = col);
-
-   Ahhoz hogy ez gyorsan fusson le, a subcol indexelt oszlopnak kell hogy
-   legyen. Rem�lj�k ezt a korl�tot siker�l hamarosan legy�zn�nk.
-
-   4.23) Hogyan tudok outer join-t v�grehajtani?
-
-   A PostgreSQL a szabv�nyos SQL szintaktik�t k�veti. Itt van k�t p�lda:
-
-   SELECT *
-
- FROM t1 LEFT OUTER JOIN t2 ON (t1.col = t2.col);
-
-   vagy
-
- SELECT *
-
- FROM t1 LEFT OUTER JOIN t2 USING (col);
-
-   Ezek az identikus lek�rdez�sek �sszekapcsolj�k a t1.col �s a t2.col
-   mez�ket, �s a t1 b�rmelyik kapcsolatlan sor�t is visszadj�k. A RIGHT JOIN
-   a t2 kapcsolatlan sorait adta volna vissza, a FULL JOIN pedig a kapcsolt,
-   �s mindk�t t�bla kapcsolatlan sorait adja. Az OUTER kulcsszo opcion�lis, a
-   LEFT, RIGHT �s FULL JOIN szintaktikailag helyes. Az �tlagos
-   �sszekapcsol�sokat INNER JOIN-nak nevezz�k.
-
-   Az el�z� kiad�sokban a OUTER JOIN lek�rdez�seket UNION �s NOT IN
-   kulcsszavakkal lehetett szimul�lni. P�ld�ul a tab1 �s a tab2
-   �sszekapcsol�sa:
-
- SELECT tab1.col1, tab2.col2
-
- FROM tab1, tab2
-
- WHERE tab1.col1 = tab2.col1
-
- UNION ALL
-
- SELECT tab1.col1, NULL
-
- FROM tab1
-
- WHERE tab1.col1 NOT IN (SELECT tab2.col1 FROM tab2)
-
- ORDER BY col1
-
-   4.24) Hogyan tudok t�bb adatb�zison v�grehajtani lek�rdez�st?
-
-   Arra nincs lehet�s�g, hogy m�s adatb�zisbol k�rdezz le adatot.Mivel a
-   PostgreSQL adatb�zis specifikus rendszer t�bl�kat t�ltbe, bizonytalan hogy
-   egy adatb�zisok k�z�tti lek�rdez�snek hogyankellene viselkednie.
-
-   A contrib/dblink k�nyvt�rban tal�lsz egy megold�st erre, ami funkcio
-   hiv�sok segits�g�vel m�k�dik. Persze, a kliens hozhat l�treszimult�n
-   kapcsolatot t�bb adatb�zissal, �s �sszef�s�lheti az eredm�nyeket.
-
-   4.25) Hogy tudok t�bb soros vagy oszlopos eredm�nyt visszaadni egy
-   funkciobol?
-
-   A PL/pgSQL t�rolt elj�r�s nyelvvel refcursor haszn�lat�val. R�szletesen
-   itt:
-
-   http://www.PostgreSQL.org/idocs/index.php?plpgsql-cursors.html
-
-   4.26) Mi�rt nem tudom megbizhatoan l�trehozni �s t�r�lni az �tmeneti
-   t�bl�kat a PL/pgSQL funkciokban?
-
-   A PL/pgSQL cacheli a funkciok tartalm�t, aminek az a szerencs�tlen
-   mell�khat�sa, hogy ha egy PL/pgSQL funkcio haszn�l egy �tmeneti t�bl�t,
-   ami k�so"bb t�rl�dik majd ujra l�trej�n, akkor az �jra lefuto funkcio nem
-   fogja megtal�lni a t�bl�t, mert a cache v�ltozat a r�gi t�bl�ra tartalmaz
-   mutatot. A megold�s erre az EXECUTE haszn�lata az �tmeneti t�bl�k
-   kezel�s�re PL/pgSQL-ben. Ez a lek�rdez�s �jraford�t�s�t fogja el�id�zni
-   minden alkalommal.
-
-   4.27) Milyen replik�cios lehet�s�gek vannak?
-
-   B�r a replik�cio egyetlen ter�let, t�bb technologia l�tezik replik�ciora,
-   term�szetesen mindnek meg vannak a maga elo"nyei �s h�tr�nyai.
-
-   A master/slave replik�cios megold�ssal a master adatb�zison hajthatunk
-   v�gre modos�t�sokat, m�g a slave adatb�zisokon csak lek�rdez�seket. A
-   PostgreSQL legn�pszeru"bb master/slave replik�cios megold�sa a Solny-I.
-
-   Sz�mos m�s master/slave replik�cios lehet�s�g l�tezik.Egy List�t
-   olvashatsz ezekr�l itt:
-
-   http://gborg.PostgreSQL.org/genpage?replication_research
-
-   A multi-master replik�cio leheto"v� teszi t�bb master adatb�zis
-   haszn�lat�t, b�r ez a technologia drasztikusan cs�kkenti az adatb�zis
-   teljes�tm�ny�t a sok szinkorniz�cio miatt. A PGCluster a legelterjedtebb
-   ilyen megold�s.
-
-   Egy t�bbfelhaszn�los replik�cios rendszer k�sz�l itt:
-
-   http://gborg.PostgreSQL.org/project/pgreplication/projdisplay.php.
-
-   4.28) Milyen kodol�si lehet�s�gek vannak?
-
-     * A contrib/pgcrypto tartlamaz sz�mos SQL lek�rdez�sben haszn�lhato
-       kodol�st.
-     * A kliens-szerver kommunik�cio rejtjelez�s�re a hostssl haszn�lhato.
-       Ezt a pg_hba.conf-ben enged�lyeztheted.
-     * Az adatb�zis felhszn�lok jelszavait t�rol�skor kodolja a rendszer. 
-     * R�gebbi verziokban a PASSWORD_ENCRYPTION opcioval lehetett
-       bekapcsolni.
-     * A szerveren haszn�lhatsz kodolt f�jrendszert.
-
-     ----------------------------------------------------------------------
-
-A PostgreSQL kiterjeszt�se
-
-   5.1) �rtam egy felhaszn�loi funkciot. Mi�rt core dumpol az adatb�zis
-   amikor haszn�lom?
-
-   Sz�mos probl�ma lehet. El�bb prob�ld ki a funkciodat egy k�l�n�llo
-   alkalmaz�sban.
-
-   5.2) Hogyan lehet �j adatt�pusokat �s funkciokat hozz�adni a PostgreSQL
-   disztrib�ciohoz?
-
-   K�ldd el a kieg�sz�t�seid a pgsql-hackers levelez�si list�ra �s a
-   forr�skodjaid v�g�l a contrib-ban k�tnek ki.
-
-   5.3) Hogyan lehet olyan C funkciot �rni, ami Tuple-t ad vissza?
-
-   A 7.3 verziotol kezdve a PostgreSQL t�mogatja a t�bl�zatokat viszzaado
-   funkciokat C, PL/pgSQL �s SQL nyelveken. B�vebb dokument�ciot a Programozo
-   k�zik�nyvben tal�lsz. Egy C p�lda funkcio tal�lhato a contrib/tablefunc
-   k�nyvt�rban.
-
-   5.4) Megv�ltoztattam egy forr�s �llom�nyt. Mi�rt nem v�ltozik a bin�ris
-   �jraford�t�s ut�n?
-
-   A Makefile-ok nem ismerik a include �llom�nyok megfelel� f�gg�s�geit.
-   V�gre kell hajtanod egy make clean-t, majd �jra egy make-t. Ha GCC-t
-   haszn�lsz felhaszn�lhatod a configure script --enable-depend opcioj�t, �gy
-   a compiler maga fogja ellen�rizni a f�gg�s�geket.
diff --git a/doc/FAQ_japanese b/doc/FAQ_japanese
deleted file mode 100644
index ca2618f8ba..0000000000
--- a/doc/FAQ_japanese
+++ /dev/null
@@ -1,1126 +0,0 @@
-PostgreSQL(�ݥ��ȥ��쥹�����塼������)�ˤĤ��Ƥ褯�������Ȥ��β���(FAQ)
-
-��ʸ�ǽ�������: Thu Jan 01 14:01:00 EDT 2009
-
-���ߤΰݻ�������: Bruce Momjian ([email protected])
-Maintainer of Japanese Translation: Jun Kuwamura (juk at postgresql.jp)
-
-����ʸ��κǿ��Ǥ� http://www.postgresql.org/docs/faqs.FAQ.html �Ǹ��뤳�Ȥ���
-���ޤ���
-
-�ץ�åȥۡ������ͭ�μ���ˤĤ��Ƥ�: http://www.postgresql.org/docs/faq/
-�˲���������ޤ���
-
-(�ʲ������Ԥˤ������� [������ �� ] �ȤǰϤ�ǵ����ޤ���)
-[������
-        ���ܸ��Ǥ�FAQ�ϡ�
-                http://www.postgresql.org/docs/faqs.FAQ_japanese.html
-        �ˤ���ޤ���
-        �ǿ������ܸ��ǤˤĤ��Ƥϡ�����ʸ��κǸ�ˤ�������ܸ��ǤˤĤ��ơפ򤴤�󤯤�������
-
-]
-
-������������������������������������������������������������������������������
-
-                                 ����Ū�ʼ���
-
-1.1) PostgreSQL�Ȥϲ��Ǥ��������θƤ����ϡ� Postgres�Ȥϡ�
-1.2) ï�� PostgreSQL �򥳥�ȥ����뤷�Ƥ��ޤ�����
-1.3) PostgreSQL������Ϥɤ��ʤäƤޤ�����
-1.4) PostgreSQL�򥵥ݡ��Ȥ���ץ�åȥۡ���ϡ�
-1.5) PostgreSQL�Ϥɤ���������Ǥ��ޤ�����
-1.6) �ǿ��Υ�꡼���Ϥɤ�Ǥ�����
-1.7) ���ݡ��ȤϤɤ��Ǽ������ޤ�����
-1.8) �Х���ݡ��ȤϤɤΤ褦��ȯ�����ޤ�����
-1.9) ���ΤΥХ���̤��̵����ǽ�Ϥɤ���äƸ��Ĥ��ޤ�����
-1.10) �ɤΤ褦��ʸ�񤬤���ޤ�����
-1.11) SQL�Ϥɤ�����гؤ٤ޤ�����
-1.12) �ѥå����󶡤����ꡢ��ȯ�����໲�ä���ˤϤɤ�����Ф褤�Ǥ�����
-1.13) ¾��DBMS����٤�PostgreSQL �Ϥɤ��ʤΤǤ����� PostgreSQL���Ȥ߹��ߤ˻Ȥ�
-�ޤ�����
-1.14) PostgreSQL�Ϲ���κǿ��βƻ��֤��ѹ��򰷤��ޤ�����
-1.15) PostgreSQL�Υ᡼��󥰥ꥹ�Ȥι��ɤ����ˤϤɤ�����Ф褤�Ǥ������ޤ�
-���Żҥ᡼����ʣ���Ƽ������ʤ��褦�ˤ���ˤϤɤ����ޤ�����
-
-                          �桼�������饤����Ȥμ���
-
-2.1) PostgreSQL �ˤϤɤ�ʥ��󥿡��ե��������Ȥ��ޤ�����
-2.2) PostgreSQL �� Web �ڡ�����Ϣ�Ȥ�����ˤϤɤ�ʥġ��뤬����ޤ�����
-2.3) PostgreSQL �˥���ե����롦�桼�����󥿡��ե������Ϥ���ޤ�����
-
-                                 ��������
-
-3.1) �ɤ�����С�PostgreSQL��/usr/local/pgsql �ʳ��ξ��˥��󥹥ȡ���Ǥ��ޤ�
-����
-3.2) ¾�Υۥ��Ȥ������³�ϤɤΤ褦�����椷�ޤ�����
-3.3) ����ɤ���ǽ�����뤿��ˤϡ��ǡ����١��������󥸥��ɤΤ褦��Ĵ�����ޤ���
-��
-3.4) �ɤΤ褦�ʥǥХ���ǽ���Ȥ��ޤ�����
-3.5) ��³���褦�Ȥ���Ȥ��� 'Sorry, too many clients' ���Ф�ΤϤʤ��Ǥ�����
-3.6) PostgreSQL�Υ��åץ��졼�ɤμ��Ϥɤ��ʤ�ޤ�����
-3.7) �ϡ��ɥ������ˤϤɤΤ褦�ʥ���ԥ塼����Ȥ��Ф褤�Ǥ�����
-
-                                 ������
-
-4.1) �ǽ�Τ����Ĥ��Υ����Τߤ� select ����ˤϤɤ����ޤ�����������ʥ�����
-4.2) ������줿�ơ��֥롢����ǥå������ǡ����١���������ӡ��桼����ɤΤ褦��
-���Ƹ��Ĥ��Ф��ޤ�����
-4.3) �����Υǡ��������פ��ѹ�����ˤϤɤ����ޤ�����
-4.4) �������ơ��֥롢�ǡ����١����κ��祵�����ϡ�
-4.5) ����Ū�ʥƥ����ȥե�����Υǡ�������¸����ˤϡ��ǡ����١����Υǥ���������
-�ϤɤΤ��餤ɬ�פǤ�����
-4.6) �����꤬�٤��ΤϤʤ��Ǥ��礦���ʤ�������ǥå������Ȥ��ʤ��ΤǤ��礦����
-4.7) �����ꥪ�ץƥ��ޥ��������ɤΤ褦�˥������ɾ�����Ƥ����򡢸���ˤϤɤ�����
-������
-4.8) ����ɽ���Ǥθ�������ʸ���Ⱦ�ʸ���Ȥ���̤��ʤ�����ɽ�������ϤɤΤ褦�˼¸�
-���ޤ�������ʸ���Ⱦ�ʸ���Ȥ���̤��ʤ������Τ���Υ���ǥå����ϤɤΤ褦�˻Ȥ�
-�ޤ�����
-4.9) ���������ǡ��ե�����ɤ� NULL �Ǥ��뤳�Ȥ򸡽Ф���ˤϤɤ����ޤ�����
-NULL�β�ǽ���Τ����Τ�ɤΤ褦�����Ϣ��Ǥ��ޤ���? �ե�����ɤ�NULL���ɤ���
-�ǤɤΤ褦�˥����Ȥ��Ǥ��ޤ�����
-4.10) ����������ʸ�����Τ��줾��ΰ㤤�ϲ��Ǥ�����
-4.11.1) ����(serial)����ư��ʬ�ե�����ɤϤɤΤ褦�ˤĤ���ޤ�����
-4.11.2) SERIAL�ǡ�����������������ͤϡ��ɤ�����������ޤ�����
-4.11.3) currval() ��¾�Υ桼���Ȥζ�����֤˴٤뤳�ȤϤʤ��Ǥ�����
-4.11.4) �ȥ�󥶥���������Ǥ����Ȥ��ˤ⤦�����ɥ��������ֹ椬�Ȥ��ʤ���
-�Ϥʤ��Ǥ������������󥹡�SERIAL�����˶���������ΤϤʤ��Ǥ�����
-4.12) OID �Ȥϲ��Ǥ����� TID �Ȥϲ��Ǥ�����
-4.13) ���顼��å����� "ERROR: Memory exhausted in AllocSetAlloc()"���Ф�ΤϤ�
-���Ǥ�����
-4.14) �ɤΥС������� PostgreSQL �����餻�Ƥ���Τ���Ĵ�٤�ˤϤɤ����ޤ�����
-4.15) ���ߤλ��郎�ǥե���ȤȤʤ�褦�ʥ����ϤɤΤ褦�ˤĤ���ޤ�����
-4.16) �������(outer join)�ϤɤΤ褦�˼¸����ޤ���?
-4.17) ʣ���Υǡ����١�����Ȥ��䤤��碌�ϤɤΤ褦�ˤ���ФǤ��ޤ�����
-4.18) �ؿ�����ʣ���Υ����ޤ��ϥ������֤��ˤϤɤ����ޤ�����
-4.19) PL/PgSQL �δؿ�����ǰ���ơ��֥�˥�����������Ȥ����ɤ����� "relation
-with OID ##### does not exist" �Ȥ������顼��������ΤǤ��礦����
-4.20) �ɤΤ褦�ʥ�ץꥱ�������Υ���塼����󤬤���ޤ�����
-4.21) �ơ��֥�ȥ�����̾���������꡼�����ǧ������ʤ��ΤϤʤ��Ǥ������ʤ���
-ʸ����(����ԥ��饤��)�ϲ�¸����ʤ��ΤǤ���?
-
-                              ���ܸ�˴ؤ������
-
-5.1) ���ܸ줬���ޤ������ʤ��ΤϤʤ��Ǥ�����
-5.2) psql ��Windows���饢�����������Ȥ��ˡ����ܸ줬ʸ����������ΤǤ�����
-5.3) PostgreSQL�����ܸ����ʸ�����ϤǤ��ޤ�����
-������������������������������������������������������������������������������
-
-                                 ����Ū�ʼ���
-
-1.1) PostgreSQL�Ȥϲ��Ǥ��������θƤ����ϡ� Postgres�Ȥϡ�
-
-PostgreSQL��Post-Gres-Q-L(�ݥ��ȡ����쥹�����塼������) ��ȯ�����ޤ��������ä�
-��Ǥ�ñ��� Postgres �ȸƤФ�뤳�Ȥ⤢��ޤ�����"PostgreSQL"��ɤ�ȯ�����뤫
-���ˤʤ�ͤΤ���ˡ������ե�������Ѱդ��Ƥ���ޤ���
-
-PostgreSQL �ϥ��֥�������-��졼����ʥ�ǡ����١��������ƥ�ǡ�����Ū�ʾ��ѥ�
-�����١��������ƥ�ˡ�������DBMS�����ƥ�˸�����褦�ʲ��ɤ��ܤ��줿��ħ��ͭ
-���ޤ���PostgreSQL�ϡ�̵���Ǵ����ʥ����������ɤ�������뤳�Ȥ��Ǥ��ޤ���
-
-PostgreSQL �γ�ȯ�ϡ��ۤȤ�ɤ���������ˤҤ����ä��ܥ��ƥ����γ�ȯ�Ԥˤ�ä�
-�����󥿡��ͥåȤ��̤������ߥ�˥��������ˤ�äƹԤ��Ƥ��ޤ������ߥ�˥ƥ�
-�ˤ��ץ��������ȤǤ��뤿�ᡢ�ɤδ�Ȥ�����⤦���ޤ��󡣳�ȯ�˻��ä��������
-�� http://www.postgresql.org/docs/faqs.FAQ_DEV.html �ˤ��볫ȯ�Ԥ�FAQ�򸫤Ƥ���
-������
-
-Postgres��PostgreSQL�ι����Ȥ��Ƥ��밦�ΤǤ����ޤ����С����졼�ǤΥץ�������
-�ȤǤ�Ȥ�ȻȤ��Ƥ���̾���ǡ��ۤ��Τ�����ΰ��Τ���٤Ƥ��ڤ��˹��ޤ����Ǥ�
-��'PostgreSQL' ��ȯ�����񤷤��Ȼפ��ΤǤ���С����Τ����� 'Postgres' �ȸƤ֤�
-���ˤ��ޤ��礦��
-
-1.2) ï�� PostgreSQL �򥳥�ȥ����뤷�Ƥ��ޤ�����
-
-PostgreSQL�����֡�����Ѱ��񡢤��뤤�ϡ�����ȥ�����򤹤��Ҥ�õ�����Ȥ��Ƥ�
-�����ᤶ��򤨤� ---- ¸�ߤ��ʤ��ΤǤ����桹�ϡ��濴�Ȥʤ륳�ߥåƥ���CVS���ߥ�
-��������ޤ����������Υ��롼�פϥ���ȥ����뤹�뤿��Ȥ������⡢������Τ�
-�ΤǤ��������Ǥϡ��ץ��������Ȥϡ�����Ǥ⻲�ä��Ǥ��볫ȯ�Ԥȥ桼���Υ��ߥ��
-�ƥ��ˤ�������դ����ޤ����ɼԤ����ʤ���Фʤ�ʤ����Ȥϡ��᡼��󥰥ꥹ��
-�򥵥֥����饤�֤��ơ������˻��ä��뤳�ȤǤ�����Developer's FAQ�ˤϡ�PostgreSQL
-��ȯ�˲ä�����ˤĤ��Ƥξ��󤬤���ޤ�����
-
-1.3) PostgreSQL ������Ϥɤ��ʤäƤޤ�����
-
-PostgreSQL �ϲ���������˽����ޤ���
-
-PostgreSQL�ϸŤ������BSD�饤���󥹤β������ۤ���Ƥ��ޤ�������ϴ���Ū�ˤϡ���
-�ѼԤ����Υ����ɤ򹥤���������Ѥ��뤳�Ȥ�������Ƥ��ޤ������¤�����Ȥ���С�
-���Υ��եȥ�������ȼ�������ʤ�����ˤ����Ƥ�ˡŪ����Ǥ��桹����碌�뤳�Ȥ���
-���ʤ��Ȥ������ȤǤ����ޤ����������ɽ�������Υ��եȥ������Τ��٤Ƥ�ʣ����ɽ
-�����뤳�Ȥ�ɬ�פǤ����ʲ��ˡ��桹���ºݤ˻ȤäƤ���BSD���ѵ�����򼨤��ޤ���
-
-    [������
-        ��ʸ�ϱѸ�Ǥ������ͤȤ��ơ���ʸ��ʻ���Ǻܤ��ޤ���
-    ]
-
-
-PostgreSQL Data Base Management System
-
-Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group Portions
-Copyright (c) 1994-1996 Regents of the University of California
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose, without fee, and without a written agreement is
-hereby granted, provided that the above copyright notice and this paragraph and
-the following two paragraphs appear in all copies.
-
-IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST
-PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
-THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND
-THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,
-SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-
-        POSTGRESQL �ǡ����١������������ƥ�
-
-        ��ʬŪ��� (c) 1996-2009, PostgreSQL��ݳ�ȯ���롼��
-        ��ʬŪ��� (c) 1994-1996 ����ե���˥�����ܹ�
-
-
-          �ܥ��եȥ���������Ӥ���ʸ��켰�Ͼ嵭�����ɽ���ȡ�����ʸ��
-        ����Ӥ����³����Ĥ�������Ƥ�ʣ����ź�դ���Ƥ���¤�ˤ���
-        �ơ����ѡ�ʣ����������������դε��Ĥ򡢤����ʤ���Ū�Ǥ��äƤ⡢
-        ̵���Ǥ���Ʊ�ս�̵���˹Ԥʤ��뤳�Ȥ򤳤���ǧ��ޤ���
-
-          ����ե���˥���ؤϡ������ʤ������Ԥˤ������Ƥ⡢���פβ�����
-        �ޤࡢľ��Ū������Ū�����̡��������뤤��ɬ��Ū�ˤ�����餺������
-        »���ˤĤ��ơ����Ȥ�����ե���˥���ؤ�������»���ˤĤ�������
-        ������Ƥ����Ȥ��Ƥ⡢���ڤ���Ǥ���餤�ޤ���
-
-          ����ե���˥���ؤϡ�������Ū�ˤ�������ۤ��ݾڤȡ�������Ū��
-        ��Ŭ�����˴ؤ��ƤϤ�Ȥ�ꡢ�����˸¤餺�������ʤ��ݾڤ�������
-        �뤳�Ȥ��������ޤ����ʲ����Ѱդ��줿���եȥ������ϡ֤��Τޤޡפ�
-        ���ܸ����Ȥ�������ե���˥���ؤϤ����ݻ����ٱ硢���������ɤ�
-        �뤤�Ͻ��������̳���餤�ޤ���
-
-    [������
-        ����˴ؤ�����ʸ�Ͼ嵭�αѸ�ˤ��ɽ���Ǥ������ܸ����Ϥ����ޤ�
-        �������٤Ȥ��Ƥ���������
-    ]
-
-
-1.4) PostgreSQL�򥵥ݡ��Ȥ���ץ�åȥۡ���ϡ�
-
-����Ū�ˡ��Ƕ��Unix�ߴ��ץ�åȥۡ���Ǥ����PostgreSQL���Ư��������Ϥ���
-������꡼���λ����Ǽºݤ˥ƥ��Ȥ�Ԥʤä����Ȥ���𤬤ʤ��줿�ץ�åȥۡ����
-�Ĥ��Ƥϥ��󥹥ȡ����������󤷤Ƥ���ޤ���
-
-PostgreSQL �ϡ�Win2000 SP4, WinXP, �����ơ�Win2003 �ʤ� Microsoft Windows NT��
-�����Υ��ڥ졼�ƥ��󥰥����ƥ�ǡ��ͥ��ƥ��֤�����ޤ������餫����ѥå�������
-���줿���󥹥ȡ��餬 http://www.postgresql.org/download/windows ������������
-�ɤǤ��ޤ��� MSDOS�١�����Windows�ΥС������(Win95, Win98, WinMe)�Ǥϡ�Cygwin
-��Ȥä� PostgreSQL �����餻�뤳�Ȥ��Ǥ��ޤ���
-
-    [����
-        ���ܸ�Ǥξ���ϡ����� Windows�Ǥ˴ؤ���FAQ�������򤴤�󤯤���
-    ���ʤ��Ť��Ǥ��ˡ�
-        http://old.postgresql.jp/wg/jpugdoc/FAQ_windows.ja.html
-    ]
-
-
-���Υ����Ȥ� Novell Netware 6 �ؤΰܿ��Ǥ⤢��ޤ��� http://
-developer.novell.com/wiki/index.php/Postgresql �ޤ���OS/2 (eComStation) �С���
-���ϡ� http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&button=Search&key=
-postgreSQL&stype=all&sort=type&dir=%2F�ˤ���ޤ���
-
-
-1.5) PostgreSQL �Ϥɤ���������Ǥ��ޤ�����
-
-Web�֥饦����ͳ���ȡ� http://www.postgresql.org/ftp/�����줫�顢ftp��ͳ���ȡ�
-ftp://ftp.postgresql.org/pub/ ��Ȥ��ޤ���
-
-1.6) �ǿ��Υ�꡼���Ϥɤ�Ǥ�����
-
-PostgreSQL �κǿ��ǤϥС������ 8.3.5 �Ǥ���
-
-�桹�ϡ�1ǯ��˥᥸�㡼��꡼���򡢿�����ȤΥޥ��ʡ���꡼����Ԥʤ����Ȥ��
-�褷�Ƥ��ޤ���
-
-    [����
-        �С�������ֹ�� x.y.z �κǽ�� x.y ���᥸�㡼��꡼�����ֹ����
-        �������Ǹ�� z ���ޥ��ʡ���꡼�����ֹ�ˤʤ�ޤ����᥸�㡼��꡼
-        �����ֹ椬Ʊ���Ǥ���С��ǡ����١��������饹���˸ߴ���������ޤ���
-    ]
-
-
-1.7) ���ݡ��ȤϤɤ��Ǽ������ޤ�����
-
-PostgreSQL ���ߥ�˥ƥ���¿���Υ桼���Τ���ˡ��Żҥ᡼���ͳ�λٱ���󶡤��Ƥ�
-�ޤ����Żҥ᡼��ꥹ�Ȥ򥵥֥����饤�֤��뤿��Υᥤ��Ȥʤ륦���֥����Ȥ�
-http://www.postgresql.org/community/lists/�Ǥ������줫�顢�Ϥ��ΤǤ����
-general �ޤ��ϡ�bugs �Ȥ��ä��ꥹ�Ȥ��褤�Ǥ��礦��
-
-�᥸�㡼��IRC �����ͥ�ϡ�Freenode (irc.freenode.net)�� #postgresql �Ȥ�����
-���ͥ�Ǥ���UNIX ���ޥ�ɤǤϡ� irc -c '#PostgreSQL' "$USER" irc.freenode.net
-��Ȥäƻ��äǤ��ޤ���Ʊ���ͥåȥ���ˡ����ڥ����Υ����ͥ� (#
-postgresql-es)���ե�󥹸�Υ����ͥ� (#postgresqlfr)���֥饸�������ͥ� (#
-postgresql-br) �⤢��ޤ����ޤ���EFNet�ˤ�PostgreSQL�����ͥ뤬����ޤ���
-
-    [����:
-          1999ǯ7��23�������ܥݥ��ȥ��쥹�桼������ά��JPUG����Ω����ޤ�����
-        JPUG ��������ȿ��ǡ�PostgreSQL�����Ѥ����ã����߶��Ϥξ�ȤʤäƤ��ޤ���
-        (2006ǯ �����������ư(NPO)ˡ������PostgreSQL�桼����ˤʤ�ޤ�����
-        Web�����������β����̵���Ǥ�������������β���Ȳ���ι׸���
-          ��ϱ��Ĥ���Ƥ��ޤ���)
-        �ܤ����ϡ�JPUG ��Web ������:
-                http://www.postgresql.jp/
-        �򤴤�󤯤�������
-
-        ���ܸ��IRC�����ͥ� '#PostgreSQL:*.jp' ��¸�ߤ��ޤ���
-    ]
-
-
-���ѥ��ݡ��Ȳ�ҤΥꥹ�Ȥ� http://www.postgresql.org/support/
-professional_support�ˤ���ޤ���
-
-1.8) �Х���ݡ��ȤϤɤΤ褦��ȯ�����ޤ�����
-
-http://www.postgresql.org/support/submitbug ��PostgreSQL �Х��ե������ˬ��Ƥ�
-���������Х���ݡ��Ȥ���Ф�������ˤĤ��Ƥμ���Ȼؿˤ�����ޤ���
-
-�����Ʊ���� ftp ������ ftp://ftp.postgresql.org/pub/ �ǡ��ǿ��С�������
-PostgreSQL ��õ���ƤߤƤ���������
-
-1.9) ���ΤΥХ���̤��̵����ǽ�Ϥɤ���äƸ��Ĥ��ޤ�����
-
-PostgreSQL�ϳ�ĥ���줿SQL:2003�Υ��֥��åȤ򥵥ݡ��Ȥ��ޤ����桹�Υڡ����� TODO
-�ꥹ�Ȥˡ����ΤΥХ�����ǽ�侭��ײ�ˤĤ��Ƥε��Ҥ�����ޤ���
-
-��ħ���׵�����̼��Τ����줫�β�������ˤ���ޤ���
-
- �� ���ˤ����ˤ��뵡ǽ�ϡ� TODO �ꥹ�ȤǤ�
- �� ���Τ褦�ʵ�ǽ�������ޤ�Ƥ��ޤ��󡣤���ϡ�
-     �� SQL���ʤ˽ऺ���¸�ε�ǽ�Ƚ�ʣ������
-     �� �����ɤ�ʣ�����Ф������ơ������Τ����ʤ���ǽ
-     �� ���������Τ���ʤ���ǽ
- �� ��������ǽ�ϡ� TODO �Υꥹ�Ȥ˲ä������ޤ���
-
-�桹�ϡ�PostgreSQL �˴ؤ��ơ��Żҥ᡼���ľ���б����� TODO �ꥹ�Ȥ�ǿ��˹�����
-�Ƥ椯�ۤ���������Ū�Ǥ��뤳�Ȥ��ΤäƤ��ޤ��Τǡ��Х����ץ����ƥ�ϻȤ��ޤ�
-�󡣸��¤ˡ����Υ��եȥ���������ǥХ��Ϥ���ۤ�Ĺ���Ϥ�³���ޤ��󤷡�¿���Υ�
-�����˱ƶ�����Х�����ޤ˽�������ޤ���PostgreSQL�Υ�꡼���ǡ����٤Ƥ��ѹ���
-���������������ơ����������Τꤿ����С� CVS �Υ�����å������򸫤Ƥ�����������
-�꡼���Ρ��Ȥˤ��������Υ��եȥ������˲ä���줿���٤Ƥ��ѹ��������夵��Ƥ���
-����
-
-1.10) �ɤΤ褦��ʸ�񤬤���ޤ�����
-
-���դ���ˡ������Ĥ��Υޥ˥奢��ȥ���饤�󡦥ޥ˥奢��(�ޥ˥奢�롦�ڡ���)��
-��Ӥ����Ĥ��ξ����ʥƥ������꤬�ޤޤ�ޤ��� /doc�ǥ��쥯�ȥ�򤴤�󤯤�������
-�ޤ����ޥ˥奢��ϡ� http://www.postgresql.org/docs/�ǥ���饤��Ǥ�����Ǥ���
-����
-
-    [����:
-        JPUG ʸ�񡦽��Ҵ�Ϣʬ�ʲ���������줿�ޥ˥奢��⤢��ޤ���
-
-        http://www.postgresql.jp/document/pg830doc/
-        ����ץ쥹���顢
-
-        PostgreSQL���ե������ޥ˥奢��Ȥ��ƽ��Ǥ���Ƥ��ޤ���
-    ]
-
-
-����饤��ǻ��ȤǤ��� PostgreSQL ���ܤ�2������ޤ��� http://www.postgresql.org
-/docs/books/awbook.html
-
-    [����:
-        �����ܤϡ�JPUG��PostgreSQL Book����ʬ�ʲ��
-        ���������졢�ԥ����󤫤�
-        �֤Ϥ���Ƥ�PostgreSQL�פȤ��ƽ��Ǥ���Ƥ��ޤ���
-    ]
-
-
-����ӡ� http://www.commandprompt.com/ppbook/�Ǥ���
-
-    [����:
-        ˮ���ϡּ��� PostgreSQL��
-        �����饤�꡼������Ǥ���Ƥ��ޤ���
-    ]
-
-
-������ǽ�ʽ��Ҥ���Ͽ�ϡ�http://www.postgresql.org/docs/books/ �ˤ���ޤ���
-PostgreSQL ���Ѿ��󵭻��⡢http://wiki.postgresql.org/wiki/
-Community_Generated_Articles%2C_Guides%2C_and_Documentation �ˤ���ޤ���
-
-    [����:
-        ���ܸ�ν������ˤĤ��Ƥϡ�����PostgreSQL�桼����Ρ�http://www.postgresql.jp/PostgreSQL/references.html
-        �⤴��󤯤�������
-    ]
-
-
-���ޥ�ɥ饤��Υ��饤����ȥץ������psql �ˤ⡢�����黻�ҡ��ؿ������󡢤���¾
-�ξ����Ĵ�٤뤿��ˡ������餷�� \d ���ޥ�ɤ������Ĥ�����ޤ��� \? �����Ϥ���
-�����Ѳ�ǽ�ʥ��ޥ�ɤ�ɽ������ޤ���
-
-�桹�� Web �����Ȥˤϡ������������ʸ�񤬤���ޤ���
-
-    [����:
-        2008ǯ11��18����PostgreSQL��ڤΤ���˰��̸����ξ���򰷤�
-        ��Let's Postgres�פȤ����ݡ����륵���Ȥ������ץ󤷤ޤ�����http://lets.postgresql.jp/
-    ]
-
-
-1.11) SQL �Ϥɤ�����гؤ٤ޤ�����
-
-�ޤ����嵭�ǽҤ٤� PostgreSQL �ˤĤ��Ƥ��ܤ��ɤळ�Ȥ�Ƥ���Ƥ��������� The
-Practical SQL Handbook, Bowman Judith S. et al., Addison-Wesley ��¿���Υ桼��
-�˹�ɾ�Ǥ����ۤ��Ǥϡ�The Complete Reference SQL, Groff et al., McGraw-Hill ��
-��ɾ�Ǥ���
-
-�����餷�������ϡ�
- 
-http://www.intermedia.net/support/sql/sqltut.shtm
-http://sqlcourse.com
-http://www.w3schools.com/sql/default.asp
-http://mysite.verizon.net/Graeme_Birchall/id1.html
-http://sqlzoo.net �ˤ���ޤ���
-
-    [����:
-         ����PostgreSQL�桼��������ܸ�λ���ʸ���ξҲ�ڡ���
-
-http://www.postgresql.jp/PostgreSQL/references.html
-        ������ޤ���
-         �����ѱѻ�Ρ�PostgreSQL���ܸ�ޥ˥奢���
-                http://www.net-newbie.com/
-        �Ǥϥ���饤��ޥ˥奢��θ������Ǥ��ޤ���
-         �ݻ������׻��UNIX �ǡ����١�������
-                http://www.wakhok.ac.jp/DB/DB.html
-        �⥪��饤����ɤळ�Ȥ��Ǥ��ޤ���
-         Nikkei BP IT Pro �ˤ����а�ã�׻�� PostgreSQL �����å�
-        �Ǥ���󿷤��������Ȥꤢ���Ƥ��ޤ���
-    ]
-
-
-1.12) �ѥå����󶡤����ꡢ��ȯ�����໲�ä���ˤϤɤ�����Ф褤�Ǥ�����
-
-�ʳ�ȯ�Ը����Ρ�Developer's FAQ�򤴤�󤯤�������
-
-1.13) ¾��DBMS�����PostgreSQL�Ϥɤ��ʤΤǤ����� PostgreSQL���Ȥ߹��ߤ˻Ȥ��ޤ�
-����
-
-���եȥ�������ɾ��������ˡ�ˤϤ����Ĥ�����ޤ�����ǽ����ǽ�ȿ������ȥ��ݡ��Ȥ�
-���ʤǤ���
-
-��ǽ(Features)
-    PostgreSQL�ϡ��ȥ�󥶥�����󡢥��֥����ꡢ�ȥꥬ�����ӥ塼��������������
-    �����ȡ�����ӡ��������줿���å������ʤɡ��絬�Ͼ��� DBMS�����ĵ�ǽ��ۤȤ�
-    �ɻ��äƤ��ޤ�������� PostgreSQL�ϡ��桼����������Ѿ����롼�롢���줫�顢
-    ���å������̾�����ޥ���С������Ʊ��������ʤɡ�����DBMS�������碌��
-    ���褦�ʵ�ǽ�򤤤��Ĥ�������碌�Ƥ��ޤ���
-��ǽ(Performance)
-    PostgreSQL��¾�ξ��Ѥ��뤤�ϥ����ץ󥽡����Υǡ����١����ȸ߳Ѥ���ǽ�����
-    �ޤ��������̤ǤϤ���ᤫ�ä��ꡢ�ۤ����̤ǤϤ���٤��ä��ꤷ�ޤ���¾�Υǡ�
-    ���١�������٤���ǽ�ϡ��դĤ� +/-10% ���餤�Ǥ��礦��
-������(Reliability)
-    �桹�ϡ�DBMS�ο��������⤯�ʤ��ƤϤ��β��ͤ�̵�����Ȥ����򤷤Ƥޤ�����ʬ��
-    ���Ȥ��ơ����ꤷ�������ɤ�Х���Ǿ��ˤ��Ƥ����꡼������褦���ؤ�Ƥޤ�
-    �����줾��Υ�꡼���Ͼ��ʤ��Ȥ�1 ����ʾ�Υ١������ƥ��Ȥ�Ԥʤ��������
-    �ǤΥ�꡼�������򤬡������ǤȤ��ư��ꤷ�����Ǥʥ�꡼���Ǥ��뤳�Ȥ�ʪ���
-    �Ƥ��ޤ�������ʬ��Ǥϡ�¾�Υǡ����١�������٤Ƥ�½�����ʤ����Ȥ˼������
-    �äƤ��ޤ���
-���ݡ���(Support)
-    �桹�Υ᡼��󥰥ꥹ�Ȥϡ��������뤤���ʤ�����ˤĤ��Ƥ���ؤμ������
-    �Ƥ���롢��ȯ�Ԥ�桼�����礭�ʽ��ޤ�ؤ��������󶡤��Ƥ��ޤ����桹������
-    �β����ݾڤ��뤳�ȤϤǤ��ޤ��󤬡����ѥǡ����١����Ǥ��äƤ��˲�褵��
-    ��櫓�ǤϤ���ޤ��󡣳�ȯ�Ԥ䡢�桼�������ߥ�˥ƥ����ޥ˥奢���ࡢ�����
-    �������������ɤʤɤ�ľ�ܥ��������Ǥ��뤳�Ȥˤ�äơ�PostgreSQL�Υ��ݡ��Ȥ�
-    ��¾��DBMS ���ݡ��Ȥ���ͥ�줿��ΤȤʤäƤ��ޤ�������˾�������ơ��������
-    ���ѥ��ݡ��Ȥʤɤ⤢��ޤ���FAQ1.7��򤴤�󤯤������ˡ�
-����(Price)
-    PostgreSQL�����Ѥϡ����ѤǤ����ѤǤ⡢���٤�̵���Ǥ����嵭�˼����Ƥ���BSD
-    ��������λ��ѵ����˳���ʤ��¤ꡢPostgreSQL�Υ����ɤ�����̵���Ǿ��ʤ��Ȥ�
-    ���ळ�Ȥ��Ǥ��ޤ���
-
-PostgreSQL�ϥ��饤����ȡ������С��������ƥ�������߷פ���Ƥ��ơ����饤�����
-�ȥ����Ф���Ӥ����������뤤�������ʥץ��������̡������뤳�Ȥ��׵ᤵ��ޤ���
-¿�����Ȥ߹��ߥ������ƥ�����Ϥ��Τ褦���׵�򥵥ݡ��Ȳ�ǽ�Ǥ��������������Ȥ�
-�ˤʤäƤ����Ȥ߹��ߥ������ƥ�����ˤ�äƤϡ��ǡ����١��������Ф����ץꥱ����
-��󡦥ץ�������������뤳�Ȥ��׵ᤵ����礬���ꡢPostgres��Ȥ����ȤϤǤ���
-���Τǡ����̤Υǡ����١�������塼���������򤹤٤��Ǥ���
-
-1.14) PostgreSQL�Ϲ���κǿ��βƻ��֤��ѹ��򰷤��ޤ�����
-
-�罣��βƻ��֤��ѹ��ϡ�PostgreSQL�Υ�꡼��8.0.4�ʹ�[4+]�ȡ����θ�Υ᥸�㡼��
-�꡼�������Ȥ��� 8.1 �ˤϴޤޤ�Ƥ��ޤ������ʥ��ȥ����������ȥ�ꥢ���ѹ��ϡ�
-8.0.[10+], 8.1.[6+] ����ӡ����θ�Υ᥸�㡼��꡼���Τ��٤Ƥ˴ޤޤ�ޤ���8.0��
-������PosrgreSQL�Ǥϥ��ڥ졼�ƥ��󥰥����ƥ�Υ����ॾ����ǡ����١�����ƻ���
-����Τ���˻ȤäƤ��ޤ���
-
-������������������������������������������������������������������������������
-
-1.15) PostgreSQL�Υ᡼��󥰥ꥹ�Ȥι��ɤ����ˤϤɤ�����Ф褤�Ǥ������ޤ�
-���Żҥ᡼����ʣ���Ƽ������ʤ��褦�ˤ���ˤϤɤ����ޤ�����
-
-PostgreSQL��Majordomo �ڡ������顢PostgreSQL�˴ؤ���ʣ���Υ᡼��󥰥ꥹ�Ȥι�
-�ɤγ��Ϥ���ߤ��Ǥ���褦�ˤʤäƤ��ޤ����ʥ������󤹤뤿��ˤ�Majaordomo����
-��������ܿͤΥѥ���ɤ�ɬ�פˤʤ�ޤ�����
-
-PostgreSQLno���٤ƤΥ᡼��󥰥ꥹ�ȤǤϡ��ֿ��ϥ᡼��󥰥ꥹ�ȤȤ��ĸ��Υ᡼
-�����ƼԤ�������褦�˹������Ƥ���ޤ�������ˤ����ѼԤϡ���äȤ��®�˥�
-����ؤ��ֿ����������褦�ˤʤäƤ��ޤ�������ľ�ܼ�����äƤ���᡼��򡢥�
-���Ȥ����ʣ���Ƽ�����ꤿ���ʤ����ϡ�Majordomo ��Change Settings�ڡ������顢
-eliminatecc������å����ޤ����ޤ���selfcopy�Υ����å���Ϥ������Ȥǡ���ʬ������
-���᡼��Υ��ԡ���������ʤ��褦�ˤ�Ǥ��ޤ���
-
-                          �桼�������饤����Ȥμ���
-
-2.1) PostgreSQL �ˤϤɤ�ʥ��󥿡��ե��������Ȥ��ޤ�����
-
-PostgreSQL �Υ��󥹥ȡ���˴ޤޤ��ʪ��C���ȹ��� C�Υ��󥿡��ե����������Ǥ���
-����¾�Υ��󥿡��ե���������Ω�����ץ��������Ȥǡ��̡��˥���������ɤ���ޤ���
-ʬ����뤳�Ȥǡ����줾��γ�ȯ�����ब�ȼ��Υ�꡼���������塼�����Ĥ��Ȥ���
-����ޤ���
-
-PHP �Τ褦�ʤ����Ĥ��Υץ�����ߥ󥰸���ϡ� PostgreSQL�Υ��󥿡��ե�������ޤ�
-�Ǥ��ޤ���Perl, TCL, Python, �����ơ����Τۤ������Ѳ�ǽ�ʸ���Υ��󥿡��ե�����
-�ϡ�http://pgfoundry.org �� Drivers/Interfaces �������ȥ��󥿡��ͥåȤθ�����
-�ߤĤ����ޤ���
-
-2.2) PostgreSQL �� Web �ڡ�����Ϣ�Ȥ�����ˤϤɤ�ʥġ��뤬����ޤ�����
-
-�ǡ����١�����΢�˻��� Web �ڡ����ˤĤ��Ƥ������餷���Ҳ𤬡�
-http://www.webreview.com�ˤ���ޤ���
-
-Web �ؤγ�ĥ�Τ���ˤϡ�PHP(http://www.php.net/) ����ۤ������󥿡��ե������Ȥ�
-�äƤ��ޤ���
-
-    [����:
-          PHP�˴ؤ������ܸ�ξ���ϡ�2000ǯ4��19����ȯ­��������PHP�桼����Υ�����
-                http://www.php.gr.jp/
-        ���뤤�ϡ�ע�� �व��Υ�����
-                http://www.geocities.jp/rui_hirokawa/php/
-        �ˤ��ʤ�ޤȤ���Ƥ��ޤ���
-    ]
-
-
-������ʣ���ʾ�硢¿���οͤ� Perl ���󥿡��ե������� CGI.pm �� mod_perl ��Ȥ�
-�ޤ���
-
-2.3) PostgreSQL �˥���ե����롦�桼�����󥿡��ե������Ϥ���ޤ�����
-
-���Ѥȥ����ץ󥽡�����ȯ�Ԥˤ����ξ���ǡ�PostgreSQL�ˤ�¿����GUI�ġ��뤬����
-��ǽ�ǡ��ܺ٤ʥꥹ�Ȥϡ� PostgreSQL GUI �ġ���ˤĤ��ƤΥ��ߥ�˥ƥ������ɤˤ�
-����󤯤�������
-
-    [����:
-        pgAdmin3 ��PostgreSQLɸ��GUI�����ġ���ǡ�Windows��(PostgreSQL
-        for Windows) ��Ʊ������Ƥ��ޤ����ܤ�������ϡ�
-        http://www.pgadmin.org/�ˤ���ޤ���
-    ]
-
-
-������������������������������������������������������������������������������
-
-                                 ��������
-
-3.1) �ɤΤ褦�ˤ���� /usr/local/pgsql �ʳ��ξ��˥��󥹥ȡ���Ǥ��ޤ�����
-
-��ñ����ˡ�ϡ� configure �����餻��Ȥ��� --prefix ���ץ�������ꤹ�뤳�ȤǤ�
-��
-
-3.2) ¾�Υۥ��Ȥ������³�ϤɤΤ褦�����椷�ޤ�����
-
-�����ͤǤϡ�PostgreSQL �� Unix �ɥᥤ�󥽥��åȡ��ޤ��ϡ�TCP/IP��³�Υ��������
-���󤫤����³���������ޤ���postgresql.conf ����� listen_addresses ������
-�����ġ�$PGDATA/pg_hba.conf �ե������Ŭ�ڤ�ľ�����ǡ����١��������Ф�Ƶ�ư��
-�ơ��ۥ��ȥ١�����ǧ�ڤ�ͭ���ˤ��ʤ�������ϡ�¾�Υޥ��󤫤����³�Ǥ��ʤ��Ǥ�
-�礦��
-
-3.3) ����ɤ���ǽ�����뤿��ˤϡ��ǡ����١��������󥸥��ɤΤ褦��Ĵ�����ޤ���
-��
-
-��ǽ�����β�ǽ���Τ��ꤽ���ʼ���ΰ褬3�Ĥ���ޤ���
-
-��������ѹ�
-    ������������Ƥ���ɤ���ǽ�����뤳�Ȥ�ޤߤޤ���
-     �� ���������ʬ����ǥå�����ޤࡢ����ǥå��������
-     �� ʣ����INSERT�Τ�����COPY�����
-     �� ʣ����ʸ�򥰥롼�ײ�����1�ĤΥȥ�󥶥������ˤ��ƥ��ߥåȤΥ����Хإ�
-        �ɤ�︺
-     �� ����ǥå������餫�������Υ�������Ф��Ȥ���CLUSTER�����
-     �� ������ν��ϤΥ��֥��åȤ��֤������LIMIT�����
-     �� ��������Ƥ��륯��������
-     �� ���ץƥ��ޥ��������Τ����פ�ݻ����뤿���ANALYZE�����
-     �� VACUUM �ޤ��� pg_autovacuum �ξ���
-     �� �礭�ʥǡ����ѹ��Τ���Ȥ��ϥ���ǥå�������
-
-
-�������
-    postgresql.conf������Τ����Ĥ�����ǽ�˱ƶ����ޤ����ܤ����ϡ�
-    Administration Guide/Server Run-time Environment/Run-time Configuration ��
-    ����ꥹ�Ȥ򤴤�󤯤�����( JPUG�����Ȥ����ܸ��ǡ������Фι���)�������ơ���
-    ��Ȥ��ơ� http://www.varlena.com/varlena/GeneralBits/Tidbits/
-    annotated_conf_e.html ����ӡ� http://www.varlena.com/varlena/GeneralBits/
-    Tidbits/perf.html �򤴤�󤯤�������
-
-�ϡ��ɥ�����������
-    ��ǽ�ˤ�����ϡ��ɥ������αƶ��� http://www.powerpostgresql.com/PerfList/
-    �ȡ� http://momjian.us/main/writings/pgsql/hw_performance/index.html (JPUG
-    �����Ȥ����ܸ���) �˽Ҥ٤��Ƥ��ޤ���
-
-
-    [����:
-      JPUG����Ĺ���Ҳ�͵����ˤ�롢�ֺ������Ǥ���PostgreSQL���塼�˥󥰡�
-      �Ȥ��������ʡ��� ThinkIT �����Ȥˤ��ꡢ�º�Ȥλ��ͤˤʤ�ޤ���
-        http://www.thinkit.co.jp/free/tech/10/1/1.html
-    ]
-
-
-3.4) �ɤΤ褦�ʥǥХ���ǽ���Ȥ��ޤ�����
-
-�����й����ѿ��ˤĤ��Ƥϡ� href="http://www.postgresql.org/docs/current/
-interactive/runtime-config-logging.html">http://www.postgresql.org/docs/current
-/interactive/runtime-config-logging.html �˼������褦��¿���� log_* �����ꡢ
-������ȥץ����������׾������Ϥ��뤳�Ȥ��Ǥ����ǥХ�����ǽ¬��ˤϤȤƤ�����
-�Ǥ���
-
-3.5) ��³���褦�Ȥ���Ȥ��� 'Sorry, too many clients' ���Ф�ΤϤʤ��Ǥ�����
-
-����Ǥ����¤Ǥ��� 100 �Υǡ����١������å�����ã���Ƥ��ޤäƤ��ޤ��������С�
-��Ʊ����³�Ǥ���Хå�����ɥץ������������ͤ����䤹ɬ�פ�����ޤ���
-postgresql.conf �����max_connections ���ͤ��ѹ����ƥ����Ф�Ƶ�ư���뤳�ȤDz�
-ǽ�ˤʤ�ޤ���
-
-3.6) PostgreSQL�Υ��åץ��졼�ɤμ��Ϥɤ��ʤ�ޤ�����
-
-�С�������ֹ��դ������ˤˤĤ��ơ��������̤ˤĤ��Ƥβ����http://
-www.postgresql.org/support/versioning �򡢤����ơ����åץ��졼�ɤˤĤ��Ƥΰ���
-Ū�������� http://www.postgresql.org/docs/current/static/install-upgrading.html
-��������������
-
-[������
-   ���åץ��졼�ɤˤĤ��Ƥ������Ǥϲ����ˤ���ޤ���
-  http://www.postgresql.jp/document/current/html/install-upgrading.html
-]
-
-[������
-   ��ʸ�Ǥϡ����������Ƥ���Ω�����ڡ����˰ܤ��졢�������Ƥ��ޤ���
-
-��������ǽ���������PostgreSQL�Υ᥸�㡼��꡼���Ϥ�������ǯ��1�����ٹԤʤ��ޤ�
-���᥸�㡼��꡼���ϡ����Ȥ��С�8.1����8.2�ؤΤ褦�ˡ��С�������ֹ��1���ܤ�2
-���ܤ���ʬ�����䤷�Ƥ椭�ޤ���
-
-PostgreSQL�Υ᥸�㡼��꡼�����̾�����ƥ�ơ��֥�ȥǡ����������ե����ޥå�
-���ѹ����ޤ����������ѹ��Ϥ����Ƥ���ʣ���ʤΤǤǡ��ǡ����ե�����θ����ߴ���
-��ݻ�������Ϥ��ޤ��󡣥᥸�㡼���åץ��졼�ɤΤ���ˤϡ��ǡ����١����Υ����/
-������ɤ�ɬ�פˤʤ�ޤ���
-
-�ޥ��ʡ���꡼���ϡ����Ȥ��С�8.1.5 ����8.1.6�ؤΤ褦�ˡ��С�������ֹ��3����
-���ͤ����䤷�ޤ���PostgreSQL������ϡ��ޥ��ʡ���꡼�����Ф��Ƥϡ��Х��ե�����
-�����Ԥʤ��ޤ��󡣤��٤ƤΥ桼���ϡ��Ǥ�������ǿ��Υޥ��ʡ���꡼���˹�������
-���Ǥ������åץ��졼�ɤˤϡ���˥ꥹ�����Ĥ���ΤǤ����顢PostgreSQL�Υޥ��ʡ�
-������꡼���Ǥϡ����ˤ�ȯ�������ꡢ�������ƥ��˴ط������ꡢ�ǡ������Ĥ֤��
-�Х����������������åץ��졼�ɤΥꥹ����Ǿ��¤ˤȤɤ�ޤ����桹�Υ��ߥ�˥�
-���Ǥϡ����åץ��졼�ɤ���ꥹ�����⡢���åץ��졼�ɤ��ʤ��ꥹ���Τۤ����⤤
-�ȹͤ��Ƥ��ޤ���
-
-�ޥ��ʡ���꡼���Υ��åץ��졼�ɤˤϥ���פȥꥹ�ȥ���ɬ�פϤʤ����ǡ����١���
-�����Ф���ߤ��ơ����åץǡ��Ȥ��줿�Х��ʥ�򥤥󥹥ȡ��뤷�������Ф�ꥹ����
-�Ȥ��ޤ���
-
-]
-
-3.7) �ϡ��ɥ������ˤϤɤΤ褦�ʥ���ԥ塼����Ȥ��Ф褤�Ǥ�����
-
-PC�ϡ��ɥ������ϤۤȤ�ɸߴ���������ޤ��Τǡ��ۤȤ�ɤοͤϡ����٤Ƥ�PC�ϡ���
-��������Ʊ���ʼ����Ȼפ����෹��������ޤ���������������ϴְ㤤�Ǥ���ECC RAM��
-SCSI������ӡ����ʼ��ޥ����ܡ��ɤϡ��¤��ϡ��ɥ���������٤�ȡ���꿮��������
-���������ǽ���ɤ��ΤǤ��� PostgreSQL �ϤۤȤ�ɤΥϡ��ɥ������Dz�Ư���ޤ�����
-����������ǽ�����פʾ��ϡ�������Υϡ��ɥ������Υ��ץ����ˤĤ���Ĵ�����뤳
-�Ȥ������Ǥ����Хåƥ꡼�Хå����å��դ��Υ���å������ĥǥ���������ȥ�����
-�����Ω���ޤ����桹�Υ᡼��󥰥ꥹ�Ⱦ�Ǥ�ϡ��ɥ��������ץ����Υȥ졼�ɥ�
-�դˤĤ��Ƶ������뤳�Ȥ��Ǥ��ޤ���
-
-������������������������������������������������������������������������������
-
-                                 ������
-
-4.1) �ǽ�ο������Τߤ� SELECT����ˤϤɤ����ޤ�����������ʥ�����
-
-�����������������ۤ�ο��Ԥǡ�SELECT �μ¹Ի��˼�����������ο���ʬ���äƤ����
-LIMIT ��Ȥ��ޤ��礦������ǥå����� ORDER BY �ȥޥå�����С����������Τ�(�ݤ�
-��)�¹Ԥ��ʤ��Ƥ�Ѥ���⤢��ޤ���SELECT ��������ǥ����ο��������ʤ顢����
-�����Ȥä� FETCH ���ޤ��礦��
-
-������˥�����SELECT����ˤϡ�����ʸ��Ȥ��ޤ���
-
-    SELECT col
-    FROM tab
-    ORDER BY random()
-    LIMIT 1;
-
-4.2) ������줿�ơ��֥롢����ǥå������ǡ����١���������ӡ��桼����ɤΤ褦��
-���Ƹ��Ĥ��Ф��ޤ�����psql�ǻȤ��Ƥ��륯�����ɽ������ˤϤɤ����ޤ�����
-
-psql ����� \dt���ޥ�ɤ�Ȥäƥơ��֥�򸫤뤳�Ȥ��Ǥ��ޤ���psql����� \? ���
-�äơ����ޥ�ɤ����ꥹ�Ȥ�Ĵ�٤뤳�Ȥ��Ǥ��ޤ��������ǡ�psql �Υ����������ɤǡ�
-�Хå�����å��女�ޥ�ɤ���Ϥ��� pgsql/src/bin/psql/describe.c �ե�������ɤ�
-���Ȥ�Ǥ��ޤ���������ˤϡ� SQL ���ޥ�ɤ�����������ʬ��ޤޤ�ޤ����ޤ��� -E
-���ץ������դ��� psql �򳫻Ϥ���ȡ����Ϥ��줿���ޥ�ɤ�¹Ԥ��뤿��Υ�����
-��������Ϥ���褦�ˤʤ�ޤ��� PostgreSQL�� SQL ���� INFORMATION SCHEMA ����
-�����ե��������󶡤��ޤ��Τǡ��ǡ����١����ˤĤ��Ƥξ�����䤤��碌�뤳�Ȥ��
-���ޤ���
-
-pg_ �ǻϤޤ륷���ƥ�ơ��֥�Ǥ⤳���򵭽Ҥ��뤳�Ȥ��Ǥ��ޤ���
-
-psql -l��Ȥ������ƤΥǡ����١�����ꥹ�Ȥ��ޤ���
-
-����ȡ�pgsql/src/tutorial/syscat.source ���ƤߤƤ��������������ˤϡ��ǡ���
-�١����Υ����ƥ�ơ��֥뤫���������뤿���ɬ�פ� SELECT ʸ����������ޤ���
-
-4.3) �����Υǡ��������ѹ�����ˤϤɤ����ޤ�����
-
-�����Υǡ��������ѹ��� 8.0 �ʹߤǤϡ� ALTER TABLE ALTER COLUMN TYPE ��Ȥ���
-�Ȥˤ���ñ�ˤʤ�ޤ�����
-
-���������ΥС������Ǥϡ��ʲ��Τ褦�ˤ��ޤ�:
-
-    BEGIN;
-    ALTER TABLE tab ADD COLUMN new_col new_data_type;
-    UPDATE tab SET new_col = CAST(old_col AS new_data_type);
-    ALTER TABLE tab DROP COLUMN old_col;
-    COMMIT;
-
-�����Ԥʤä��Ȥ��ϡ����ä��줿�Ԥ��ȤäƤ���ǥ��������֤������뤿���
-VACUUM FULL tab�򤷤��ۤ����ɤ����⤷��ޤ���
-
-4.4) �������ơ��֥롢�ǡ����١����κ��祵�����ϡ�
-
-���¤ϰʲ��ΤȤ���Ǥ�:
-
-    �ǡ����١����κ��祵����?        ����̵�� (32 TB �Υǡ����١�����¸�ߤ���
-                                     ��)
-    �ơ��֥�κ��祵����?            32 TB
-    �����κ��祵����?                400 GB
-    �ե�����ɤκ��祵����?          1 GB
-    �ơ��֥���Ǥκ��������?        ����̵��
-    �ơ��֥���Ǥκ��祫����?      �����η��ˤ�ä� 250-1600
-    �ơ��֥���Ǥκ��祤��ǥå���   ����̵��
-    ��?
-
-������󡢤����ϼºݤ�̵���¤ǤϤʤ����ǥ��������̤ȥ��꡼�䥹��åץ��ڡ�
-�����礭���ˤ�����¤���ޤ�����ǽ�Ϥ������ͤ����ȤΤۤ��礭�ʻ�����������
-�ޤ���
-
-����ơ��֥륵������32TB�ϥ��ڥ졼�ƥ��󥰥����ƥ�ˤ�����ե�����Υ��ݡ���
-��ɬ�פȤ��ޤ��󡣵���ʥơ��֥��ʣ����1GB�Υե������ʬ������¸����ޤ��Τǡ�
-�ե����륷���ƥ�����¤Ͻ��פǤϤ���ޤ���
-
-�ǥե���ȤΥ֥��å���������32k�����ä��뤳�Ȥǡ�����ơ��֥륵�����ȹԥ�������
-���祫�����Ȥ�4�ܤˤ��뤳�Ȥ��Ǥ��ޤ����ޤ�������ơ��֥륵�����ϥơ��֥�ѡ�
-�ƥ�������Ȥä����䤹���Ȥ�Ǥ��ޤ���
-
-�ҤȤĤ����¤ϡ���2,000ʸ���ʾ��Ĺ���Υ����˥���ǥå������դ��뤳�Ȥ��Ǥ���
-�����ȤǤ��������ˤ⡢���Τ褦�ʥ���ǥå����ϼºݤ�ɬ�פ���ޤ���Ĺ�������
-��MD5�ϥå���δؿ�����ǥå����ϰ�������ʤˤ����ݸ��ǡ��ޤ����ե�ƥ����Ȥ�
-����ǥå����Ǥϥ�������ñ��򸡺����뤳�Ȥ��Ǥ��ޤ���
-
-4.5) ����Ū�ʥƥ����ȥե�����Υǡ�������¸����ˤϡ��ǡ����١����Υǥ���������
-�ϤɤΤ��餤ɬ�פǤ���
-
-���̤Υƥ����ȥե������ PostgreSQL �Υǡ����١�������¸����ˤϡ��������5�ܤ�
-�ǥ��������̤�ɬ�פȤ��ޤ���
-
-����Ȥ��ơ��ƹԤ������ȥƥ����ȵ��Ҥ���� 100,000�ԤΥե������ͤ��Ƥߤޤ���
-�����ƥ����Ȥ�ʸ�����ʿ��Ĺ����20�Х��ȤȲ��ꤹ��ȡ��ե�åȥե�������礭��
-����2.8MB �Ǥ������Υǡ�����ޤ� PostgreSQL �ǡ����١����ե�������礭���ϼ���
-�褦����5.2MB�ȸ��Ѥ�뤳�Ȥ��Ǥ��ޤ���
-
-    24 bytes: �ƥ����Υإå�(����)
-    24 bytes: ����(int)�ե�����ɤȥƥ�����(text)�ե������
-   + 4 bytes: �ڡ�����Υ��åץ�ؤΥݥ���
-   ----------------------------------------
-    52 bytes per row
-
-   PostgreSQL �Υǡ����ڡ����������� 8192�Х���(8KB)�ʤΤ�:
-
-   8192 bytes per page
-   -------------------   =  146 rows per database page (�ڤ�Τ�)
-     52 bytes per row
-
-   100000 data rows
-   --------------------  =  633 database pages (�ڤ�夲)
-      158 rows per page
-
-  633 database pages * 8192 bytes per page  =  5,185,536 bytes (5.2 MB)
-
-����ǥå����ϡ�����ۤɤΥ����Хإåɤ��׵ᤷ�ޤ��󤬡�����ǥå����դ������
-�ǡ�����ޤ�ʾ塢����ʤ���礭���ʤ�ޤ���
-
-NULL�ϥӥåȥޥåפȤ�����¸����Ƥ��ơ�����餬�鷺���˥��ڡ�����Ȥ��ޤ���
-
-4.6) �����꤬�٤��ΤϤʤ��Ǥ��礦���ʤ�������ǥå������Ȥ��ʤ��ΤǤ��礦����
-
-����ǥå����ϡ����٤ƤΥ�����ǻȤ���櫓�ǤϤ���ޤ��󡣥ơ��֥뤬�Ǿ�����
-������礭����������Ǥ��Τ鷺���ʥѡ�����ơ����Υ��������򤹤�������������
-�å����ϻȤ��ޤ�������ϥ���ǥå����������ˤ�굯������������ʥǥ���
-�����������ϡ��ơ��֥�򥹥ȥ졼�Ȥ��ɤ�缡���������٤��ʤ뤳�Ȥ����뤫���
-����
-
-����ǥå�����Ȥ�������ꤹ�뤿��ˡ�PostgreSQL �ϥơ��֥�ˤĤ��Ƥ����׾����
-�����ʤ���Фʤ�ޤ��󡣤������׾���ϡ� VACUUM ANALYZE�ޤ��ϡ�ñ�� ANALYZE ��
-�ȤäƼ������뤳�Ȥ��Ǥ��ޤ������׾����Ȥäƥ��ץƥ��ޥ����ϥơ��֥����ˤ�
-����������Τꡢ����ǥå�����Ȥ��٤����η�������������Ǥ��ޤ������׾����
-��Ŭ�ʷ��������ˡ������Ǥ⵮�Ťʤ�Τ⤢��ޤ������׾���μ����ϡ���
-���֥�����Ƥ��Ѥ����˷��֤��ʤ����٤��Ǥ���
-
-����ǥå����ϡ��̾� ORDER BY �����Ԥʤ�����ˤϻȤ��ޤ��󡣽缡�������
-��³������Ū�����Ȥϡ�����ʥơ��֥�Υ���ǥå����������������̤Ϲ�®�Ǥ�
-��
-
-��������ORDER BY���Ȥ߹�蘆�줿LIMIT �ϡ��ơ��֥�ξ�������ʬ���֤�����ˤ���
-���ӥ���ǥå�����Ȥ��Ǥ��礦��
-
-�⤷�����ץƥ��ޥ������ְ�äƥ������󥷥�륹���������򤷤����Ȥ˵������ʤ�
-��С�SET enable_seqscan TO 'off'�����ꤷ�ơ��������⤦���ټ¹Ԥ�������ǥå�
-��������󤬤ޤ������ʤ�®���ʤäƤ��뤫�ɤ�����ߤƤ���������
-
-LIKE ���뤤�� ~ �Τ褦�ʥ磻��ɥ����ɱ黻�Ҥ����̤ʴĶ��Ǥ����Ȥ��ޤ���
-
- �� ����ʸ����ʸ����κǽ�ˤ����ޤ������Ȥ��С�
-     �� LIKE �ѥ�����%�ǻϤޤ�ʤ�
-     �� ~ (����ɽ��) �ѥ������^�ǻϤޤ�ʤ���Фʤ�ʤ�
- �� ����ʸ�����ʸ�����饹����Ϥ�뤳�ȤϤǤ��ޤ��󡣤��Ȥ��С�[a-e]��
- �� ILIKE �� ~* �Τ褦����ʸ���Ⱦ�ʸ������̤��ʤ������ϻȤ��ޤ��󡣤��Τ����
-    ������FAQ��4.8����������뼰����ǥå������Ȥ��ޤ���
- �� initdb �ˤ����Ƥϡ��ǥե���Ȥ�C�������뤬�Ȥ��ʤ��ƤϤʤ�ޤ��󡣤�����
-    ͳ�ϡ�C��������ʳ��Ǥϼ����礭��ʸ�����Τ뤳�Ȥ��Ǥ��ʤ�����Ǥ������Τ褦
-    �ʾ�硢
-
-    LIKE
-
-    ����ǥ����󥰤ˤ���Ư���褦�ʡ����̤�
-
-    text_pattern_ops
-
-    ����ǥå�����������뤳�Ȥ�Ǥ��ޤ����ޤ����������ʸ�����Υե�ƥ����Ȥ�
-    ����ǥå��������˻Ȥ����Ȥ��Ǥ��ޤ���
-
-4.7) �䤤��碌���ץƥ��ޥ������ɤΤ褦���䤤��碌��ɾ������Τ��򸫤�ˤϤɤ�
-���ޤ�����
-
-����饤��ޥ˥奢��� EXPLAIN �򸫤Ƥ���������
-
-4.8) ����ɽ���Ǥθ�������ʸ���Ⱦ�ʸ���Ȥ���̤��ʤ�����ɽ�������ϤɤΤ褦�˼¸�
-���ޤ�������ʸ���Ⱦ�ʸ���Ȥ���̤��ʤ������Τ���Υ���ǥå����ϤɤΤ褦�˻Ȥ�
-�ޤ�����
-
-~�黻�Ҥ�����ɽ���ȹ��Ԥʤ���~* ����ʸ���Ⱦ�ʸ������̤��ʤ�
-(case-insensitive)����ɽ���ȹ��Ԥ��ޤ�����ʸ���Ⱦ�ʸ������̤��ʤ� LIKE �黻
-�Ҥ� ILIKE �Ȥ����ޤ���
-
-��ʸ���Ⱦ�ʸ������̤��ʤ�������Ӥϼ��Τ褦��ɽ���Ǥ��롧
-
-    SELECT *
-    FROM tab
-    WHERE lower(col) = 'abc';
-
-ɸ�।��ǥå����ǤϻȤ�줺���������ʤ��顢�⤷��������ǥå������ä��ʤ餽
-�줬�Ȥ���Ǥ��礦��
-
-    CREATE INDEX tabindex ON tab (lower(col));
-
-�嵭�Υ���ǥå�����UNIQUE�Ǻ������줿��硢��������ʸ���Ⱦ�ʸ�����Ǽ�Ǥ���
-���������ΰ㤤��ʸ�������������Ǥ��äƤ�Ʊ��ˤϤʤ�ޤ��󡣤����������ʸ����
-�����򥫥��˳�Ǽ����ˤ� CHECK���󤫡��ȥꥬ����ȤäƤ���������
-
-4.9) ���������ǡ��ե�����ɤ�NULL �Ǥ��뤳�Ȥ򸡽Ф���ˤϤɤ����ޤ����� NULL
-�Ǥ��뤳�Ȥ򸡽Ф���ˤϤɤ����ޤ������ե�����ɤ�NULL���ɤ����ǤɤΤ褦�˥���
-�Ȥ��Ǥ��ޤ�����
-
-�ʲ��Τ褦�ˡ�IS NULL �� IS NOT NULL�ǡ����Υ�����ƥ��Ȥ��Ƥߤޤ���
-
-   SELECT *
-   FROM tab
-   WHERE col IS NULL;
-
-NULL�β�ǽ���Τ����Τ�Ϣ�뤹��ˤϡ�COALESCE()�򼡤Τ褦�˻Ȥ��ޤ���
-
-   SELECT COALESCE(col1, '') || COALESCE(col2, '')
-   FROM tab
-
-NULL���֤ǥ����Ȥ���ˤϡ�IS NULL �� IS NOT NULL �ν����Ҥ� ORDER BY �����ǻ�
-�äƤߤޤ���true �Τ�Τ� false �Τ�Τ���⤤�ͤȤ����¤٤��ޤ��Τǡ�����
-��Ǥ� NULL �ε��ܤ���̥ꥹ�Ȥξ������֤���ޤ���
-
-   SELECT *
-   FROM tab
-   ORDER BY (col IS NOT NULL)
-
-4.10) ����������ʸ�����Τ��줾��ΰ㤤�ϲ��Ǥ�����
-
-        ��     ����̾                      ����
-    VARCHAR(n) varchar ����Ĺ�Υ���������ꤹ�롢�ͤ�ʪ̵��
-    CHAR(n)    bpchar  ���ꤵ�줿����Ĺ�Ȥʤ�褦�˶��򤬵ͤ����
-    TEXT       text    Ĺ�������̤ʾ�¤�̵��
-    BYTEA      bytea   ����Ĺ�ΥХ�������(null-byte safe)
-    "char"     char    1ʸ��
-
-����̾�ˤ��ܤˤ�����Τϡ������ƥࡦ����������Ĵ�٤�Ȥ��䡢���顼��å�������
-�������Ȥ��Ǥ���
-
-�嵭�η��Τ����ǽ�Σ��Ĥη��� "varlena" ���Ǥ�(���ʤ�����ǥ������κǽ�Σ���
-���Ȥ��ǡ���Ĺ�ǡ�����θ�˼ºݤΥǡ�����³���ޤ�)�����Τ褦�˼ºݤζ��֤����
-���줿�礭�����⾯���礭���ʤ�ޤ�����������Ĺ���ͤϰ��̤����Τǡ��ǥ�����
-��ζ��֤ϻפä����⾮�����ʤ�ޤ���
-
-VARCHAR(n) �ϲ���Ĺ��ʸ�������¸����Τ˺�Ŭ�Ǥ�������¸�Ǥ���ʸ�����Ĺ������
-�¤�����ޤ���TEXT ��Ĺ�������¤�̵��ʸ�������¸�Τ���Τ�Τǡ������ 1������
-���ȤǤ��� CHAR(n)�ϡ�VARCHAR(n)��Ϳ����줿ʸ����������¸����Τ��Ф����֥��
-����ͤ����Ǥ��Ĥ�Ʊ��Ĺ����ʸ�������¸����Τ˺�Ŭ�Ǥ���BYTEA�ϡ���ʬŪ��
-NULL �ΥХ��Ȥ�ޤ�Х��ʥ�ǡ�������¸���뤿��Τ�ΤǤ��������Υ����פ�Ʊ��
-���餤����ǽ���������ޤ���
-
-4.11.1) ����(serial)����ư��ʬ�ե�����ɤϤɤΤ褦�ˤĤ���ޤ�����
-
-PostgreSQL �� SERIAL �ǡ������򥵥ݡ��Ȥ��ޤ���������˥������󥹤�ư������
-�ޤ������Ȥ��С�
-
-    CREATE TABLE person (
-        id   SERIAL,
-        name TEXT
-    );
-
-�ϼ�ưŪ�˼��Τ褦����������ޤ�:
-
-    CREATE SEQUENCE person_id_seq;
-    CREATE TABLE person (
-        id   INT4 NOT NULL DEFAULT nextval('person_id_seq'),
-        name TEXT
-    );
-
-    [������
-        CREATE UNIQUE INDEX person_id_key ON person ( id );
-        �ϡ� 7.3 �ʹߤϼ�ưŪ�ˤϹԤʤ��ʤ��ʤ�ޤ�����
-    ]
-
-
-��ưŪ�ˤĤ��������֤ϡ� <table>_<serialcolumn>_seq ��̾�դ����Ƥ��ơ�table
-�� serialcolumn �ϡ����줾��ơ��֥�� SERIAL ������̾���Ǥ������֤ˤĤ��Ƥ�
-������饤��ޥ˥奢���create_sequence �򤴤�󤯤�������
-
-4.11.2) SERIAL�ǡ�����������������ͤϡ��ɤ�����������ޤ�����
-
-�Ǥ��ñ����ˡ�ϡ�������Ƥ�줿SERIAL�ͤ� RETURNING�Ȥ��Ƽ������뤳�ȤǤ���
-4.11.1������ơ��֥��Ȥ��ȼ��Τ褦�ˤʤ�ޤ���
-
-    INSERT INTO person (name) VALUES ('Blaise Pascal') RETURNING id;
-
-4.11.3) currval() ��¾�Υ桼���Ȥζ�����֤˴٤뤳�ȤϤʤ��Ǥ�����
-
-����Ϥ���ޤ���currval() �ϡ����٤ƤΥ桼���ǤϤ���ޤ��󤬡��ɼԤΥ��å���
-���Ϳ����줿���ߤ��ͤ��֤��ޤ���
-
-4.11.4) �ȥ�󥶥���������Ǥ����Ȥ��ˤ⤦�����ɥ��������ֹ椬�Ȥ��ʤ���
-�Ϥʤ��Ǥ������������󥹡�SERIAL�����˶���������ΤϤʤ��Ǥ�����
-
-Ʊ������������뤿��ˡ��¹���Υȥ�󥶥������ˡ�ɬ�פ˱����ƥȥ�󥶥�����
-�󤬽�λ����ޤǥ��å�����ʤ��褦���������ͤ�Ϳ���Ƥ��ޤ������Τ���ȥ��
-����������Ǥ������ֹ������Ƥ˥���åפ������ޤ���
-
-4.12) OID �Ȥϲ��Ǥ����� CTID �Ȥϲ��Ǥ�����
-
-�ơ��֥뤬WITH OIDS�ǤĤ���줿���ϡ����줾��Υ����˰�դ�OID������ޤ���
-OID�ϼ�ưŪ��4�Х��Ȥ�������Ϳ����졢����ϡ������󥹥ȥ졼�������̤��ư��
-���ͤȤʤ�ޤ�������������40���ǥ����С��ե������������ơ�OID�Ͻ�ʣ�򤷤Ϥ����
-����PostgreSQL�����������ƥ�ơ��֥����˥�󥯤��뤿���OID ��Ȥ��ޤ���
-
-�桼���Υơ��֥�Υ����˰�դ��ֹ���դ��뤿��ˤϡ� OID �ǤϤʤ� SERIAL ���
-���Τ��Ǥ�褤�Ǥ��礦��SERIAL��Ϣ�֤�1�ĤΥơ��֥���ǤΤ߰�դˤʤ뤫��ǡ���
-���С��ե����򵯤����ˤ����ȹͤ����ޤ��� 8�Х��ȤΥ��������ͤ���¸���뤿��
-�ˡ�SERIAL8������ޤ���
-
-CTID �ϡ������ʪ��������֥��å��ȥ��ե��åȤ��ͤǼ��̤��뤿��˻Ȥ��ޤ���
-CTID�ϡ��������������줿����ɹ��ߤ��줿�Ȥ����Ѥ��ޤ����ޤ���ʪ�������򺹤�
-����˥���ǥå����ε��ܤ˻Ȥ��ޤ���
-
-4.13) ���顼��å����� "ERROR: Memory exhausted in AllocSetAlloc()"���Ф�ΤϤ�
-���Ǥ�����
-
-�����餯�������ƥ�β��ۥ��꡼�����ƻȤ��̤����Ƥ��ޤäƤ����ǽ�������뤫��
-�����ͥ뤬����꥽�����ˤĤ��Ƥ�������ͤ��㤹�����ǽ��������ޤ��������Ф��
-ư�������ˤ�����ƤߤƤ���������
-
-    ulimit -d 262144
-    limit datasize 256m
-
-������ˤ�äơ��ɤ��餫�ҤȤĤ���������Ǥ��礦��������ϥץ������Υǡ�������
-�������¤���⤯���ꤷ�����֤󥯥��꤬���뤹��褦�ˤʤ�Ǥ��礦�����Υ���
-��ɤϸ��ԤΥץ������ȡ����Υ��ޥ�ɤ����餻����˺�������ƤΥ��֥ץ�������
-�Ĥ���Ŭ�Ѥ���ޤ����Хå�����ɤ��ȤƤ�¿���Υǡ������֤������SQL ���饤����
-�Ȥ����꤬³���Ƥ���ΤǤ���С����饤����Ȥ򳫻Ϥ������ˤ�����ƤߤƤ���
-������
-
-4.14) �ɤΥС������� PostgreSQL �����餻�Ƥ��뤫��Ĵ�٤�ˤϤɤ����ޤ�����
-
-psql ���� SELECT version(); �򥿥��פ��ޤ���
-
-4.15) ���ߤλ��郎�ǥե���ȤȤʤ�褦�ʥ����ϤɤΤ褦�ˤĤ���ޤ�����
-
-CURRENT_TIMESTAMP��Ȥ��ޤ�:
-
-    CREATE TABLE test (x int, modtime TIMESTAMP DEFAULT CURRENT_TIMESTAMP );
-
-4.16) �������(outer join)�ϤɤΤ褦�˼¸����ޤ���?
-
-PostgreSQL �� SQL ɸ�๽ʸ��Ȥ��������(�����������祤��)�򥵥ݡ��Ȥ��ޤ�����
-���� 2�Ĥ����꤬����ޤ���
-
-    SELECT *
-    FROM t1 LEFT OUTER JOIN t2 ON (t1.col = t2.col);
-
-���뤤��
-
-    SELECT *
-    FROM t1 LEFT OUTER JOIN t2 USING (col);
-
-�����ξ�ħŪ�ʥ�����Ǥ� t1.col �� t2.col �ȷ�礷�ơ�t1 �η�礵��ʤ��ä���
-��(t2 �Ȱ��פ��ʤ��ä�����)���֤��Ƥ��ޤ���RIGHT ���� t2 �η�礵��ʤ��ä���
-����ä���Ǥ��礦��FULL ���ϡ����פ��������� t1 �� t2 ����Ϸ�礵��ʤ��ä�
-�������֤��Ǥ��礦��OUTER �Ȥ������դϥ��ץ����� LEFT, RIGHT, �ޤ��� FULL ��
-�ɤη����ꤵ��Ƥ��ޤ����̾����INNER���ȸƤФ�ޤ���
-
-4.17) ʣ���Υǡ����١�����Ȥ��䤤��碌�ϤɤΤ褦�ˤ���ФǤ��ޤ�����
-
-���ԤΥǡ����١����ʳ��ؤ��䤤��碌����ˡ�Ϥ���ޤ��󡣤Ȥ����Τ�PostgreSQL��
-�ǡ����١������ͤΥ����ƥ५���������ɤ߹��ि��ǡ������ˤϡ����Ȥ����Τդ��
-��������ˤ������ǡ����١�����ۤ����䤤��碌�򤹤뤹�٤�����ޤ���
-
-contrib/dblink �ϥǡ����١�����(cross-database)���䤤��碌��ؿ��ƽФ��ˤ���
-���ޤ���������󡢥��饤����Ȥ�Ʊ������³���̤Υǡ����١����ؤ�ĥ��ʤ��ƤϤ�
-�餺����̤򥯥饤�����¦�ǥޡ������ʤ��ƤϤʤ�ޤ���
-
-4.18) �ؿ�����ʣ���Υ����ޤ��ϥ������֤��ˤϤɤ����ޤ�����
-
-������֤��ؿ�(Set Returning Functions): http://wiki.postgresql.org/wiki/
-Return_more_than_one_row_of_data_from_PL/pgSQL_functions ��Ȥ��ȴ�ñ�Ǥ�
-
-��
-
-4.19) PL/PgSQL �δؿ�����ǰ���ơ��֥�˥�����������Ȥ����ɤ����� "relation
-with OID ##### does not exist" �Ȥ������顼��������ΤǤ��礦����
-
-�С������8.3������� PostgreSQL �Ǥϡ�PL/PgSQL �ϴؿ�������ץȤ򥭥�å��夷
-�����ᡢ���������������Ѥ�����ޤ�����PL/PgSQL �ؿ�������ơ��֥�˥�����������
-��Ǥ��Υơ��֥��ä��ƺ�ꤷ�����ˡ��ؿ����⤦���ٸƤӽФ��줿�Ȥ��ϡ�����
-�ؿ��Υ���å��夷�Ƥ������Ƥ��ޤ��Ť�����ơ��֥��ؤ��������ޤޤ��ä������
-�������Ρ������Ȥ��ơ�PL/PgSQL����� EXECUTE �����ơ��֥�ؤΥ��������Τ���
-�˻Ȥ��ޤ�����������ȡ�����������ѡ�������ľ�������褦�ˤʤ�ޤ���
-
-��������ϡ� PostgreSQL �С������8.3 �ʹߤǤϵ����ޤ���
-
-4.20) �ɤΤ褦�ʥ�ץꥱ�������Υ���塼����󤬤���ޤ�����
-
-�֥�ץꥱ�������פȰ���Ǥ����ޤ�������ץꥱ�������򤹤뤿��ε��ѤϤ���
-�Ĥ����ꡢ���줾�졢�����ȷ���������ޤ���
-
-�ޥ��������졼�֤Υ�ץꥱ�������ϡ��ɤߡ��񤭤Υ�����������륷�󥰥�ޥ�
-������ǽ�ǡ����졼�֤Ǥ��ɤߡ�SELECT���䤤��碌����������դ��뤳�Ȥ��Ǥ��ޤ�
-���Ǥ�͵������롢�ե꡼�����ѤǤ��롢�ޥ����ݥ��졼�֤�PostgreSQL��ץꥱ����
-��󥽥�塼�����ϡ� Slony-I �Ǥ���
-
-�ޥ���ݥޥ����Υ�ץꥱ�������ϡ��ɤߡ��񤭤Υ����������Ȥꡢʣ���Υ�ץ�
-�����Ȥ����륳��ԥ塼�������뤳�Ȥ��Ǥ��ޤ������ε�ǽ�ϡ������д֤��ѹ���Ʊ��
-��ɬ�פʤ��ᡢ��ǽ�˽���ʾ׷��Ϳ���ޤ��� PGCluster �ϡ����Τ褦�ʥ���塼����
-��Ȥ���PostgreSQL�Τ���˥ե꡼�����ѤǤ����ΤȤ��ơ��Ǥ�͵�������ޤ���
-
-����¾�ˤ⡢���Ѥ�ϡ��ɥ������ݥ١����Υ�ץꥱ������󥽥�塼����󤬤�����
-���ʥ�ץꥱ��������ǥ�򥵥ݡ��Ȥ��Ƥ��ޤ���
-
-4.21)�ơ��֥�ȥ�����̾���������꡼�����ǧ������ʤ��ΤϤʤ��Ǥ������ʤ���ʸ
-����(����ԥ��饤��)�ϲ�¸����ʤ��ΤǤ���?
-
-̾����ǧ������ʤ����Ǥ����Ū�ʸ����ϡ��ơ��֥���������ݤˡ��ơ��֥�䥫��
-���Ϥ���Ű�����λ��ѤǤ�����Ű������Ȥ��ȡ��ơ��֥�ȥ�����̾���ʼ���
-�ҤȤ����ޤ��ˤ���ʸ���Ⱦ�ʸ���ζ��̤򤷤Ƴ�Ǽ����ޤ����������äơ�pgAdmin�Τ�
-���˥ơ��֥�����ΤȤ��˼�ưŪ����Ű������Ȥ���Τϥ��������Ǥ�����̾��
-��Ȥ��Ȥ�����Ű�������դ��ʤ��ƤϤʤ�ʤ����Ȥ��̣���ޤ������Τ��ᡢ���̻�
-��ǧ�������뤿��ˤϰʲ��Τ����줫�򿴤����ޤ���
-
- �� �ơ��֥���������Ȥ�����Ű�����Ǽ��̻Ҥ�Ϥ����Ȥ��򤱤�
- �� ���̻ҤˤϾ�ʸ��������Ȥ�
- �� ���������ǻ��Ȥ���Ȥ�����Ű�����Ǽ��̻Ҥ�Ϥ�
-
-������������������������������������������������������������������������������
-
-                              ���ܸ�˴ؤ������
-
-5.1)���ܸ줬���ޤ������ʤ��ΤϤʤ��Ǥ�����
-
-createdb -E���ޥ�ɥ��ץ����� UTF8 ���뤤�� EUC_JP �Υ��󥳡��ǥ��󥰤���ꤷ
-�ƥǡ����١�����������뤫�����Τ褦�˥��󥳡��ǥ��󥰤���ꤷ�ƥǡ����١�����
-�������Ƥ���������
-
-        CREATE DATABASE dbname WITH ENCODING 'UTF8';
-    �⤷���ϡ�
-        CREATE DATABASE dbname WITH ENCODING 'EUC_JP';
-
-5.2) psql ��Windows���饢�����������Ȥ��ˡ����ܸ줬ʸ����������ΤǤ�����
-
-psql����ǥ��饤����ȤΥ��󥳡��ǥ��󥰤���ꤷ�Ƥ���������
-
-        SET client_encoding TO 'SJIS'
-
-PostgreSQL�ǡ����١����Υ��󥳡��ǥ��󥰤˻Ȥ������ܸ�ʸ�������ɤ� EUC_JP ��
-UTF-8(UNICODE) �Ǥ��뤿�ᡢShift-JISɽ���Υ��ޥ�ɥץ���ץȤ���ϡ�
-client_encoding�����ꤷ�Ƥ����ʤ��ȡ����ܸ��ɽ������ݤ�ʸ�������������ޤ���
-
-5.3) PostgreSQL�����ܸ����ʸ�����ϤǤ��ޤ�����
-
-�С������8.3�Ǥϡ�TSearch2��ʸ������ǽ�����Τ��Ȥ߹��ޤ�ޤ����������ΤޤޤǤ�
-���ܸ�Υ���ǥå�����������񤷤������Ǥ���������褹�뤿��ˡ�Takahiro
-Itagaki��ˤ�äơ�Mecab�Ȥ��������Dz��ϥץ����������Ѥ������ܸ���ʸ�����⥸
-�塼�� textsearch_ja ����ȯ����ޤ�����TSearch2�б������ʤ�鷺���˲������뤳��
-�����ܸ��б��ˤ��ޤ���
-
-������������������������������������������������������������������������������
-
-�����ܸ��ǤˤĤ��ơ�
-
-[������
-  ���ܸ��Ǥ�����ˤĤ��Ƥϰʲ����̤�Ǥ���
-
-  �ǽ�������:   2008ǯ10��8��
-  ������:       ��¼ �� (Jun KUWAMURA <juk at postgresql.jp>)
-
-  ����FAQ�������κ����ˤ����궨�Ϥ򤷤Ƥ������ä�����(�ɾΤ�ά�����Ƥ��������ޤ�):
-
-                ���� ̭(Minoru TANAKA <Tanaka.Minoru at keiken.co.jp>)
-                �а� ã��(Tatsuo ISHII <ishii at sraoss.co.jp>)
-                ��ƣ �ο�(Tomohito SAITOH <tomos at elelab.nsc.co.jp>)
-                �Ͼ�  ȥ(Hajime BABA <baba at kusastro.kyoto-u.ac.jp>)
-                ���� �칬(Kazuyuki OKAMOTO <kaz-okamoto at hitachi-system.co.jp>)
-                ���� ����(Shoichi Kosuge <s-kosuge at str.hitachi.co.jp>)
-                ���� ��Ƿ(Yoshiyuki YAMASHITA <dica at eurus.dti.ne.jp>)
-                �� ����Ϻ(Sintaro SAKAI <s_sakai at mxn.mesh.ne.jp>)
-                ���� ����(Masami OGOSHI <ogochan at zetabits.com>)
-                ���� �ӹ�(Toshiyuki ISHIKAWA <tosiyuki at gol.com>)
-                ���� �й�(Shigehiro HONDA <fwif0083 at mb.infoweb.ne.jp>)
-                ���� �����(Jun SESE <sesejun at linet.gr.jp>)
-                ��ë �ѹ�(Hidetaka KAMIYA <hkamiya at catvmics.ne.jp>)
-                ���� ��(Atsushi SUGAWARA <asugawar at f3.dion.ne.jp>)
-                ���� ����(Kaori Inaba <i-kaori at sraoss.co.jp>)
-                ˧�� ����(Yasufumi Haga <yasufumi.haga at nifty.com>)
-
-  ��Ϥ��ᡢ�ݥ��ȥ��쥹�˴ؤ�������˭�٤����ܸ�PostgreSQL�᡼��󥰥ꥹ�ȡ�
-  �����Τ��ä������äƤ��줿�ꡢ���Ĥ�����å��򤷤Ƥ����
-   JF(Linux Japanese FAQ)�ץ��������ȡ�FreeBSD �ɥ�����ơ������ץ���������
-  �����������줫�顢ľ�ܤ��뤤�ϴ���Ū�ˤ�����äƤ������뤹�٤ƤΥ����ץ󥽡���
-  ���ߥ�˥ƥ��Τߤʤ��ޤ˴��դ������ޤ���
-
-
-  ��������ʸ��� �ܲ� "Frequently Asked Questions"  �Υڡ����� "Japanese FAQ"
-  �Ȥ������ܤǤ���ޤ���
-
-  �ޤ����ǿ��Ǥϰʲ��Υ����Ȥˤ���ޤ���
-        http://www.postgresql.jp/wg/jpugdoc/ ��JPUGʸ�񡦽��Ҵ�Ϣʬ�ʲ��
-        http://www.linux.or.jp/JF/JFdocs/INDEX-database.html ��Linux JF�ץ��������ȡ�   http://www.linet.gr.jp/~juk/pgsql/ ��PostgreSQL Notes for Japanese�ס������ԥڡ�����
-
-  �ʤ������������˴ؤ��뤴�ո����������(juk at postgresql.jp)�ޤǤ��󤻤���������
-  �ʢ� �᡼�륢�ɥ쥹�� " at " ��Ŭ�ڤ�ľ���Ƥ���������Ⱦ�Ѥ� "@" �Ǥ�����
-]
-
diff --git a/doc/FAQ_polish b/doc/FAQ_polish
deleted file mode 100644
index ff50ec26e3..0000000000
--- a/doc/FAQ_polish
+++ /dev/null
@@ -1,1279 +0,0 @@
-
-                 Frequently Asked Questions (FAQ) o PostgreSQL
-                                       
-   Ostatnia aktualizacja: Sobota Luty 7 22:16:21 EST 2004
-   
-   Ostatnia aktualizacja tl/umaczenia: Piatek Marzec 5 19:31:12 EST 2004
-   
-   Obecny maintainer: Bruce Momjian ([email protected])
-   
-   Tl/umaczenie: Marcin Mazurek ([email protected])
-   
-   Najbardziej aktualna wersje tego dokumentu mozna znalezc pod adresem:
-   http://www.PostgreSQL.org/docs/faqs/FAQ.html.
-   
-   Odpowiedzi na pytania dotyczace konkretnych system�w operacyjnych
-   mozna znalezc pod adresem: http://www.PostgreSQL.org/docs/index.html.
-     _________________________________________________________________
-   
-                               Pytania og�lne
-                                      
-   1.1) Co to jest PostgreSQL? Jak to wymawiac?
-   1.2) Jaka licencja chroniony jest PostgreSQL?
-   1.3) Na jakich systemach Unixowych dzial/a PostreSQL?
-   1.4) Na jakich nie-Unixowych systemach dzial/a PostgreSQL?
-   1.5) Skad moge sciagnac PostgreSQL?
-   1.6) Gdzie mozna szukac wsparcia technicznego?
-   1.7) Jaka jest ostatnia dostepna wersja?
-   1.8) Jaka dokumentacja jest dostepna?
-   1.9) Gdzie moge znalezc informacje o znanych bl/edach czy brakujacych
-   rozwiazanich?
-   1.10) Jak moge sie nauczyc SQL?
-   1.11) Czy PostgreSQL ma rozwiazany problem Y2K?
-   1.12) Jak moge sie przyl/aczyc do grupy os�b bezposrednio pracujacych
-   nad rozwojem PostgreSQL?
-   1.13) Jak moge zgl/aszac bl/edy?
-   1.14) Jak mozna por�wnac PostgreSQL w stosunku do innych DBMS?
-   1.15) W jaki spos�b moge wesprzec finansowo PostgreSQL?
-   
-                            Pytania uzytkownik�w
-                                      
-   2.1) Czy sa jakies driwery ODBC dla PostgreSQL?
-   2.2) Jakie istnieja narzedzia pozwalajace na dostep do PostgreSQL
-   przez www?
-   2.3) Czy istnieje jakies GUI dla PostgreSQL?
-   2.4) Za pomoca jakich jezyk�w programowania mozna sie komunikowac z
-   PostgreSQL?
-   
-                      Pytania dotyczace administracji
-                                      
-   3.1) Jak moge zainstalowac PostgreSQL w innej lokalizacji niz
-   /usr/local/pgsql?
-   3.2) Podczas startu postmaster'a, otrzymuje komunikat: Bad System Call
-   lub "core dumped". Dlaczego?
-   3.3) Podczas startu postmaster'a, otrzymuje komunikat o bl/edzie:
-   IpcMemoryCreate. Dlaczego?
-   3.4) Podczas startu postmaster'a, otrzymuje komunikat o bl/edzie:
-   IpcSemaphoreCreate. Dlaczego?
-   3.5) W jaki spos�b moge kontrolowac pol/aczenia z innych host�w?
-   3.6) Jak powinienem skonfigurowac system baz danych aby uzyskac lepsza
-   wydajnosc?
-   3.7) Jakie sa mozliwosci wyszukiwania bl/ed�w?
-   3.8) Skad sie bierze komunikat: "Sorry, too many clients" podczas
-   pr�by pol/aczenia sie z baza danych?
-   3.9) Jakie pliki znajduja sie w pg_temp?
-   3.10) Dlaczego konieczne jest przy upgradzie PostgreSQL korzystanie ze
-   skrypt�w dump i restore?
-   
-                       Pytania dotyczace uzytkowania
-                                      
-   4.1) Jaka jest r�znica pomiedzy kursorami binarnymi (binary cursors) i
-   zwykl/ymi kursorami (normal cursors)?
-   4.2) Jak moge pobrac za pomoca SELECT jedynie kilka pierwszych wynik�w
-   zapytania?
-   4.3) Jak moge uzyskac liste wszystkich tabel czy innych rzeczy pod
-   psql?
-   4.4) Jak usunac kolumne z tabeli lub zmienic jej typ?
-   4.5) Jaki jest maksymalny rozmiar dla rzedu, tabeli i bazy danych?
-   4.6) Jak duzo miejsca w bazie danych jest potrzebne aby przechowac
-   dane ze zwyczajnego pliku tekstowego?
-   4.7) Jak moge sprawdzic jakie tabele, klucze, bazy danych i
-   uzytkownicy sa utworzeni?
-   4.8) Moje zapytania sa wolne lub nie uzywaja kluczy. Dlaczego?
-   4.9) Jak moge sprawdzic w jakis spos�b "query optimizer" wykonuje moje
-   zapytanie?
-   4.10) Co to jest "R-tree index"?
-   4.11) Co to jest "Genetic Query Optimizer"?
-   4.12) Jak moge uzywac wyrazen regularnych w zapytaniach i zapytan
-   case-insensitive w wyrazeniach regularnych? Jak korzystac z indeks�w
-   dla zapytan case-insensitive?
-   4.13) Jak sprawdzic w zapytaniu czy pole ma wartosc NULL?
-   4.14) Jaka jest r�znica pomiedzy r�znymi typami tekstowymi (character
-   types)?
-   4.15.1) Jak moge utworzyc pole typu int, kt�re samo zwieksza swoja
-   wartosc?
-   4.15.2) Jak pobrac wartosc pola typu SERIAL po wykonaniu insert'u?
-   4.15.3) Czy uzycie currval() i nextval() nie doprowadzi do "race
-   condition" z innymi uzytkownikami?
-   4.15.4) Dlaczego numery sekwencji nie sa ponownie uzywane przy
-   przerwaniu transakcji? Skad sie biora luki w numerowaniu kolumny
-   tabeli sekwencjami/SERIALem?
-   4.16) Co to jest OID? Co to jest TID?
-   4.17) Jakie jest znaczenie niekt�rych termin�w w PostgreSQL?
-   4.18) Skad bierze sie ten bl/ad: "ERROR: Memory exhausted in
-   AllocSetAlloc()"?
-   4.19) Jak sprawdzic jakiej wersji PostgreSQL uzywam?
-   4.20) Dlaczego operacje, kt�re wykonuje na duzych obiektach
-   "large-object" zwracaja komunikat: "invalid large obj descriptor"?
-   4.21) Jak stworzyc kolumne kt�rej domyslna wartoscia bedzie biezacy
-   czas?
-   4.22) Dlaczego zapytania uzywajace IN sa takie wolne?
-   4.23) Jak wykonac "outer join"?
-   4.24) Jak wykonywac zapytanie uzywajace kilku baz danych jednoczesnie?
-   4.25) Jak zwr�cic w funkcji wiele rzed�w lub kolumn?
-   4.26) Dlaczego nie moge w spos�b pewny tworzyc/usuwac tabel
-   tymczasowych w funkcjach PL/PgSQL?
-   4.27) Jakie sa mozliwosci replikacji w PostgreSQL?
-   4.28) Jakie mozliwosci szyfrowania oferuje PostgreSQL?
-   
-                           Rozwijanie PostgreSQL
-                                      
-   5.1) Napisal/em wl/asna funkcje. Kiedy uzyje jej w psql, program
-   zrzuca pamiec (dump core)?
-   5.2) Jak moge dodac/zgl/osic nowe typy czy funkcje do PostgreSQL?
-   5.3) Jak napisac funkcje C zwracajaca krotke (tuple)?
-   5.4) Zmienil/em plik zr�dl/owy. Dlaczego po rekompilacji nie widac
-   zmiany?
-     _________________________________________________________________
-   
-                               Pytania og�lne
-                                      
-    1.1) Co to jest PostgreSQL? Jak to wymawiac?
-    
-   PostgreSQL wymawia sie Post-Gres-kju-el. Czesto podczas rozm�w uzywany
-   jest termin "Postgres"
-   
-   PostgreSQL jest rozszerzeniem systemu zarzadzania bazami danych -
-   POSTGRES, kolejna generacja rozwojowego prototypu DBMS. Mimo, ze
-   PostgreSQL zachowal/ bardzo dobrze zbudowany model danych (data model)
-   i bogaty zestaw typ�w danych POSTGRES'a, zastapil/ PostQuel'owy jezyk
-   zapytan z rozbudowanym podzbiorem jezyka SQL. PostgreSQL jest
-   oprogramowaniem darmowym z dostepnymi cal/ymi zr�dl/ami.
-   
-   Rozw�j PostgreSQL jest prowadzony przez grupe ludzi z Internetu,
-   komunikujacych sie poprzez mailowe listy dyskusyjne PostgreSQL.
-   Obecnym koordynatorem jest Marc G. Fournier ([email protected]).
-   (Zobacz pytanie 1.6 jak sie przyl/aczyc). Ta grupa ludzi jest
-   odpowiedzialna za cal/y rozw�j PostgreSQL. PostgreSQL jest projektem
-   nie kontrolowanym przez zadna firme, aby wziac udzial/ w jego rozwoju
-   sprawdz, http://www.PostgreSQL.org/docs/faqs/FAQ_DEV.html
-   
-   Autorami PostgreSQL 1.01 byli Andrew Yu and Jolly Chen. Wiele innych
-   os�b pomogl/o przy portowaniu, testowaniu, debugowaniu i rozwijaniu
-   kodu. Oryginalny kod Postgresa, na kt�rym zostal/ oparty PostgreSQL,
-   byl/ wysil/kiem student�w oraz pracownik�w pracujacych pod
-   kierownictwem profesora Michael'a Stonebraker'a z University of
-   California w Berkeley.
-   
-   Oryginalna nazwa oprogramowania w Berkeley byl/ Postgres. Po dodaniu
-   obsl/ugi SQL w 1995, nazwa zostal/a zmieniona na Postgres95. Pod
-   koniec roku 1996 nazwa zostal/a zmieniona na PostgreSQL.
-   
-    1.2) Jaka licencja chroniony jest PostgreSQL?
-    
-   PostgreSQL objety jest nastepujaca licencja:
-   
-   PostgreSQL Data Base Management System
-   
-   Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
-   Portions Copyright (c) 1994-6 Regents of the University of California
-   
-   Permission to use, copy, modify, and distribute this software and its
-   documentation for any purpose, without fee, and without a written
-   agreement is hereby granted, provided that the above copyright notice
-   and this paragraph and the following two paragraphs appear in all
-   copies.
-   
-   IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY
-   FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
-   INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND
-   ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN
-   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   
-   THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
-   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
-   PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
-   CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
-   UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-   
-   Tekst powyzej, jest klasyczna licencja BSD. Nie posiada ona zadnych
-   restrykcji co do uzywania kodu zr�dl/owego. Podoba nam sie i nie
-   zamierzamy jej zmieniac.
-   
-    1.3) Na jakich systemach Unixowych dzial/a PostreSQL?
-    
-   PostgreSQL powinien dzial/ac na wszystkich nowych Unix-podobnych
-   systemach. Platformy, kt�re zostal/y szczeg�l/owo przetestowane
-   podczas publikowania PostgreSQL sa wymienione w dokumentacji
-   opisujacej instalacje.
-   
-    1.4) Na jakich nie-Unixowych systemach dzial/a PostgreSQL?
-    
-   Klient
-   
-   Mozliwa jest kompilacja bibliteki C libpq, psql oraz innych
-   interfejs�w i uruchamianie ich na platformie MS Windows. W tym wypadku
-   klient jest uruchamiany na MS Windows a z serwerem komunikuje sie
-   poprzez TCP/IP. Serwer moze dzial/ac na dowolnej wspieranej platformie
-   Unixowej. Plik win32.mak jest dol/aczony do zr�del/, aby mozna byl/o
-   stworzyc biblioteke libpq oraz program psql dzial/ajace w srodowisku
-   Win32. PostgreSQL moze sie takze komunikowac z klientami ODBC.
-   
-   Serwer
-   
-   Serwer moze byc uruchamiany na Windows NT i Win2k uzywajac bibliotek
-   Cygwin, Cygnus Unix/NT. W pliku pgsql/doc/FAQ_MSWIN znajdujacym sie w
-   zr�dl/ach lub pod adresem:
-   http://www.PostgreSQL.org/docs/faqs/text/FAQ_MSWIN na naszych
-   stronach.
-   
-   Obecnie prowadzone sa prace nad stworzeniem wersji dla MS Win
-   NT/200/XP. Jesli chcesz sie dowiedziec o obecnym statusie tych prac
-   zobacz http://techdocs.postgresql.org/guides/Windows and
-   http://momjian.postgresql.org/main/writings/pgsql/win32.html.
-   
-   Istnieje takze port pod Novell Netware 6 dostepny pod adresem
-   http://forge.novell.com.
-   
-    1.5) Skad mozna sciagnac PostgreSQL?
-    
-   Gl/�wny serwer ftp z dostepem "anonymous" dla PostgreSQL znajduje sie
-   ftp://ftp.PostgreSQL.org/pub. jesli szukasz mirror�w sprawdz nasza
-   gl/�wna strone www.
-   
-    1.6) Gdzie mozna szukac wsparcia technicznego?
-    
-   Adres gl/�wnej listy mailowej: [email protected]. Jest ona
-   przeznaczona dyskusjom dotyczacym spraw zwiazanych z PostgreSQL. Zeby
-   zapisac sie na liste, wyslij email z nastepujacymi liniami w tresci
-   maila (nie w temacie):
-    subscribe
-    end
-
-   na adres: [email protected].
-   
-   Dostepna jest takze lista wysyl/ajaca digesty. Aby zapisac sie na nia,
-   wyslij email na adres: [email protected] z
-   trescia maila zawierajaca:
-    subscribe
-    end
-
-   Digesty sa wysyl/ane do czl/onk�w listy, kiedy na gl/�wna liste dotrze
-   ok 30k wiadomosci.
-   
-   Dostepna jest takze lista poswiecona bl/edom znalezionym w PostgreSQL.
-   Aby zapisac sie na nia wyslij email na adres:
-   [email protected] z trescia maila zawierajaca:
-    subscribe
-    end
-
-   Lista poswiecona dyskusjom developer�w jest dostepna pod adresem:
-   [email protected] Aby sie na nia zapisac wyslij na
-   jej adres mail z trescia:
-    subscribe
-    end
-
-   Dodatkowe informacje o listach mailowych dotyczacych PostgreSQL mozna
-   znalezc na stronach WWW PostgreSQL pod adresem:
-   
-     http://www.PostgreSQL.org
-     
-   W sieci EFNet istnieje kanal/ IRC #PostgreSQL. Ja, do pol/aczenia sie
-   z kanal/em uzywam Unixowego polecenia irc -c '#PostgreSQL' "$USER"
-   irc.phoenix.net.
-   
-   Lista firm oferujacych wsparcie na zasadach komercyjnych znajduje sie
-   pod adresem: http://techdocs.postgresql.org/companies.php.
-   
-    1.7) Jaka jest ostatnia dostepna wersja?
-    
-   Ostatnia dostepna wersja PostgreSQL to 7.4.1.
-   
-   Planujemy publikowanie kolejnych wersji co szesc do osmiu miesiecy.
-   
-    1.8) Jaka dokumentacja jest dostepna?
-    
-   Kilka manuali, stron podecznika man, oraz kilka przykl/ad�w do
-   testowania sa zal/aczone w samej dystrybucji. Znajduja sie one w
-   katalogu /doc. Manual moze byc takze przegladany poprzez strony www
-   pod adresem http://www.PostgreSQL.org/docs.
-   
-   Istnieja takze dwie ksiazki dostepne online pod adresami
-   http://www.PostgreSQL.org/docs/awbook.html i
-   http://www.commandprompt.com/ppbook/. Lista ksiazek o PostgreSQL,
-   kt�re mozna kupic znajduje sie pod adresem
-   http://techdocs.PostgreSQL.org/techdocs/bookreviews.php. Zbi�r
-   technicznych artykul/�w o PostgreSQL znajduje sie pod adresem
-   http://techdocs.postgresql.org/.
-   
-   psql posiada kilka wbudowanych polecen \d, za pomoca kt�rych mozna
-   sprawdzic informacje dotyczace typ�w, operator�w, funkcji, agregat�w
-   itd.
-   
-   Na naszej stronie mozna znalezc duzo wiecej dokumentacji.
-   
-    1.9) Gdzie mozna znalezc informacje o znanych bl/edach czy brakujacych
-    rozwiazanich?
-    
-   PostgreSQL wspiera rozszerzony podzbi�r standardu SQL-92. Sprawdz
-   nasza liste TODO aby znalezc informacje o znanych problemach,
-   brakujacych rozwiazaniach czy przyszl/ych planach.
-   
-    1.10) Jak moge sie nauczyc SQL?
-    
-   Ksiazka o PostgreSQL http://www.PostgreSQL.org/docs/awbook.html uczy
-   SQL. Jest jeszcze inna ksiazka o PostgreSQL dostepna pod adresem:
-   http://www.commandprompt.com/ppbook. Dobry tutorial mozesz znalezc pod
-   adresem: http://www.intermedia.net/support/sql/sqltut.shtm, oraz
-   http://ourworld.compuserve.com/homepages/graeme_birchall/HTM_COOK.HTM,
-   i http://sqlcourse.com.
-   
-   Jeszcze inny to "Teach Yourself SQL in 21 Days, Second Edition" pod
-   adresem: http://members.tripod.com/er4ebus/sql/index.htm
-   
-   Wielu z naszych uzytkownik�w poleca The Practical SQL Handbook,
-   Bowman, Judith S., et al., Addison-Wesley. Inni polecaja The Complete
-   Reference SQL, Groff et al., McGraw-Hill.
-   
-    1.11) Czy PostgreSQL ma rozwiazany problem Y2K?
-    
-   Tak, bez problemu radzimy sobie z datami po roku 2000 AD, oraz przed
-   rokiem 2000 BC.
-   
-    1.12) Jak moge sie przyl/aczyc do grupy os�b bezposrednio pracujacych nad
-    rozwojem PostgreSQL?
-    
-   Przede wszystkim sciagnij ostatnie dostepne zr�dl/a i przeczytaj
-   dokumentacje przeznaczona dla developer�w na naszej stronie www lub
-   dostepna takze w zr�dl/ach PostgreSQL. Nastepnie zapisz sie na listy
-   mailowe pgsql-hackers i pgsql-patches. I na koniec, wysyl/aj nam
-   wysokiej jakosci patch'e na liste pgsql-patches.
-   
-   Jest okol/o 12 os�b, kt�re maja uprawnienia do commit'owania w CVS
-   PostgreSQL'a. Kazdy z nich submitowal/ tak wiele wysokiej jakosci
-   patchy, ze stal/o sie niemozliwe dla obecnych commiter�w byc z nimi na
-   biezaco, wiec musielismy im ufac i miec pewnosc, ze ich poprawki sa
-   wysokiej jakosci.
-   
-    1.13) Jak moge zgl/aszac bl/edy?
-    
-   Zajrzyj na strone PostgreSQL BugTool, na kt�rej opisane sa wskaz�wki
-   jak zgl/aszac informacje o bl/edach.
-   
-   Zajrzyj takze na nasz ftp ftp://ftp.PostgreSQL.org/pub, aby sprawdzic
-   czy nie ma nowszych wersji PostgreSQL czy patchy.
-   
-    1.14) Jak mozna por�wnac PostgreSQL w stosunku do innych DBMS?
-    
-   Jest kilka sposob�w oceny softwaru: mozliwosci, wydajnosc, stabilnosc,
-   wsparcie i cena.
-   
-   Mozliwosci
-          PostgreSQL posiada mozliwosci dostepne w duzych, komercyjnych
-          systemach DBMS, takie jak transakcje, podzapytania
-          (subselects), triggery, widoki, klucze obce, referential
-          integrity, oraz wyrafinowany system blokowania. Mamy takze
-          wl/asciowsci kt�rych inni nie posiadaja, jak typy definiowane
-          przez uzytkownika, dziedziczenie, rules, multi-version
-          concurrency control, kt�ra redukuje problemy z blokowaniem
-          (lock contention).
-          
-   Wydajnosc
-          Wydajnosc PostgreSQL jest podobna do innych komercyjnych i open
-          source baz danych. W niekt�rych sytuacjach jest szybszy w
-          niekt�rych wolniejszy. W por�wnianiu do MySQL lub mniejszych
-          baz danych jestesmy szybsi przy wielu uzytkownikach,
-          skomplikowaych zapytaniach i duzym obciazeniu podczas. MySQL
-          jest szybszy dla prostych SELECT�w wykonywanych przez niewielu
-          uzytkownik�w. Spowodowane jest to narzutem, kt�ry sie pojawia
-          przy transakcjach. Oczywiscie MySQL nie ma wiekszosci z
-          rozwiazan opisanych powyzej w sekcji Mozliwosci . PostgreSQL
-          zostal/ stworzony z mysla o stabilnosci, oraz szerokiej gamie
-          mozliwosci, ale mimo to staramy sie w kazdej wersji poprawiac
-          jego wydajnosc. Ciekawe por�wnanie PostgreSQL i MySQL mozna
-          znalezc pod adresem
-          http://openacs.org/philosophy/why-not-mysql.html Dodatkowo,
-          MySQL jest firma, kt�ra dystrybuuje jej produkty poprzez zasade
-          Open Source i wymaga wykupienia licencji w przypadku tworzenia
-          close-source software, co ie ma miejsca w przypadku PostgreSQL.
-          
-   Stabilnosc
-          Zdajemy sobie sprawe, ze DBMS musi byc stabilny, w przeciwnym
-          wypadku jest bez wartosci. Staramy sie publikowac kod stabilny,
-          dobrze przetestowany, z minimum mozliwych bl/ed�w. Kazde
-          wydanie poprzedza co najmniej miesiac test�w wersji beta.
-          Patrzac na historie wydan PostgreSQL widac, ze dostarczamy
-          stabilne, dobrze sprawdzone wersje, kt�re sa gotowe do uzycia w
-          srodowisku produkcyjnym. Myslimy, ze proces publikowania
-          kolejnych wersji opracowany przez nas jest jednym z lepszych
-          wsr�d innych tw�rc�w oprogramowania bazodanowego.
-          
-   Wsparcie
-          Dzieki naszym listom mailowym masz dostep do duzej liczby
-          programist�w i uzytkownik�w, kt�rzy pomagaja rozwiazac kazdy
-          napotkany problem. Chociaz nie mozemy gwarantowac znalezienia
-          rozwiazania danego problemu, nie r�znimy sie w tym od innych
-          komercyjnych system�w DBMS. Bezposredni kontakt z
-          programistami, uzytkownikami, dokumentacja i kodem zr�dl/owym
-          sprawiaja, ze wsparcie oferowane PostgreSQL niejednokrotnie
-          jest lepsze niz w innych systemach DBMS. Istnieje takze
-          mozliwosc skorzystania z komercyjnego wsparcia dla tych,
-          kt�rych takiego rozwiazania potrzebuja. (Sprawdz ten punkt
-          FAQ.)
-          
-   Cena
-          Korzystanie z PostgreSQL jest darmowe, zar�wno w przypadku
-          komercyjnym jak i niekomercyjnym. Mozesz korzystac z naszego
-          kodu zr�dl/owego w Twoim produkcie bez zadnych ograniczen, poza
-          tymi wymienionymi w licencji BSD przytoczonej powyzej.
-          
-    1.15) W jaki spos�b moge wesprzec finansowo PostgreSQL?
-    
-   PostgreSQL korzysta z najlepszej infrastruktury od samego poczatku
-   istnienia projektu, czyli roku 1996 kiedy rozpoczelismy prace.
-   Wszystko to zawdzieczamy Marc'owi Fournier'owi, kt�ry stworzyl/ ta
-   infrastrukture i zarzadza nia od lat.
-   
-   Wysokiej jakosci infrastruktura jest bardzo wazna dla kazdego projektu
-   open-source. Zapobiega przerwom w rozwoju projektu i jakimkolwiek
-   przestojom.
-   
-   Oczywiscie korzystanie z wysokiej jakosci infrastruktury nie jest
-   tanie. Istnieje wiele r�znych miesiecznych, czy jednorazowych
-   wydatk�w, kt�re trzeba ponosic aby wszystko dzial/al/o jak nalezy.
-   Jesli Ty, badz Twoja firma moze wspom�c finansowo rozw�j PostgreSQL
-   odwiedz adres: http://store.pgsql.com/shopping/ gdzie opisane jest jak
-   to zrobic.
-   
-   Chociaz na stronie wspomniana jest nazwa PostgreSQL Inc, "datki" sa
-   przeznaczone jedynie na rozw�j projektu PostgreSQL i nie sa
-   przeznaczane na finansowanie jakiejkolwiek firmy. Jesli wolisz, mozesz
-   wysl/ac czek na adres kontaktowy.
-     _________________________________________________________________
-   
-   Jesli mozesz sie pochwalic udanymi wdrozeniami PostgreSQL, prosimy
-   abys zgl/osil/ nam to na stronie: http://advocacy.postgresql.org.
-   
-                           User Client Questions
-                                      
-    2.1) Czy sa jakies driwery ODBC dla PostgreSQL?
-    
-   Dostepne sa dwa driwery ODBC: PsqlODBC i OpenLink ODBC.
-   
-   Mozesz pobrac PsqlODBC z adresu
-   http://gborg.postgresql.org/project/psqlodbc/projdisplay.php
-   
-   OpenLink ODBC moze byc pobrany z adresu: http://www.openlinksw.com.
-   Wsp�l/pracuje ze standardowym oprogramowaniem klienckim ODBC wiec w
-   ten spos�b mozesz korzystac z PostgreSQL ODBC dostepnego na kazdej
-   pltaformie kt�ra wspiera (Win, Mac, Unix, VMS).
-   
-   Autorzy beda prawdopodobnie sprzedawac ten produkt osobom kt�re
-   wymagaja komercyjnego wsparcia, ale wersja darmowa bedzie zawsze
-   dostepna. Wszystkie pytania mozesz wysyl/ac na adres:
-   [email protected].
-   
-    2.2) Jakie istnieja narzedzia pozwalajace na dostep do PostgreSQL przez
-    www?
-    
-   Dobry podrecznik dla poczatkujacych o dostepie do bazy danych przez
-   www mozesz znalezc pod adresem: http://www.webreview.com
-   
-   Do integracji z www, swietnym rozwiazaniem jest PHP. Mozesz znalezc
-   wiecej informacji na ten temat pod adresem http://www.php.net.
-   
-   Wiele os�b w przypadku skomplikowanych rozwiazan uzywa Perl'a i
-   modul/u CGI.pl lub mod_perl.
-   
-    2.3) Czy istnieje jakies GUI dla PostgreSQL?
-    
-   Tak, istnieje kilka interfejs�w graficznych dla PostgreSQL. Wsr�d nich
-   PgAccess ( http://www.pgaccess.org), PgAdmin III
-   (http://www.pgadmin.org), RHDB Admin (http://sources.redhat.com/rhdb/
-   ) oraz Rekall ( http://www.thekompany.com/products/rekall/,
-   komercyjny). Istnieje takze PHPPgAdmin (
-   http://phppgadmin.sourceforge.net/ ), webowy interfejs dla PostgreSQL.
-   
-   Wiecej informacji na ten temat znajduje sie pod adresem See
-   http://techdocs.postgresql.org/guides/GUITools.
-   
-    2.4) Za pomoca jakich jezyk�w programowania mozna sie komunikowac z
-    PostgreSQL?
-    
-   Najbardziej popularne jezyki posiiadaja wl/asny interfejs dla
-   PostgreSQL. Sprawdz liste rozszerzen dla intersujacego Ciebie jezyka
-   programowania.
-   
-   Ze zr�dl/ami PostreSQL dystrubuowane sa interfejsy dla nastepujacych
-   jezyk�w programowania:
-     * C (libpq)
-     * Embedded C (ecpg)
-     * Java (jdbc)
-     * Python (PyGreSQL)
-     * TCL (libpgtcl)
-       
-   Inne interfejsy sa dostepne pod adresem: http://gborg.postgresql.org w
-   sekcji Drivers/Interfaces.
-     _________________________________________________________________
-   
-                      Pytania dotyczace administracji
-                                      
-    3.1) Jak moge zainstalowac PostgreSQL w innej lokalizacji niz
-    /usr/local/pgsql?
-    
-   Uzyj opcji --prefix podczas uruchamiania skryptu configure.
-   
-    3.2) Podczas startu postmaster'a, otrzymuje komunikat o bl/edzie: Bad
-    System Call lub "core dumped". Dlaczego?
-    
-   Ten bl/ad moze byc wynikiem wielu problem�w, ale na poczatek sprawdz
-   czy masz zainstalowane rozszerzenia systemu V w jadrze systemu.
-   PostgreSQL wymaga do pracy zainstalowanej obsl/ugi pamieci dzielonej i
-   semafor�w.
-   
-    3.3) Podczas startu postmaster'a, otrzymuje komunikat o bl/edzie:
-    IpcMemoryCreate. Dlaczego?
-    
-   Albo nie masz poprawnie skonfigurowanej obsl/ugi pamieci dzielonej w
-   jadrze systemu, albo musisz zwiekszyc jej dostepny rozmiar. Dokl/adna
-   ilosc jaka potrzebujesz jest zalezna od architektury systemu na jakim
-   pracujesz, jak duzo bufor�w oraz jak duzo proces�w backendu
-   skonfigurowal/es dla postmaster'a. Dla wiekszosci system�w, z domyslna
-   liczba bufor�w i proces�w potrzebujesz minimum w przyblizeniu 1MB.
-   Zobacz PostgreSQL Administrator's Guide gdzie szczeg�l/owo zostal/o
-   opisane wykorzystanie pamieci dzielonej i semafor�w.
-   
-    3.4) Podczas startu postmaster'a, otrzymuje komunikat o bl/edzie:
-    IpcSemaphoreCreate. Dlaczego?
-    
-   Jesli tresc bl/edu brzmi: IpcSemaphoreCreate: semget failed (No space
-   left on device) oznacza to, ze jadro systemu nie jest skonfigurowane
-   do obsl/ugi wystarczajacej liczby semafor�w. Postgres wymaga jednego
-   semafor'a na potencjalny jeden proces backend. Tymczasowym
-   rozwiazaniem jest uruchomienie programu postmaster z mniejsza
-   maksymalna liczba proces�w backend. Uzyj opcji -N z parameterem
-   mniejszym od domyslnego - 32. Bardziej trwal/ym rozwiazaniem jest
-   zwiekszenie parametr�w SEMMNS i SEMMNI jadra twojego systemu.
-   
-   Niedzial/ajace semafory moga spowodowac niepoprawne zamkniecie systemu
-   w czasie intensywnego korzystania z bazy.
-   
-   Jesli tresc bl/edu jest inna, moze to oznaczac, ze obsl/uga semafor�w
-   nie zostal/a wl/aczona do jadra wcale. Zobacz PostgreSQL
-   Administrator's Guide po bardziej szczeg�l/owe informacje o pamieci
-   dzielonej i semaforach.
-   
-    3.5) W jaki spos�b moge kontrolowac pol/aczenia z innych host�w?
-    
-   Domyslnie PostgreSQL pozwala jedynie na pol/aczenia za pomoca socket�w
-   Unixowych z lokalnego hosta. Inne hosty nie beda mogl/y sie pol/aczyc
-   z serwerem dop�ki nie zostanie dodana opcja -i do postmaster'a, oraz
-   nie umozliwi sie autoryzacji na podstawie adresu host�w modyfikujac
-   odpowiednio plik $PGDATA/pg_hba.conf. To zmiany pozwola na pol/aczenia
-   TCP/IP.
-   
-    3.6) Jak powinienem skonfigurowac system baz danych aby uzyskac lepsza
-    wydajnosc?
-    
-   Indeksy bez watpienia moga przyspieszyc wykonywanie zapytan. Polecenie
-   EXPLAIN pozwala zobaczyc jak PostgreSQL interpretuje Twoje zapytanie i
-   kt�re indeksy sa uzywane.
-   
-   Jesli wykonujesz bardzo duzo INSERT�w, moze warto je wykonac za pomoca
-   jednego duzego pliku uzywajac polecenia COPY. Jest to duzo szybsze niz
-   pojedyncze INSERTy. Po drugie polecenia SQL nie zawarte w bloku
-   okreslajacym transakcje - BEGIN WORK/COMMIT, sa traktowane jako
-   pojedyncza transakcja. Rozwaz wykonanie kilku polecen/zdan SQL w
-   jednym bloku transakcji. To redukuje narzut nakl/adany przez
-   transakcje. Przy duzych zmianach w danych, warto usunac i stworzyc na
-   nowo indeksy.
-   
-   Jest kilka opcji pozwalajacych na poprawienie wydajnosci. Mozesz
-   wyl/aczyc fsync() poprzez uruchomienie postmaster'a z opcjami -o -F.
-   To spowoduje, ze fsync() nie bedzie zrzucal/ danych na dysk po kazdej
-   transakcji.
-   
-   Mozesz takze uruchomic postmaster'a z opcja -B aby zwiekszyc wielkosc
-   pamieci dzielonej uzywanej przez procesy backend�w. Jesli ustawisz ta
-   wartosc zbyt wysoko i przekroczysz limity ustawione przez kernel na
-   pamiec dzielona, postmaster moze sie nie uruchomic. Kazdy bufor
-   zajmuje 8K a domyslna ilosc bufor�w to 64.
-   
-   Mozesz takze uzyc opcji -S dla backendu aby zwiekszyc maksymalna
-   wartosc pamieci uzywana przez proces backendu podczas sortowania.
-   Opcja -S jest ustawiana wartoscia podawana w kilobajtach, domyslna
-   wartosc to 512K.
-   
-   Mozesz takze uzyc polecenia CLUSTER aby pogrupowac dane w tabelach wg
-   indeksu. Zobacz opis polecenia CLUSTER w manualu zeby dowiedziec sie
-   wiecej.
-   
-    3.7) Jakie sa mozliwosci wyszukiwania bl/ed�w?
-    
-   PostgreSQL ma kilka mozliwosci na raportowanie informacji o jego
-   statusie, kt�re moga byc przydatne przy debugowaniu procesu.
-   
-   Przede wszystkim uruchom skrypt configure z opcja --enable-cassert,
-   wiele funkcji assert() monitoruja postep procesu backend i zatrzymuja
-   program kiedy wydarzy sie cos nieoczekiwanego.
-   
-   Zar�wno postmaster jak i postgres maja kilka opcji do debugowania. Za
-   kazdym razem kiedy uruchamiasz postmaster'a, upewnij sie, ze wysyl/asz
-   standardowe wyjscie i error do pliku z logami, np. w ten spos�b:
-    cd /usr/local/pgsql
-    ./bin/postmaster >server.log 2>&1 &
-
-   To utworzy plik server.log w gl/�wnym katalogu PostgreSQL. Ten plik
-   zawiera pozyteczne informacje o problemach i bl/edach, kt�re
-   wydarzyl/y sie podczas pracy serwera. Postmaster posiada opcje -d,
-   kt�ra pozwala na raportowanie bardzo szczeg�lowych informacji. Do
-   opcji -d podajemy liczbe, kt�ra okresla szczeg�l/owosc wysyl/anych
-   informacji. Musisz miec swiadomosc, ze wysoki poziom logowania bedzie
-   powodowal/ tworzenie bardzo duzych plik�w z logami.
-   
-   Jesli postmaster nie zostal/ uruchomiony, mozesz uruchomic
-   postgres'owy backend z linii polecen, i uruchomic Twoje polecenie SQL
-   bezposrednio na nim. Taki spos�b jest polecany jedynie w przypadku
-   debugowania. Zwr�c uwage, ze w tym wypadku zapytanie konczy znak nowej
-   linii a nie srednik. Jesli skompilowal/es z opcjami debugowania mozesz
-   uzyc debuggera aby sprawdzic co sie dzieje. Poniewz backend nie
-   zostal/ uruchomiony przez postmaster'a, nie dzial/a w identycznym
-   srodowisku, co oznacza ze powt�rzenie warunk�w w jakich wystapil/y
-   problemy moze byc problemem.
-   
-   Jesli postmaster dzial/a, uruchom psql w jednym z okien, nastepnie
-   znajdz PID procesu postgres uzywanego przez psql. Uzyj debuggera aby
-   do PID'u postgres'a. Mozesz ustawiac pul/apki (breakpoints) w
-   debuggerze i wykonywac zapytania z psql. Jesli debugujesz uruchamianie
-   postgres'a, mozesz ustawic zmienna PGOPTIONS="-W n", nastepnie
-   uruchomic psql. Opcja ta pozwoli spowolnic uruchomienie na n sekund
-   abys m�gl/ sie pol/aczyc z procesem za pomoca debugera, ustawic
-   jakiekolwiek pul/apki i kontynuowac proces uruchamiania.
-   
-   postgres moze byc uruchamiany z opcjami -s, -A i -t, kt�re moga byc
-   bardzo przydatne przy debuggowaniu i ocenie wydajnosci.
-   
-   Mozesz takze skompilowac z profilingiem aby zobaczyc jakie funkcje ile
-   czasu wykonuja sie. Pliki profilowane dla backendu zostana umieszczone
-   w katalogu pgsql/data/base/dbname. Pliki profilu klienta zostana
-   umieszczone w biezacym katalogu klienta. Linux wymaga aby kompilowac z
-   opcja -DLINUX_PROFILE aby profilowanie odbywal/o sie poprawnie.
-   
-    3.8) Skad sie bierze komunikat: "Sorry, too many clients" podczas pr�by
-    pol/aczenia sie z baza danych?
-    
-   Musisz zwiekszyc limit ilosci jednoczesnych proces�w bacekendu dla
-   procesu postmaster'a.
-   
-   Domyslny limit to 32 procesy. Mozesz go zwiekszyc przez restart
-   postmaster z odpowiednia wartoscia ustawiana opcje -N w pliku
-   postgresql.conf.
-   
-   Wez pod uwage, ze jesli zwiekszysz wartosc podana w opcji -N na wiecej
-   niz 32 musisz takze zwiekszyc wartosc w opcji -B ponad jej domyslna
-   wartosc 64; wartosc -B musi byc co najmniej dwa razy wieksza od
-   wartosci podanej w opcji -N, a prawdopodobnie powinna byc w
-   rzeczywistosci jeszcze wieksza dla optymalnej wydajnosci. Dla duzej
-   liczby proces�w backendu na pewno zauwazysz, ze trzeba zwiekszyc r�zne
-   parametry jadra Unixa. Rzeczy, kt�re pownienes sprawdzic to maksymalna
-   liczba blok�w pamieci dzielonej, SHMMAX; maksymalna liczba semafor�w,
-   SEMMNS oraz SEMMNI; maksymalna liczba proces�w, NPROC; maksymalna
-   liczba proces�w na jednego uzytkownika, MAXUPRC; i maksymalna liczba
-   otwartych plik�w, NFILE oraz NINODE. Pow�d dla kt�rego PostgreSQL ma
-   limit na maksymalna liczbe proces�w backendu to obawa o wyczerpanie
-   zasob�w systemu.
-   
-    3.9) Jakie pliki znajduja sie w pg_temp?
-    
-   Katalog ten zawiera tymczasowe pliki utworzone przez executor. Dla
-   przykl/adu, jesli jakas operacja sortowania jest wymagana do wykonania
-   ORDER BY, a samo sortowanie wymaga wiecej miejsca niz parametr
-   backendu -S ustawil/ do wykorzystania, wtedy tymczasowe pliki sa
-   uzywane do przechowywania tych danych.
-   
-   Pliki tymczasowe powinny byc usuniete automatycznie, ale mogl/o sie to
-   nie stac jesli proces backendu w miedzyczasie nie zakonczyl/ sie
-   poprawnie podczas operacji sortowania. Jesli w danym momencie nie
-   dzial/aja zadne procesy backend�w mozesz spokojnie usunac pliki
-   pg_tempNNN.NN.
-   
-    3.9) Dlaczego konieczne jest przy upgradzie PostgreSQL korzystanie ze
-    skrypt�w dump i restore?
-    
-   Tw�rcy PostgreSQL dokonuja jedynie mal/ych zmian pomiedzy mal/ymi
-   upgradami wersji, np z 7.2 do 7.2.1, wtedy upgrade nie wymaga
-   korzystania z dump i restore. Przy wiekszych zmianach, np. z wersji
-   7.2 do 7.3, czesto zmianymaja wpl/yw na format przechowywanych danych.
-   Zmiany te sa na tyle skomplikowane, ze nie utrzymujemy zgodosci z
-   poprzednimi wersjami PostgreSQL. dump pozwala na wydostanie danych w
-   takiej postaci, w kt�rej l/atwe jest ich zaimportowanie do nowszych
-   wersji bez kl/opotu.
-   
-   W wydaniach gdzie zmiany nie dotycza formatu danych na dysku, mozna
-   wykorzystac skryptu pg_upgrade, do upgradu bez uzycia dump/restore.
-   Dokumentacja do danego wydania zawiera informacje czy mozliwe jest
-   uzycie pg_upgrade.
-     _________________________________________________________________
-   
-                         Pytania dotyczace uzywania
-                                      
-    4.1) Jaka jest r�znica pomiedzy kursorami binarnymi (binary cursors) i
-    zwykl/ymi kursorami (normal cursors)?
-    
-   Zobacz w manualu opis polecenia DECLARE.
-   
-    4.2) Jak moge pobrac za pomoca SELECT jedynie kilka pierwszych wynik�w
-    zapytania?
-    
-   Zobacz w manualu opis polecenia FETCH lub uzyj polecenia SELECT ...
-   LIMIT....
-   
-   Nawet jesli chesz pobrac kilka pierwszych rzed�w z wyniku zapytania,
-   cal/e zapytanie musi zostac wykonane. Byc moze powinienes skorzystac z
-   polecenia ORDER BY. Jesli istnieje indeks kt�ry odpowiada polom
-   okreslonym przez ORDER BY, PostgreSQL moze wykorzystac jedynie kilka
-   pierwszych rzed�w, byc moze bedzie koniecznosc wykonania zapytania do
-   momentu az zostana znalezione pozadane wyniki.
-   
-   Aby otrzymac losowy rzad, uzyj:
-    SELECT col
-    FROM tab
-    ORDER BY random()
-    LIMIT 1;
-        
-
-    4.3) Jak moge uzyskac liste wszystkich tabel czy innych rzeczy pod psql?
-    
-   Mozesz sprawdzic zawartosc zr�del/ psql, a konkretnie plik
-   pgsql/src/bin/psql/describe.c. Zawiera on polecenia SQL kt�re generuja
-   wyniki komend z backslashem. Mozesz takze uruchomic psql z opcja -E
-   wtedy po wykonaniu polecenia z backslashem wyswietlane bedzie
-   zapytanie, kt�re w rzeczywistosci jest wykonywane.
-   
-    4.4) Jak usunac kolumne z tabeli lub zmienic jej typ?
-    
-   DROP COLUMNT zostal/o dodane w wersji 7.3 przy poleceniu ALTER TABLE
-   DROP COLUMN. We wczesniejszych wersjach mozesz zrobic tak:
-         BEGIN;
-         LOCAL TABLE old_table;
-    SELECT ...  -- wybierz wszystkie kolumny poza ta jedna kt�rej chcesz sie pozbyc
-    INTO TABLE new_table
-    FROM old_table;
-    DROP TABLE old_table;
-    ALTER TABLE new_table RENAME TO old_table;
-
-   Aby zmienic typ danych kolumny mozesz zrobic tak:
-   BEGIN;
-   ALTER TABLE tab ADD COLUMN new_col new_data_type;
-   UPDATE tab SET new_col = CAST(old_col AS new_data_type);
-   ALTER TABLE tab DROP COLUMN old_col;
-   COMMIT;
-        
-    4.5) Jaki jest maksymalny rozmiar dla rzedu, tabeli i bazy danych?
-    
-   Oto wszystkie ograniczenia:
-    Maksymalny rozmiar dla bazdy danych?     nieograniczony ( istnieja
-         bazy danych o wielkosci 32 TB databases )
-    Maksymalny rozmiar dla tabeli?           32 TB
-    Maksymalny rozmiar dla rzedu?            1.6 TB
-    Maksymalny rozmiar pola?                 1 GB
-    Maksymalna liczba rzed�w w tabeli?       nieograniczona
-    Maksymalna liczba kolumn w tabeli?       250-1600 w zalezonosci od typ�w kolumn
-    Makasymalna liczba indeks�w na tabeli?   nieograniczona
-
-   Oczywiscie "nieograniczony" nie jest prawda tak do konca, istnieja
-   ograniczenia wynikajace z dostepnego miejsca na dysku, pamieci/swapa.
-   Kiedy wielkosci te beda bardzo duze moze odbic sie to na wydajnosci.
-   
-   Maksymalny rozmiar tabeli, czyli 32 TB nie wymaga od systemu
-   operacyjnego wsparcia dla duzych plik�w. Duze tabele sa przechowywane
-   jako pliki o rozmiarze 1 GB, wiec ograniczenia co do wielkosci plik�w
-   narzucone przez system plik�w nie sa istotne.
-   
-   Masymalny rozmiar tabeli i maksymalna liczba kolumn moze byc
-   zwiekszona jesli zwiekszymy domyslny rozmiar bloku (block size) do
-   32k.
-   
-    4.6) Jak duzo miejsca w bazie danych jest konieczne aby przechowywac dane
-    ze zwyczajnego pliku tekstowego?
-    
-   Baza danych PostgreSQL moze potrzebowac do pieciu razy wiecej miejsca
-   na przechowywanie danych z plik�w tekstowych niz ich objetosc.
-   
-   Jako przykl/ad mozemy rozwazyc plik skl/adajacy sie z 100,000 linii
-   zbudowanych z liczby cal/kowitej oraz opisu tekstowego w kazdej.
-   Zal/�zmy, ze srednio kazdy l/ancuch tekstu w linii zajmuje 20 bajt�w.
-   Cal/y plik powinien zajmowac ok. 2.8 MB. Rozmiar pliku bazy danych w
-   PostgreSQL zawierajacego te dane mozna oszacowac na okol/o 6.4MB:
-    36 bajt�w: nagl/�wek kazdego rzedu w przyblizeniu)
-    24 bajty:  jedno pole int i jedno pole typu text
-   + 4 bajty:  wkaznik na stronie do krotki
-   --------------------------------------------------
-    64 bajty w jednym rzedzie
-
-        Strona danych w PostgreSQL zajmuje 8192 bajt�w (8 KB), wiec:
-
-   8192 bajt�w na strone
-   ---------------------   =  128 rzed�w na jedna strone w bazie (zaokraglone w d�l/)
-     64 bajt�w na rzad
-
-   100000 rzed�w danych
-   -----------------------  =  782 stron w bazie danych (zaokraglone w g�re)
-      128 rzed�w na strone
-
-782 stron w bazie * 8192 bajt�w na strone  =  6,406,144 bajt�w (6.4 MB)
-
-   Indeksy nie powoduja duzego narzutu na zajmowane miejsce, ale
-   zawieraja pewne dane, wiec w pewnych przypadkach moga byc cal/kiem
-   duze.
-   
-   NULLe sa przechowywane jako mapy bitowe, wiec uzywaja bardzo mal/o
-   miejsca.
-   
-    4.7) Jak moge sprawdzic jakie tabele, klucze, bazy danych i uzytkownicy sa
-    utworzeni?
-    
-   psql ma cal/kiem duza ilosc polecen z backslashem aby wydobyc takie
-   informacje. Wprowadz \? aby zobaczyc ich spis. Istnieja takze tablice
-   systemowe rozpoczynajace sie od pg_, zawierajace interesujace Ciebie
-   informacje. Wykonanie psql -l pokaze spis wszystkich baz danych.
-   
-   Obejrzyj takze plik pgsql/src/tutorial/syscat.source. Zawiera on wiele
-   z zapytan typu SELECT, kt�re sa potrzebne aby wydobyc informacje z
-   tablic systemowych.
-   
-    4.8) Moje zapytania sa wolne lub nie uzywaja kluczy. Dlaczego?
-    
-   Indeksy nie sa uzywane automatycznie przez kazde z zapytan. Ideksy sa
-   uzywane jedynie gdy tabela jest odpowiedniego rozmiaru, wiekszego niz
-   wymagany minimalny, a zapytanie wybiera jedynie mal/y procent
-   zawartosci tabeli. Wynika to z tego, ze losowy dostep do dysku
-   powodowany przez ideksowane poszukiwanie jest czasami wolniejsze niz
-   poszukiwanie sekwencyjne bez uzycia kluczy.
-   
-   Zeby zdecydowac czy indeks powinien byc uzywany, PostgreSQL musi miec
-   statystyki dotyczace danej tabeli. Sa one gromadzone przez uzycie
-   polecenia VACUUM ANALYZE, lub poprostu ANALYZE. uzywajac statystyk,
-   optymalizator wie ile rzed�w jest w tabeli i moze lepiej okreslic czy
-   indeksy powinny byc uzyte. Statystyki moga byc takze pomocne w
-   okresleniu najlepszej kolejnosci wykonania zl/aczenia (join) i jego
-   sposobu. Gromadzenie statystyk powinno sie odbywac w okreslonych
-   interwal/ach czasu poniewaz dane w tabelach zmieniaja sie.
-   
-   Indeksy nie sa zazwyczaj uzywane przez ORDER BY lub przy wykonywaniu
-   zl/aczen (join). Sekwencyjne przeszukiwanie po kt�rym nastepuje
-   sortowanie jest zazwyczaj szybsze nie wyszukiwanie za pomoca indeksu
-   na duzej tabeli.
-   
-   Jakkolwiek LIMIT w pol/aczeniu z ORDER BY czesto bedzie wykorzystywal/
-   indeksy poniewaz jedynie mal/a czesc z tabeli jest zwracana. W
-   rzeczywistosci, chociaz MAX() i MIN() nie uzywaja indeks�w, mozliwe
-   jest aby zwr�cic te wartosci uzywajac indeks�w poprzez uzycie ORDER BY
-   i LIMIT.
-    SELECT col
-    FROM tab
-    ORDER BY col [ DESC ]
-    LIMIT 1;
-        
-   Jesli uwazasz, ze optimizer myli sie wybierajac sequential scan, uzyj
-   SET enable_seqscan TO 'off' i uruchom testy aby sprawdzic czy wtym
-   wypadku zapytanie bedzie szybciej wykonywane.
-   
-   Kiedy uzywa sie operator�w dopasujacych takich jak LIKE lub ~, indeksy
-   beda uzywane jedynie w pewnych wypadkach:
-     * Poczatek wyszukiwania jest oparty na poczatku l/ancucha tekstu.
-          + wzorce LIKE nie moga sie zaczynac %
-          + dopasowania operatorem ~ (dopasowania regularne) musza sie
-            zaczynac znakiem specjalnym ^.
-     * Poczatek wyszukiwania nie moze sie zaczynac od klas znak�w, np.
-       [a-e].
-     * Case-insensitive searches such as ILIKE and ~* do not utilise
-       indexes. Instead, use functional indexes, which are described in
-       section 4.12.
-     * Standardowe locale C musi byc uzyte przy wykonywaniu initdb
-       
-    4.9) Jak moge sprawdzic w jakis spos�b "query optimizer" wykonuje moje
-    zapytanie?
-    
-   Zobacz manual dla polecenia EXPLAIN.
-   
-    4.10) Co to jest "R-tree index"?
-    
-   Indeks R-tree jest uzywany do indeksowania danych przestrzennych.
-   Indeks hasuujacy nie nadaje sie do wyszukiwania odlegl/osci. Natomiast
-   indeks typu B-tree moze wyszukiwac odleglosci jedynie w
-   jednowymiarowych przestrzeniach. R-tree indeks radzi sobie z
-   przestrzeniami wielo-wymiarowymi. Dla przykl/adu, jesli zostanie
-   zal/ozony indeks typu R-tree na polu typu point, system moze bardziej
-   wydajnie odpowiadac na zapytania typu "select all points within a
-   bounding rectangle."
-   
-   Zr�dl/owym dokumentem opisujacym oryginalnie projektowanie R-tree
-   indeks�w jest:
-   
-   Guttman, A. "R-trees: A Dynamic Index Structure for Spatial
-   Searching." Proceedings of the 1984 ACM SIGMOD Int'l Conf on Mgmt of
-   Data, 45-57.
-   
-   Ten dokument mozesz znalezc takze w pracy Stonebraker'a "Readings in
-   Database Systems".
-   
-   Wbudowane indeksy R-trees radza sobie w wielobokami i boxes.
-   Teoretycznie, indeksy R-tree moga byc rozszerzone o mozliwosci
-   indeksowania w wiecej wymiarowych przestrzeniach. W praktyce,
-   rozbudowa indeks�w R-tree wymaga troche pracy, a w tej chwili nie
-   dysponujemy jakakolwiek dokumentacja jak to zrobic.
-   
-    4.11) Co to jest "Genetic Query Optimizer"?
-    
-   Modul/ GEQO ma za zadanie przyspieszenie optymalizacji zapytan l/aczac
-   wiele tabel za pomoca algorytm�w genetycznych (Genetic Algorithm
-   (GA)). Pozwala na uzywanie duzych zapytan l/aczacych tabele (join
-   queries) bez wykorzystywania zasobozernego wyszukiwania.
-   
-    4.12) Jak moge uzywac wyrazen regularnych w zapytaniach i zapytan
-    case-insensitive w wyrazeniach regularnych? Jak korzystac z indeks�w dla
-    zapytan case-insensitive?
-    
-   Operator ~ moze byc wykorzystywany do wyszukiwania za pomoca wyrazen
-   regularnych, a ~* do wyszukiwania case-insensitive z wyrazeniami
-   regularnymi. Wariant case-insensitive dla LIKE zostal/ nazwany ILIKE.
-   
-   Por�wnania case-insensitive sa zazwyczaj wykonywane w nastepujacy
-   spos�b:
-    SELECT *
-    FROM tab
-    WHERE lower(col) = 'abc'
-
-   W tym wypadku standardowe indeksy nie beda uzywane. Mozesz utworzyc
-   indeks funkcyjny, poprzez:
-    CREATE INDEX tabindex on tab (lower(col));
-
-    4.13) Jak sprawdzic w zapytaniu czy pole ma wartosc NULL?
-    
-   Mozesz to sprawdzic, testujac wartosc kolumny warunkiem IS NULL albo
-   IS NOT NULL.
-   
-    4.14) Jaka jest r�znica pomiedzy r�znymi typami tekstowymi (character
-    types)?
-    
-Type            Nazwa wewnetrzna   Uwagi
---------------------------------------------------
-VARCHAR(n)      varchar            rozmiar okresla maksymalna dl/ugosc, nie matutaj wypel/niania
-CHAR(n)         bpchar             wypel/niane pustymi znakami do podanej dl/ugosci
-TEXT            text               bez limitu na dl/ugosc l/ancucha
-BYTEA           bytea              zmiennej dl/ugosci tablica bajt�w (null-byte safe)
-"char"          char                      1 znak
-
-   Jesli bedziesz przegladac katalogi systemowe lub komunikaty o bl/edach
-   czesto spotkasz sie z podanymi powyzej nazwami wewnetrznymi.
-   
-   Pierwsze cztery typy powyzej to tzw typy "varlena" (np. pierwsze
-   cztery bajty na dysku to dl/ugosc, po kt�rych jest data). Dlatego
-   faktyczna dl/ugosc takiego l/ancucha jest troche wieksza niz
-   zadeklarowany rozmiar. Te typy takze podlegaja kompresji lub moga byc
-   przechowywane out-of-line jako TOAST, wiec faktyczne zuzycie miejsca
-   na dysku moze byc mniejsze niz oczekiwane.
-   
-   VARCHAR(n) jest najodpowiedniejszy do przechowywania l/ancuch�w o
-   r�znej dl/ugosci ale okresla on maksymalna jego dl/ugosc. TEXT jest
-   najlepszy dla l/ancuch�w o dowolnej dl/ugosci, nie przekraczajacej
-   1GB.
-   
-   CHAR(n) jast najlepszym typem do przechowywania l/ancuch�w o tej samej
-   dl/ugosci. CHAR(n) wypel/nia dane do zadanej dl/ugosci, podczas gdy
-   VARCHAR(n) przechowuje jedynie dane dostarczone. BYTEA sl/uzy do
-   przechowywania danych binarnych, w szczeg�lnosci dla danych
-   zawierajacych NULL bajty. Wszystkie typy opisane tutaj maja podobne
-   charakterystyki jesli chodzi o wydajnosc.
-   
-    4.15.1) Jak moge utworzyc pole kt�re samo zwieksza swoja wartosc?
-    
-   PostgreSQL ma zaimplementowany typ SERIAL. Automatycznie tworzy
-   sekwencje i indeks na tej kolumnie. Dla przykladu:
-    CREATE TABLE person (
-        id   SERIAL,
-        name TEXT
-    );
-
-   zostanie automatycznie prztl/umaczone na:
-    CREATE SEQUENCE person_id_seq;
-    CREATE TABLE person (
-        id   INT4 NOT NULL DEFAULT nextval('person_id_seq'),
-        name TEXT
-    );
-    CREATE UNIQUE INDEX person_id_key ON person ( id );
-
-   Wiecej informacji o sekwencjach znajdziesz w manualu o
-   create_sequence. Mozesz takze uzyc pola OID jako unikalnej wartosci
-   dla kazdego rzedu danych. Jesli bedziesz potrzebowal/ z backupowac
-   dane robiac dump bazy i odtworzyc ja, musisz uzyc pg_dump z opcja -o
-   lub polecenia COPY WITH OIDS aby zachowac OIDy.
-   
-    4.15.2) Jak pobrac wartosc pola typu SERIAL po wykonaniu insert'u?
-    
-   Jednym z podejsc jest pobranie kolejnej wartosci typu SERIAL z
-   sekwencji za pomoca funkcji nextval() zanim zostanie wstawiona, a
-   p�zniej nalezy jej uzyc. Uzywajac przykl/adu z tabeli z punktu 4.15.1,
-   moze to wygladac w Perlu na przykl/ad w ten spos�b:
-    new_id = output of "SELECT nextval('person_id_seq')"
-    INSERT INTO person (id, name) VALUES (new_id, 'Blaise Pascal');
-
-   Bedziesz mial/ wtedy ta wartosc przechowana w zmiennej new_id do
-   uzytku w innych zapytaniach (np. jako klucz obcy do tabeli person).
-   Warto zwr�cic uwage, ze nazwa automatycznie utworzonej sekwencji
-   SEQUENCE bedzie nastepujaca: <tabela>_<kolumnatypuserial>_seq, gdzie
-   tabela i kolumnatypuserial sa nazwami Twojej tabeli i Twojej kolumny
-   typu SERIAL.
-   
-   Inne rozwiazanie to uzycie funkcji currval() na pola typu SERIAL po
-   dodaniu nowej wartosci do rzedu zawierajacego kolumne typu SERIAL z
-   wstawiona domyslnie wartoscia, np.
-    INSERT INTO person (name) VALUES ('Blaise Pascal');
-    new_id = output of "SELECT currval('person_id_seq')";
-
-   Ostatecznie mozesz uzyc OID zwracanej po wykonaniu INSERT, chociaz to
-   jest najmniej przenosne rozwiazanie. W Perlu, wykorzystujac biblioteke
-   DBI z modul/em Edmunda Mergla DBD::Pg, oid jest dostepny poprzez
-   $sth->{pg_oid_status} po wykonaniu $sth->execute().
-   
-    4.15.3) Czy uzycie currval() i nextval() nie doprowadzi do race condition z
-    innymi uzytkownikami?
-    
-   Nie. currval() zwraca biezaca wartosc przypisana przez Tw�j backend, a
-   nie przez wszystkich uzytkownik�w.
-   
-    4.15.4) Dlaczego numery sekwencji nie sa ponownie uzywane przy przerwaniu
-    transakcji? Skad sie biora luki w numerowaniu kolumny tabeli
-    sekwancjami/SERIALem?
-    
-   Aby poprawic zbieznosc (concurrency), wartosci sekwencji sa podawane
-   dzial/ajacym transakcjom kiedy tego potrzebuja i nie sa blokowane
-   dop�ki transakcja sie nie zakonczy. To spowoduje przerwy w numerowaniu
-   z przerwanych transakcji.
-   
-    4.16) Co to jest OID? Co to jest TID?
-    
-   OID sa PostgreSQL'owym rozwiazaniem problemu unikalnych numer�w
-   rzed�w. Kazdy rzad tworzony przez PostgreSQL otrzymuje unikalny OID.
-   Wszystkie OIDy generowane podczas procesu uruchamianego przez skrypt
-   initdb maja mniejsza wartosc niz 16384 (na podstawie pliku
-   backend/access/transam.h). Wszystkie OIDy tworzone przez uzytkownika
-   sa r�wne lub wieksze podanej wczesniej wartosci. Domyslnie wszystkie
-   OIDy sa unikalne nie tylko w pojedynczej tabeli czy bazie danych ale w
-   cal/ej instalacji PostgreSQL.
-   
-   PostgreSQL uzywa OID�w w swoim wewnetrznym systemie tabel, aby mozna
-   byl/o je l/aczyc. Te OIDy moga byc uzywane aby identyfikowac rzedy w
-   tabelach i wykorzystywac je w zl/aczeniach tych tabel. Zaleca sie abys
-   uzywal/ typu OID aby przechowywac wartosci OID. Mozesz utworzyc indeks
-   na polu OID aby dostep do niego byl/ szybszy.
-   
-   OID sa przypisane do wszystkich rzed�w z jednego gl/�wnego miejsca i
-   uzywane sa przez wszystkie bazy danych. Jesli chcial/bys zmienic OID
-   na cos innego, lub jesli chcial/bys zrobic kopie tabeli, z orginalnymi
-   OIDami nie ma zadnego przeciwwskazania abys to zrobil/:
-        CREATE TABLE new_table(old_oid oid, mycol int);
-        SELECT old_oid, mycol INTO new FROM old;
-        COPY new TO '/tmp/pgtable';
-        DELETE FROM new;
-        COPY new WITH OIDS FROM '/tmp/pgtable';
-
-   OIDy sa przechowywane jako cztero-bajtowe liczby cal/kowite i skoncza
-   sie po osiagnieciu czterech miliard�w. Nikt jak dotad nie zgl/osil/
-   aby cos takiego sie stalo, ale mamy zamiar pozbyc sie tego
-   ograniczenia zanim ktos to zgl/osi.
-   
-   TID sa uzywane aby zidentyfikowac konkretne rzedy z blokami i
-   wartoscia ofset�w. TIDy zmieniaja sie wraz ze zmianami rzed�w. Sa
-   uzywane przez indeksy, aby wskazywac do fizycznych rzed�w.
-   
-    4.17) Jakie jest znaczenie niekt�rych termin�w w PostgreSQL?
-    
-   W czesci kodu zr�dl/owego i starszej dokumentacji uzywamy termin�w,
-   kt�re maja bardziej og�lne znaczenie. Oto niekt�re z nich:
-     * table, relation, class
-     * row, record, tuple
-     * column, field, attribute
-     * retrieve, select
-     * replace, update
-     * append, insert
-     * OID, serial value
-     * portal, cursor
-     * range variable, table name, table alias
-       
-   Liste termin�w zwiazanych z bazami danych mozesz znalezc pod tym
-   adresem:http://hea-www.harvard.edu/MST/simul/software/docs/pkgs/pgsql/
-   glossary/glossary.html.
-   
-    4.18) Skad bierze sie ten bl/ad "ERROR: Memory exhausted in
-    AllocSetAlloc()"?
-    
-   Prawdopodobnie wyczerpal/a Ci sie pamiec wirtualna (virtual memory) w
-   systemie lub Tw�j kernel ma zbyt nisko ustawione limity dla pewnych
-   zasob�w. Spr�buj wykonac nastepujace polecenia zanim uruchomisz
-   postmaster'a:
-    ulimit -d 262144
-    limit datasize 256m
-
-   W zaleznosci od shell'a jakiego uzywasz jedno z tych polecen moze nie
-   zadzial/ac, ale to ustawienie pozwoli ustawic segment danych dla
-   procesu znacznie wiekszy i byc moze pozwoli wykonac zapytanie. To
-   polecenie zadzial/a dla biezacego procesu oraz wszytkich podproces�w
-   utworzonych po wykonaniu polecenia. Jesli ten problem wystepuje z
-   klientem SQL, poniewaz backend zwraca zbyt duzo danych, spr�buj
-   wykonac to polecenie przed uruchomieniem klienta.
-   
-    4.19) Jak sprawdzic jakiej wersji PostgreSQL uzywam?
-    
-   W psql, wpisz select version();
-   
-    4.20) Dlaczego operacje, kt�re wykonuje na duzych obiektach "large-object"
-    zwracaja komunikat: "invalid large obj descriptor"?
-    
-   Musisz uzyc BEGIN WORK i COMMIT przed i po uzyciu uchwytu do duzego
-   obiektu, tzn. musisz nimi otoczyc funkcje lo_open ... lo_close.
-   
-   Obecnie PostgreSQL uzywjac "rule" zamyka uchwyt do duzego obiektu przy
-   kazdym wywol/aniu "commit". Wiec pierwsze pr�ba zrobienia czegokolwiek
-   z uchwytem spowoduje wypisanie: invalid large obj descriptor. Kod,
-   kt�ry do tej pory dzial/al/ (przynajmniej wiekszosc razy) bedzie teraz
-   generowal/ informacje o bl/edzie jesli nie bedziesz korzystal/ z
-   transakcji.
-   
-   Jesli uzywasz interfejsu klienta jak ODBC byc moze bedziesz musial/
-   ustawic auto-commit off.
-   
-    4.21) Jak stworzyc kolumne kt�rej domyslna wartoscia bedzie biezacy czas?
-    
-   Uzyj CURRENT_TIMESTAMP:
-CREATE TABLE test (x int, modtime timestamp DEFAULT CURRENT_TIMESTAMP );
-
-    4.22) Dlaczego zapytania uzywajace IN sa takie wolne?
-    
-   W wersjach wczesniejszych niz 7.4 l/aczymy podzapytania w outer
-   queries poprzez sekwencyjne przeszukiwanie wynik�w podzapytania dla
-   kazdego rzedu z outer query. Jesli podzapytanie zwraca jedynie kilka
-   rzed�w a zewnetrzne zapytanie zwraca ich wiele, IN jest najszybsze.
-   Aby przyspieszyc inne zapytania mozna zastapic IN przez EXISTS:
-SELECT *
-    FROM tab
-    WHERE col IN (SELECT subcol FROM subtab)
-
-   na:
-SELECT *
-    FROM tab
-    WHERE EXISTS (SELECT subcol FROM subtab WHERE subcol = col)
-
-   Aby to rozwiazanie byl/o szybkie, subcol powinna byc kolumna
-   indeksowana.
-   
-   W wersji 7.4 i p�zniejszych, IN w rzeczywistosci uzywa tej samej
-   wyrafinowanej techniki l/aczenia jak normalne zapytania i jest
-   preferowane nad uzywaniem EXISTS.
-   
-    4.23) Jak wykonac "outer join"?
-    
-   PostgreSQL ma zaimplementowane outer join wykorzystujac standardowa
-   skl/adnie SQL. Ponizej dwa przykl/ady:
-    SELECT *
-    FROM t1 LEFT OUTER JOIN t2 ON (t1.col = t2.col);
-
-   or
-    SELECT *
-    FROM t1 LEFT OUTER JOIN t2 USING (col);
-
-   Te dwa identyczne zapytania l/acza kolumne t1.col z kolumna t2.col,
-   ale takze zwr�ca niepol/aczone rzedy w t1 (te, kt�re nie pasuja w t2).
-   RIGHT join dodal/by niepol/aczone rzedy z tabeli t2. FULL join
-   zwr�cil/by rzedy plus dodatkowo wszystkie rzedy z tabel t1 i t2.
-   Sl/owo OUTER jest opcjonalne i jest dodawane domyslnie przy LEFT,
-   RIGHT, i FULL join'ach. Zwykl/e join'y sa nazywane INNER joins.
-   
-   W poprzednich wersjach "outer joins" moga byc zasymulowane poprzez
-   uzycie slowa kluczowego UNION i NOT IN. Dla przykl/adu, l/aczac tabele
-   tab1 i tab2, nastepujace zapytanie wykonuje outer join:
-    SELECT tab1.col1, tab2.col2
-    FROM tab1, tab2
-    WHERE tab1.col1 = tab2.col1
-    UNION ALL
-    SELECT tab1.col1, NULL
-    FROM tab1
-    WHERE tab1.col1 NOT IN (SELECT tab2.col1 FROM tab2)
-    ORDER BY col1
-
-    4.24) Jak wykonywac zapytanie uzywajace kilku baz danych jednoczesnie?
-    
-   Nie ma takiej mozliwosci aby w zapytaniu odpytawac inna baze danych
-   poza biezaca. Poniewaz PostgreSQL l/aduje specyficzne dla bazy danych
-   katalogi systemowe, nie jest do konca jasne jak zapytanie pomiedzy
-   r�znymi bazami danych powinno sie zachowywac.
-   
-   contrib/dblink pozwala na wykonywanie zapytan poprzez r�zne bazy
-   danych wywol/ujac odpowiednie funkcje. Oczywiscie klient moze l/aczyc
-   sie z r�znymi bazami danych i l/aczyc informacje w ten spos�b uzyskana
-   po stronie klienta.
-   
-    4.25) Jak zwr�cic w funkcji wiele rzed�w lub kolumn?
-    
-   Mozesz w l/atwy spos�b zwracac wiele rzed�w lub kolumn uzywajac
-   funkcji z:
-   http://techdocs.postgresql.org/guides/SetReturningFunctions.
-   
-    4.26) Dlaczego nie moge w spos�b pewny tworzyc/usuwac tabel tymczasowych w
-    funkcjach PL/PgSQL?
-    
-   PL/PgSQL przechowuje w cache zawartosc funkcji, niepozadanym efektem
-   tego jest to, ze gdy taka funkcja korzysta z tabel tymczasowych, kt�re
-   sa p�zniej kasowane i odtwarzane, a funkcja wywol/ywana jest
-   ponownie,jej wywol/anie nie powiedzie sie poniewaz cachowana funkcja
-   wciaz bedzie wskazywac na stara tablice tymczasowa. Rozwiazaniem tego
-   problemu jest uzywanie EXECUTE aby korzystac z tabel tymczasowych w
-   PL/PgSQL. To spowoduje, ze zapytanie bedzie parsowane przy kazdym
-   wywol/aniu funkcji.
-   
-    4.27) Jakie sa mozliwosci replikacji w PostgreSQL?
-    
-   Jest kilka opcji aby stosowac replikacje typu master/slave. Ten typ
-   pozwala jedynie masterowi na dokonywanie zmian w bazie danych, a slave
-   moze jedynie te zmiany odczytywac. Na stronie
-   http://gborg.PostgreSQL.org/genpage?replication_research znajduje sie
-   ich lista. Replikacja typu multi-master jest w trakcie prac, opis
-   projektu znajduje sie pod adresem:
-   http://gborg.PostgreSQL.org/project/pgreplication/projdisplay.php.
-   
-    4.28) Jakie mozliwosci szyfrowania oferuje PostgreSQL?
-    
-     * contrib/pgcrypto zawiera wiele funkcji za pomoca, kt�rych mozemy
-       uzywac kryptografii w zapytaniach SQL.
-     * Aby szyfrowac transmisje od klienta do serwera, ten musi miec
-       ustawiona opcje ssl na true w pliku postgresql.conf, odpowiedni
-       wpis host lub hostssl musi wystepowac w pliku pg_hba.conf, oraz
-       sslmode nie moze byc wyl/aczone w kliencie. (Warto zwr�cic uwage,
-       ze mozliwe jest takze uzywanie transport�w szyfrujac�w przez
-       strony trzecie, takie jak stunnel lub ssh, poza natywnym wsparciem
-       dla SSL przez PostgreSQL).
-     * Hasl/a uzytkownik�w bazy danych sa automatycznie szyfrowane od
-       wersji 7.3. W poprzednich wersjach, nalezy ta funkcjonalnosc
-       poprzez wl/aczenie opcji PASSWORD_ENCRYPTION w postgresql.conf.
-     * Serwer moze dzial/ac uzywajac szyfrowanego systemu plik�w.
-       
-                           Rozwijanie PostgreSQL
-                                      
-    5.1) Napisal/em wl/asna funkcje. Kiedy uzyje jej w psql, program zrzuca
-    pamiec (dump core)?
-    
-   Problem moze byc spowodowany przez bardzo wiele rzeczy. Spr�buj
-   najpierw przetestowac Twoja funkcje w samodzielnie dzial/ajacym
-   programie.
-   
-    5.2) Jak moge dodac/zgl/osic nowe typy czy funkcje do PostgreSQL?
-    
-   Wyslij Twoje propozycje na liste mailowa pgsql-hackers, wtedy
-   prawdopodobnie Tw�j kod znajdzie sie w katalogu contrib/.
-   
-    5.3) Jak napisac funkcje C zwracajaca krotke (tuple)?
-    
-   W wersjach PostgreSQL od numeru 7.3, funckje zwracajace tabele sa w
-   pelni wspierane w C, PL/PgSQL i SQL. Sprawdz w Programmer's Guide aby
-   uzyskac wiecej informacji. Przykl/ad funkcji napisanej w C zwracajacej
-   tabele zostal/ umieszczony w contrib/tablefunc.
-   
-    5.4) Zmienil/em plik zr�dl/owy. Dlaczego po rekompilacji nie widac zmiany?
-    
-   Pliki Makefiles nie maja dorzuconych odpowiednich zaleznosci dla
-   plik�w nagl/�wkowych (include files). Wykonaj najpierw make clean, a
-   nastepnie ponownie make. Jesli uzywasz GCC mozesz uzyc opcji
-   --enable-depend przy wykonywaniu configure aby kompilator m�gl/
-   okreslic zaleznosci samodzielnie.
diff --git a/doc/FAQ_russian b/doc/FAQ_russian
deleted file mode 100644
index a361767ccc..0000000000
--- a/doc/FAQ_russian
+++ /dev/null
@@ -1,988 +0,0 @@
-
-               Otvety na chasto zadavaemye voprosy po PostgreSQL
-                                       
-   Data poslednego obnovleniya: Sreda 25 iyunya 23:54:14 EDT 2008
-   
-   Anglijskij variant soprovozhdaet: Bryus Mom'yan (Bruce Momjian)
-   ([email protected])
-   
-   Pereviol na russkij: Viktor Vislobokov ([email protected])
-   
-   Samuyu svezhuyu anglijskuyu versiyu dokumenta mozhno najti na
-   http://www.postgresql.org/files/documentation/faqs/FAQ.html.
-   
-   Samuyu svezhuyu russkuyu versiyu dokumenta mozhno najti na
-   http://postgresql.ru.net/docs/FAQ_russian.html.
-   
-   Otvety na voprosy specifichnye dlya konkretnyh platform mozhno najti
-   na http://www.postgresql.org/docs/faq/.
-     _________________________________________________________________
-   
-                              Obschie voprosy
-                                      
-   1.1) CHto takoe PostgreSQL? Kak proiznositsya `eto nazvanie? CHto
-   takoe Postgres?
-   1.2) Kto upravlyaet PostgreSQL?
-   1.3) Kakovy avtorskie prava na PostgreSQL?
-   1.4) Na kakih platformah rabotaet PostgreSQL?
-   1.5) Gde mozhno vzyat' PostgreSQL?
-   1.6) Kakaya versiya naibolee svezhaya?
-   1.7) Gde poluchit' podderzhku?
-   1.8) Kak mne soobschit' ob oshibke?
-   1.9) Kak najti informaciyu ob izvestnyh oshibkah ili otsutstvuyuschih
-   vozmozhnostyah?
-   1.10) Kakaya dokumentaciya imeetsya v nalichii?
-   1.11) Kak nauchit'sya SQL?
-   1.12) Kak mne otpravit' ispravlenie ili prisoedinitsya k komande
-   razrabotchikov?
-   1.13) Kak sravnit' PostgreSQL s drugimi SUBD? Mozhet li PostgreSQL
-   byt' vstroennoj?
-   1.14) Budet li PostgreSQL rabotat' s poslednimi izmeneniyami, v raznyh
-   stranyh, kasayuschimisya dnevnogo vremeni?
-   1.15) Kak mne otpisat'sya ot spiskov rassylki PostgreSQL? Kak
-   izbezhat' polucheniya dubliruyuschihsya soobschenij?
-   
-                 Voprosy pol'zovatelej po klientskoj chasti
-                                      
-   2.1) Kakie interfejsy est' dlya PostgreSQL?
-   2.2) Kakie instrumenty suschestvuyut dlya ispol'zovaniya PostgreSQL
-   cherez Web?
-   2.3) Est' li u PostgreSQL graficheskij interfejs pol'zovatelya?
-   
-                         Voprosy administrirovaniya
-                                      
-   3.1) Kak mne ustanovit' PostgreSQL v mesto otlichnoe ot
-   /usr/local/pgsql?
-   3.2) Kak mne upravlyat' soedineniyami ot drugih komp'yuterov?
-   3.3) Kakie nastrojki mne nuzhno sdelat' dlya uluchsheniya
-   proizvoditel'nosti?
-   3.4) Kakie vozmozhnosti dlya otladki est' v nalichii?
-   3.5) Pochemu ya poluchayu soobschenie "Sorry, too many clients" kogda
-   pytayus' podklyuchit'sya k baze?
-   3.6) Kak vypolnit' obnovlenie PostgreSQL?
-   3.7) Kakoe komp'yuternoe "zhelezo" ya dolzhen ispol'zovat'?
-   
-                           Voprosy `ekspluatacii
-                                      
-   4.1) Kak vypolnit' SELECT tol'ko dlya neskol'kih pervyh strochek
-   zaprosa? Dlya proizvol'noj stroki?
-   4.2) Kak mne najti kakie tablicy, indeksy, bazy dannyh i pol'zovateli
-   suschestvuyut? Kak mne uvidet' zaprosy, kotorye ispol'zuet psql dlya
-   polucheniya `etoj informacii?
-   4.3) Kak izmenit' tip dannyh kolonki?
-   4.4) Kakovy maksimal'nye razmery dlya strok v tablice, tablic i bazy
-   dannyh?
-   4.5) Kak mnogo diskovogo prostranstva v baze dannyh nuzhno dlya
-   sohraneniya dannyh iz obychnogo tekstovogo fajla?
-   4.6) Pochemu moi zaprosy rabotayut medleno? Pochemu oni ne ispol'zuyut
-   moi indeksy?
-   4.7) Kak posmotret' na to, kak optimizator vypolnyaet moj zapros?
-   4.8) Kak mne vypolnit' poisk regulyarnogo vyrazheniya i poisk
-   nezavisimyj ot registra bukv poisk regulyarnogo vyrazheniya? Kak mne
-   ispol'zovat' indeks dlya poiska nezavisimogo ot registra bukv?
-   4.9) Kak mne opredelit', chto znachenie polya v kakom-libo zaprose
-   ravno NULL? Kak mne soedinit' vozmozhnye NULL? Mogu ya sortirovat'
-   polya NULL ili net?
-   4.10) Kakovy otlichiya mezhdu raznymi simvol'nymi tipami?
-   4.11.1) Kak mne sozdat' pole serial/s-avto-uvelicheniem?
-   4.11.2) Kak mne poluchit' znachenie pri vstavke SERIAL?
-   4.11.3) Ne mozhet li poluchit'sya tak, chto ispol'zovanie currval() i
-   nextval() privedet k zaciklirovaniyu s drugimi pol'zovatelyami?
-   4.11.4) Pochemu chisla iz moej posledovatel'nosti ne ispol'zuyutsya
-   snova pri otmene tranzakcii? Pochemu sozdayutsya razryvy pri numeracii
-   v kolonke, gde ya ispol'zuyu posledovatel'nost'/SERIAL?
-   4.12) CHto takoe OID? CHto takoe CTID?
-   4.13) Pochemu ya poluchayu oshibku "ERROR: Memory exhausted in
-   AllocSetAlloc()"?
-   4.14) Kak mne uznat', kakaya versiya PostgreSQL zapuschena?
-   4.15) Kak mne sozdat' kolonku kotoraya po umolchaniyu budet soderzhat'
-   tekuschee vremya?
-   4.16) Kak vypolnit' vneshnee svyazyvanie?
-   4.17) Kak vypolnyat' zaprosy, ispol'zuyuschie neskol'ko baz dannyh?
-   4.18) Kak mne vernut' iz funkcii neskol'ko strok tablicy?
-   4.19) Pochemu ya poluchayu oshibku "relation with OID #### ne
-   suschestvuet", kogda obraschayuts' k vremennym tablicam v funkciyah
-   PL/PgSQL?
-   4.20) Kakie est' resheniya dlya replikacii?
-   4.21) Pochemu imena tablicy i kolonok ne raspoznayutsya v v moiom
-   zaprose? Pochemu ne sohranyayutsya zaglavnye bukvy?
-     _________________________________________________________________
-   
-                              Obschie voprosy
-                                      
-  1.1) CHto takoe PostgreSQL? Kak proiznositsya `eto nazvanie? CHto takoe
-  Postgres?
-  
-   PostgreSQL proiznositsya Post-Gres-Q-L (Post-Gres-K'yu-`El). (Dlya
-   osobo lyubopytstvuyuschih kak proiznosit' "PostgreSQL", suschestvuet
-   audio-fajl).
-   
-   PostgreSQL - `eto ob"ektno-relyacionnaya sistema upravleniya bazami
-   dannyh (SUBD), kotoraya imeet tradicionnye vozmozhnosti kommercheskih
-   SUBD s rasshireniyami, kotorye est' v SUBD novogo pokoleniya.
-   PostgreSQL - `eto svobodnoe i polnost'yu otkrytoe programmnoe
-   obespechenie.
-   
-   Razrabotku PostgreSQL vypolnyaet komanda razrabotchikov, razbrosannaya
-   po vsemu miru i svyazannaya cherez Internet. Razrabotka yavlyaetsya
-   obschestvennym proektom i ne upravlyaetsya kakoj-libo kompaniej.
-   Podrobnosti smotrite v FAQ dlya razrabotchikov,
-   http://www.postgresql.org/docs/faqs.FAQ_DEV.html
-   
-   Postgres -- `eto shiroko ispol'zuemoe sokraschenie dlya PostgreSQL.
-   Pervonachal'nym imenem proekta v Berkli bylo Postgres i `etot nik
-   teper' naibolee populyaren v razgovorah o PostgreSQL po sravneniyu s
-   drugimi. Esli vam trudno polnost'yu progovarivat' 'PostgreSQL', mozhno
-   prosto govorit' 'Postgres'.
-   
-  1.2) Kto upravlyaet PostgreSQL?
-  
-   Esli vy ischite kakogo-to osobennogo cheloveka, central'nyj komitet
-   ili upravlyayuschuyu kompaniyu, to naprasno --- ih net. U nas est'
-   yadro komiteta i razrabotchikov, rabotayuschih s CVS, no `eti gruppy
-   sluzhat bol'she dlya administrativnyh celej, chem dlya upravleniya.
-   Proekt napryamuyu funkcioniruet s pomosch'yu soobschestva
-   razrabotchikov i pol'zovatelej, k kotoromu mozhet prisoedinitsya
-   kazhdyj. Vsio chto nuzhno -- `eto podpisat'sya na spiski rassylki i
-   uchastvovat' v diskussiyah. (Podrobnosti o tom kak vklyuchit'sya v
-   razrabotku PostgreSQL smotrite v FAQ dlya razrabotchikov.)
-   
-  1.3) Kakovy avtorskie prava na PostgreSQL?
-  
-   PostgreSQL rasprostranyaetsya po klassicheskoj licenzii BSD. `Eta
-   licenziya ne soderzhit ogranichenij na to, kak budet ispol'zovat'sya
-   ishodnyj kod. Nam nravitsya `eta licenziya i u nas net namerenij eio
-   menyat'. Vot `eta licenziya BSD, kotoruyu my ispol'zuem:
-   
-   Sistema Upravleniya Bazami Dannyh PostgreSQL
-   
-   Portions copyright (c) 1996-2008, PostgreSQL Global Development Group
-   Portions Copyright (c) 1994-1996 Regents of the University of
-   California
-   
-   Predostavlyayutsya prava na ispol'zovanie, kopirovanie, izmenenie i
-   rasprostranenie dannogo programmnogo obespecheniya i ego dokumentacii
-   dlya lyubyh celej, besplatno i bez podpisaniya kakogo-libo
-   soglasheniya, pri uslovii chto dlya kazhdoj kopii budut predostavleny
-   dannoe vyshe zamechanie ob avtorskih pravah, tekuschij paragraf i dva
-   sleduyuschih paragrafa.
-   
-   KALIFORNIJSKIJ UNIVERSITET NE NESET NIKAKOJ OTVETSTVENNOSTI ZA LYUBYE
-   POVREZHDENIYA, VKLYUCHAYA POTERYU DOHODA, NANESENNYE PRYAMYM ILI
-   NEPRYAMYM, SPECIAL'NYM ILI SLUCHAJNYM ISPOL'ZOVANIEM DANNOGO
-   PROGRAMMNOGO OBESPECHENIYA ILI EGO DOKUMENTACII, DAZHE ESLI
-   KALIFORNIJSKIJ UNIVERSITET BYL IZVESCHEN O VOZMOZHNOSTI TAKIH
-   POVREZHDENIJ.
-   
-   KALIFORNIJSKIJ UNIVERSITET SPECIAL'NO OTKAZYVAZYVAETSYA PREDOSTAVLYAT'
-   LYUBYE GARANTII, VKLYUCHAYA, NO NE OGRANICHIVAYAS' TOL'KO `ETIMI
-   GARANTIYAMI: NEYAVNYE GARANTII PRIGODNOSTI TOVARA ILI PRIGODNOSTI DLYA
-   OTDEL'NOJ CELI. DANNOE PROGRAMMNOE OBESPECHENIE PREDOSTAVLYAETSYA NA
-   OSNOVE PRICIPA "KAK EST'" I KALIFORNIJSKIJ UNIVERSITET NE OBYAZAN
-   PREDOSTAVLYAT' SOPROVOZHDENIE, PODDERZHKU, OBNOVLENIYA, RASSHIRENIYA
-   ILI IZMENENIYA.
-   
-  1.4) Na kakih platformah rabotaet PostgreSQL?
-  
-   Obychno, PostgreSQL mozhet rabotat' na lyuboj sovremennoj platforme
-   sovmestimoj s Unix. V instrukcii po ustanovke, vy najdete spisok teh
-   platform, na kotoryh byli provedeny testovye zapuski PostgreSQL k
-   momentu vyhoda dannoj versii.
-   
-   PostgreSQL takzhe rabotaet na operacionnyh sistemah Microsoft Windows,
-   osnovannyh na NT, takih kak Win2000 SP4, WinXP i Win2003. Paket
-   installyatora dostupen po adresu
-   http://www.postgresql.org/download/windows. Versii Windows, osnovannye
-   na MS-DOS (Win95, Win98, WinMe) mogut zapuskat' PostgreSQL s
-   pomosch'yu Cygwin.
-   
-   Takzhe suschestvuet versiya sportirovannaya pod Novell Netware 6 na
-   http://developer.novell.com/wiki/index.php/Postgresql, i versiya dlya
-   OS/2 (eComStation) na
-   http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&button=Search&key=postgre
-   SQL&stype=all&sort=type&dir=%2F.
-   
-  1.5) Gde mozhno vzyat' PostgreSQL?
-  
-   CHerez brauzer, ispol'zuya http://www.postgresql.org/ftp/ i cherez
-   ftp, ispol'zuya ftp://ftp.postgresql.org/pub/.
-   
-  1.6) Kakaya versiya naibolee svezhaya?
-  
-   Poslednij vypusk PostgreSQL - `eto versiya 8.3.3
-   
-   My planiruem vypuskat' novye starshie versii kazhdyj god, a mladshie
-   versii kazhdye neskol'ko mesyacev.
-   
-  1.7) Gde poluchit' podderzhku?
-  
-   Soobschestvo PostgreSQL predostavlyaet pomosch' mnozhestvu
-   pol'zovatelej cherez E-mail. Osnovnoj web-sajt dlya podpiski na spiski
-   rassylki po E-mail `eto: http://www.postgresql.org/community/lists/.
-   Horoshim mestom dlya togo, chtoby nachat' zadavat' voprosy
-   yavlyayutsya spiski general (obschie voprosy) ili bugs (oshibki).
-   
-   Glavnym IRC kanalom yavlyaetsya #postgreql, raspolozhennyj na servere
-   Freenode (irc.freenode.net). CHtoby podklyuchit'sya, vy mozhete
-   ispol'zovat' v Unix vyzov programmy irc -c '#postgresql' "$USER"
-   irc.freenode.net ili lyuboj drugoj IRC klient. Na `etom zhe servere
-   suschestvuyut kanaly na ispanskom (#postgresql-es), francuzskom
-   (#postgresqlfr) i brazil'skom (#postgresql-br) yazykah. Takzhe
-   suschestvuet kanal po PostgreSQL na servere EFNet.
-   
-   Spisok kommercheskoj podderzhki kompanij dostupen na
-   http://www.postgresql.org/support/professional_support.
-   
-  1.8) Kak mne soobschit' ob oshibke?
-  
-   Posetite stranichku so special'noj formoj otchiota ob oshibke v
-   PostgreSQL po adresu: http://www.postgresql.org/support/submitbug.
-   Takzhe prover'te nalichie bolee svezhej versii PostgreSQL na nashem
-   FTP sajte ftp://ftp.postgresql.org/pub/.
-   
-   Na oshibki, uvedomlenie o kotoryh byli sdelany cherez special'nuyu
-   formu ili otpravlennye v kakoj-libo spisok rassylki PostgreSQL,
-   obychno generiruetsya odin iz sleduyuschih otvetov:
-     * `Eto ne oshibka i pochemu
-     * `Eto izvestnaya oshibka i ona uzhe est' v spiske TODO
-     * Dannaya oshibka byla ispravlena v tekuschem vypuske
-     * Dannaya oshibka byla ispravlena, no ispravlenie poka ne popalo v
-       oficial'nyj vypusk
-     * Zaprashivaetsya bolee detal'naya informaciya:
-          + Operacionnaya sistema
-          + Versiya PostgreSQL
-          + Test, vosproizvodyaschij oshibku
-          + Otladochnaya informaciya
-          + Vyvod backtrace otladchika
-     * `Eto novaya oshibka. Mozhet proizojti sleduyuschee:
-          + Budet sozdano ispravlenie, kotoroe budet vklyucheno v
-            sleduyuschij vypusk
-          + Oshibka ne mozhet byt' ispravlena nemedlenno i budet
-            dobavlena v spisok TODO
-       
-  1.9) Kak najti informaciyu ob izvestnyh oshibkah ili otsutstvuyuschih
-  vozmozhnostyah?
-  
-   PostgreSQL podderzhivaet rasshirennyj podklass SQL:2003. Smotrite nash
-   spisok TODO na predmet izvestnyh oshibok, otsutstvuyuschih
-   vozmozhnostej i buduschih planov.
-   
-   Na zapros kakoj-libo vozmozhnosti obychno prihodyat sleduyuschie
-   otvety:
-     * Dannaya vozmozhnost' uzhe est' v spiske TODO
-     * Dannaya vozmozhnost' nezhelatel'na potomu chto:
-          + Ona dubliruet suschestvuyuschuyu funkcional'nost', kotoraya
-            sleduet standartu SQL
-          + Dannaya vozmozhnost' sil'no uslozhnila by kod, no dala by
-            malen'kuyu vygodu
-          + Dannaya vozmozhnost' nebezopasna ili nenadiozhna
-     * Dannaya novaya vozmozhnost' dobavlena v spisok TODO
-       
-   PostgreSQL ne ispol'zuet kakuyu-libo sistemu otslezhivaniya oshibok,
-   potomu chto my obnaruzhili, chto ispol'zovanie pryamogo obrascheniya
-   po `elektronnoj pochte i obnovlyaemogo spiska TODO yavlyaetsya bolee
-   `effektivnym. Na praktike, oshibki v programmnom obespechenii
-   sohranyayutsya ochen' nedolgo, a oshibki, kotorye vazhny bol'shomu
-   kolichestvu pol'zovatelej ispravlyayutsya momental'no. Est' tol'ko
-   odno mesto, gde mozhno najti vse izmeneniya, uluchsheniya i
-   ispravleniya, sdelannye v vypuske PostgreSQL - `eto zhurnaly
-   soobschenij sistemy kontrolya versij CVS. Dazhe zamechaniya k vypuskam
-   ne soderzhat vse izmeneniya, sdelannye v programmnom obespechenii.
-   
-  1.10) Kakaya dokumentaciya imeetsya v nalichii?
-  
-   PostgreSQL soderzhit mnogo dokumentacii, vklyuchaya bol'shoe
-   rukovodstvo, stranicy `elektronnogo rukovodstva man i nekotorye
-   malen'kie testovye primery. Smotrite v katalog /doc. Vy takzhe mozhete
-   prosmatrivat' dokumentaciyu v Internet po adresu
-   http://www.postgresql.org/docs.
-   
-   Suschestvuet dve knigi po PostgreSQL dostupnye po adresam
-   http://www.PostgreSQL.org/docs/books/awbook.html i
-   http://www.commandprompt.com/ppbook/. Est' neskol'ko knig po
-   PostgreSQL, kotorye mozhno kupit'. Odnu iz naibolee populyarnyh
-   napisal Korri Duglas (Korry Douglas). Spisok obzorov po `etim knigam
-   dostupen po adresu http://www.postgresql.org/docs/books/. Krome togo,
-   po adresu
-   http://wiki.postgresql.org/wiki/Community_Generated_Articles%2C_Guides
-   %2C_and_Documentation vy mozhete najti kollekciyu tehnicheskih statej,
-   posveschennyh PostgreSQL.
-   
-   Klient komandnoj stroki psql imeet neskol'ko komand \d dlya
-   otobrazheniya informacii po tipam, operatoram, funkciyam, agregatam i
-   t.d. - ispol'zujte \? dlya polucheniya spiska dostupnyh komand.
-   
-   Nash sajt soderzhit esche bol'she informacii.
-   
-  1.11) Kak mne nauchit'sya SQL?
-  
-   Vo-pervyh, voz'mite odnu iz knig po PostgreSQL, o kotoryh govorilos'
-   vyshe. Mnogim iz nashih pol'zovatelej takzhe nravitsya kniga The
-   Practical SQL Handbook, Bowman, Judith S., et al., Addison-Wesley.
-   Drugim nravitsya The Complete Reference SQL, Groff et al.,
-   McGraw-Hill.
-   
-   Suschestvuet takzhe mnozhestvo prekrasnyh uchebnikov dostupnyh v
-   online:
-     * http://www.intermedia.net/support/sql/sqltut.shtm,
-     * http://sqlcourse.com.
-     * http://www.w3school.com/sql/default.asp
-     * http://mysite.verizon.net/Graeme_Birchall/id1.html
-       
-  1.12) Kak mne prislat' ispravlenie ili prisoedinitsya k komande
-  razrabotchikov?
-  
-   Smotrite FAQ dlya razrabotchikov.
-   
-  1.13) Kak sravnit' PostgreSQL s drugimi SUBD? Mozhet li PostgreSQL byt'
-  vstroennym?
-  
-   Suschestvuet neskol'ko metodov sravneniya programmnogo obespecheniya:
-   vozmozhnosti, proizvoditel'nost', nadezhnost', podderzhka i cena.
-   
-   Vozmozhnosti
-          PostgreSQL imeet bol'shinstvo vozmozhnostej predstavlennyh v
-          bol'shih kommercheskih SUBD, takie kak: tranzakcii, podzaprosy,
-          triggery, predstavleniya, ssylochnoj celostnosti vtorichnogo
-          klyucha i raznye blokirovki. U nas est' nekotorye vozmozhnosti,
-          kotoryh net u nih: tipy, opredelyaemye pol'zovatelem, mehanizm
-          nasledovaniya, pravila i konkuretnoe mnogoversionnoe upravlenie
-          dlya raboty s soderzhimym blokirovok.
-          
-   Proizvoditel'nost'
-          Proizvoditel'nost' PostgreSQL shodna s drugimi kommercheskimi
-          SUBD i s SUBD s otkrytym ishodnym kodom. V kakih-to veschah my
-          bystree, v kakih-to medlennee. Nasha proizvoditel'nosti obychno
-          +/-10% po sravneniyu s drugimi SUBD.
-          
-   Nadezhnost'
-          My ponimali, chto nasha SUBD dolzhna byt' nadezhnoj ili ona
-          nichego ne budet stoit'. My staraemsya vypuskat' horosho
-          proverennyj, stabil'nyj kod, kotoryj soderzhit minimum oshibok.
-          Kazhdyj vypusk prohodit stadiyu beta-testirovaniya po krajnej
-          mere v techenii odnogo mesyaca i nasha istoriya vypuskov
-          pokazyvaet chto my mozhem predostavlyat' stabil'nye, monolitnye
-          vypuski, kotorye gotovy k produktivnomu ispol'zovaniyu. My
-          verim, chto my proizvodim proverku ne huzhe, chem u drugih
-          SUBD.
-          
-   Podderzhka
-          Nash spisok rassylki predostavlyaet vozmozhmozhnost' obscheniya
-          s bol'shoj gruppoj razrabotchikov i pol'zovatelej, kotorye
-          mogut pomoch' reshit' lyubye voznikshie problemy. V to zhe
-          vremya, my ne garantiruem kakie-libo ispravleniya, no i
-          razrabotchiki kommercheskih SUBD ne vsegda delayut
-          ispravleniya. Pryamoj dostup k razrabotchikam, soobschestvu
-          pol'zovatelej, rukovodstvam i ishodnym tekstam chasto delayut
-          podderzhku PostgreSQL prevoshodyaschej drugie SUBD.
-          Suschestvuet kommercheskaya podderzhka po rezul'tam voznikshih
-          incidentov, kotoraya dostupna dlya teh komu ona nuzhna.
-          (Smotrite Sekciyu 1.7.)
-          
-   Cena
-          Nash produkt besplaten kak dlya kommercheskogo tak, i ne dlya
-          kommercheskogo ispol'zovaniya. Vy mozhete dobavlyat' svoj kod v
-          nash produkt bez ogranichenij, za isklyucheniem teh, chto
-          opisyvayutsya v nashej licenzii stilya BSD, kotoraya privedena
-          vyshe.
-          
-   PostgreSQL razrabatyvaetsya po arhitekture klient/server, kotoraya
-   trebuet otdel'nyh processov dlya kazhdogo klienta i servera, a takzhe
-   neskol'ko vspomogatel'nyh processov. Mnogie vstraivaemye arhitektury
-   mogut sootvetstvovat' takim trebovaniyam. Odnako, esli vasha
-   vstraivaemaya arhitektura trebuet server baz dannyh dlya zapuska
-   vnutri prikladnogo processa, vy ne mozhete ispol'zovat' Postgres i vam
-   luchshe by vybrat' dlya bazy dannyh kakoe-libo drugoe oblegchennoe
-   reshenie.
-   
-  1.14) Budet li PostgreSQL rabotat' s poslednimi izmeneniyami, v raznyh
-  stranyh, kasayuschimisya dnevnogo vremeni?
-  
-   Izmeneniya v sohranenii dnevnogo vremeni v SSHA vklyucheny v
-   PostgreSQL versii 8.0.[4+] i vo vse sleduyuschie vypuski, naprimer v
-   8.1. Izmeneniya po Kanade i Zapadnoj Avstralii vklyucheny v 8.0.[10+],
-   8.1.[6+] i vse sleduyuschie vypuski. Vypuski PostgreSQL do 8.0
-   ispol'zuyut informaciyu o sohranenii dnevnogo vremeni iz bazy dannyh
-   vremennyh zon v operacionnoj sisteme.
-     _________________________________________________________________
-   
-  1.15) Kak mne otpisat'sya ot spiskov rassylki PostgreSQL? Kak izbezhat'
-  polucheniya dubliruyuschih soobschenij?
-  
-   Stranica Majordomo na sajte PostgreSQL pozvolyaet podpisat'sya ili
-   otpisat'sya ot lyubogo iz spiskov rassylki PostgreSQL. (Vam mozhet
-   ponadobitsya vash parol' dlya Majordomo, kotoryj otpravlyaetsya na
-   vash E-mail, chtoby vojti v upravlenie vashimi podpiskami.)
-   
-   Vse spiski rassylki PostgreSQL nastarivayutsya tak, chtoby gruppovoj
-   otvet uhodil na adres spiska i na adres avtora soobscheniya. Tak
-   sdelano, chtoby pol'zovateli poluchali otvety na E-mail kak mozhno
-   bystree. Esli vy ne hotite poluchat' dubliruyuschie E-mail
-   soobscheniya iz spiska, v sluchayah kogda vy uzhe poluchili `eti
-   soobscheniya napryamuyu, ustanovite flazhok eliminatecc na stranice
-   Change Settings v Majordomo. Vy takzhe mozhete izbezhat' polucheniya
-   kopij svoih soobschenij dlya samogo sebya, esli snimite flazhok
-   selfcopy.
-     _________________________________________________________________
-   
-                 Voprosy pol'zovatelej po klientskoj chasti
-                                      
-  2.1) Kakie interfejsy est' dlya PostgreSQL?
-  
-   Ustanovka PostgreSQL vklyuchaet tol'ko C i vstroennyj (embedded) C
-   interfejsy. Vse drugie interfejsy yavlyayutsya nezavisimymi proektami
-   i zagruzhayutsya otdel'no; samostoyatel'nost' proektov pozvolyaet im
-   organizovat' sobstvennoe raspisanie vypuskov novyh versij i imet'
-   sobstvennuyu komandu razrabotchikov.
-   
-   Nekotorye yazyki programmirovaniya, takie kak PHP vklyuchayut v sebya
-   interfejs k PostgreSQL. Interfejsy dlya takih yazykov kak Perl, TCL,
-   Python i mnogih drugih, dostupny na http://pgfoundry.org.
-   
-  2.2) Kakie instrumenty suschestvuyut dlya ispol'zovaniya PostgreSQL cherez
-  Web?
-  
-   Prekrasnoe vvedenie vo vzaimodejstvie baz dannyh i Web mozhno najti
-   na: http://www.webreview.com
-   
-   Dlya integracii s Web, PHP http://www.php.net yavlyaetsya neplohim
-   interfejsom.
-   
-   V slozhnyh sluchayah, mnogie pol'zuyutsya Perl i DBD::Pg s CGI.pm ili
-   mod_perl.
-   
-  2.3) Est' li u PostgreSQL graficheskij interfejs pol'zovatelya?
-  
-   Dlya PostgreSQL suschestvuet bol'shoe kolichestvo instrumentov s
-   graficheskim interfejsom kak kommercheskih, tak i otkrytyh.
-   Podrobnosti mozhno najti v Dokumentacii soobschestva dlya GUI
-   istrumentov PostgreSQL
-     _________________________________________________________________
-   
-                         Voprosy administrirovaniya
-                                      
-  3.1) Kak mne ustanovit' PostgreSQL v mesto otlichnoe ot /usr/local/pgsql?
-  
-   Zadajte opciyu --prefix kogda zapuskaete configure.
-   
-  3.2) Kak mne upravlyat' soedineniyami ot drugih komp'yuterov?
-  
-   Po umolchaniyu, PostgreSQL razreshaet tol'ko soedineniya na lokal'noj
-   mashine cherez sokety domena Unix ili TCP/IP soedineniya. Dlya togo,
-   chtoby drugie mashiny smogli podklyuchit'sya k baze vy dolzhny
-   izmenit' listen_addresses v postgresql.conf, razreshit'
-   host-avtorizaciya v fajle $PGDATA/pg_hba.conf i perestartovat' server
-   SUBD.
-   
-  3.3) Kakie nastrojki mne nuzhno sdelat' dlya uluchsheniya proizvoditel'nosti?
-  
-   Suschestvuet tri glavnyh oblasti, kotorye potencial'no mogut
-   uvelichit' proizvoditel'nost':
-   
-   Izmenenie zaprosa
-          `Eto oznachaet modifikaciyu zaprosov dlya polucheniya luchshej
-          proizvoditel'nosti:
-          
-          + Sozdanie indeksov, vklyuchaya indeksy vyrazhenij i
-            chastichnye indeksy
-          + Ispol'zovanie COPY vmesto mnozhestva INSERT
-          + Gruppirovka neskol'kih operatorov v edinuyu tranzakciyu dlya
-            umen'sheniya nagruzki pri vypolnenii zaversheniya tranzakcii
-          + Ispol'zovanie CLUSTER, kogda iz indeksa beriotsya mnozhestvo
-            strok
-          + Ispol'zovanie LIMIT dlya togo, chtoby vozvraschalas' tol'ko
-            chast' vyvoda ot zaprosa
-          + Ispol'zovanie Podgotovlennyh (Prepared) zaprosov
-          + Ispol'zovanie ANALYZE dlya obsluzhivaniya statistiki
-            optimizatora
-          + Regulyarnoe ispol'zovanie VACUUM ili pg_autovacuum
-          + Udalenie indeksov vo vremya bol'shih izmenenij dannyh
-            
-   Nastrojka servera
-          Nekotorye ustanovki v postgresql.conf vliyayut na
-          proizvoditel'nost'. Podrobnyj polnyj spisok ustanovok sm. v
-          Administration Guide/Server Run-time Environment/Run-time
-          Configuration, a kommentarii sm. v
-          http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_co
-          nf_e.html i
-          http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html.
-          
-   Vybor "zheleza" - apparatnogo obespecheniya
-          Vliyanie "zheleza" na proizvoditel'nost' podrobno opisano v
-          http://www.powerpostgresql.com/PerfList/ i
-          http://momjian.us/main/writings/pgsql/hw_performance/index.html
-          .
-          
-  3.4) Kakie vozmozhnosti dlya otladki est' v nalichii?
-  
-   Est' mnozhestvo ustanovok v nastrojkah servera, nachinayuschihsya na
-   log_* na
-   http://www.postgresql.org/docs/current/interactive/runtime-config-logg
-   ing.html, pozvolyayuschih protokolirovat' zaprosy i statistiku raboty
-   processa, kotoraya ochen' polezna dlya otladki i izmereniya
-   proizvoditel'nosti.
-   
-  3.5) Pochemu ya poluchayu soobschenie "Sorry, too many clients" kogda
-  pytayus' podklyuchit'sya k baze?
-  
-   Vy dostigli ustanovlennogo po umolchaniyu ogranicheniya v 100 sessij
-   podklyucheniya k baze dannyh. Vam neobhodimo uvelichit' limit na
-   kolichestvo konkurentnyh backend processov dlya vashego servera BD,
-   izmeniv znachenie max_connections v fajle postgresql.conf i
-   perestartovat' server BD.
-   
-  3.6) Kak vypolnit' obnovlenie PostgreSQL?
-  
-   Sm. informaciyu ob obnovlenii v
-   http://www.postgresql.org/support/versioning i special'nye instrukcii
-   v
-   http://www.postgresql.org/docs/current/static/install-upgrading.html.
-   
-  3.7) Kakoe komp'yuternoe "zhelezo" ya dolzhen ispol'zovat'?
-  
-   Poskol'ku "zhelezo" personal'nyh komp'yuterov yavlyaetsya naibolee
-   sovmestimym, lyudi sklonny verit', chto takoe "zhelezo" imeet
-   odinakovoe kachestvo. `Eto ne tak. Pamyat' ECC, SCSI i kachestvennye
-   materinskie platy yavlyayutsya bolee nadiozhnymi i imeyut bolee
-   luchshuyu proizvoditel'nost', chem menee dorogoe "zhelezo". PostgreSQL
-   budet rabotat' na lyubom "zheleze", no esli dlya vas vazhny
-   nadiozhnost' i proizvoditel'nost', to s vashej storony budet mudro
-   postavit' sootvetstvuyuschee "zhelezo". Obsudit' raznoe "zhelezo"
-   mozhno v nashih spiskah rassylki.
-     _________________________________________________________________
-   
-                           Voprosy `ekspluatacii
-                                      
-  4.1) Kak vypolnit' SELECT tol'ko dlya neskol'kih pervyh strochek zaprosa?
-  Proizvol'noj stroki?
-  
-   Dlya polucheniya tol'ko neskol'kih strok, esli vy znaete ih
-   kolichestvo na moment vypolneniya SELECT ispol'zujte LIMIT.
-   Esli est' kakoj-libo indeks, kotoryj sovpadaet s ORDER BY, to
-   vozmozhno, chto ves' zapros vypolnen i ne budet. Esli vy ne znaete
-   kolichestva neobhodimyh strok na moment vypolneniya SELECT,
-   ispol'zujte kursor i FETCH.
-   
-   To SELECT a random row, use:
-    SELECT col
-    FROM tab
-    ORDER BY random()
-    LIMIT 1;
-
-  4.2) Kak mne najti kakie tablicy, indeksy, bazy dannyh i pol'zovateli
-  suschestvuyut? Kak mne uvidet' zaprosy, kotorye ispol'zuet psql dlya
-  polucheniya `etoj informacii?
-  
-   CHtoby prosmatrivat' tablicy v psql, ispol'zujte komandu \dt. Polnyj
-   spisok komand v psql vy mozhete poluchit', ispol'zuya \?. Krome togo,
-   vy mozhete posmotret' ishodnyj kod psql v fajle
-   pgsql/src/bin/psql/describe.c. On soderzhit komandy SQL kotorye
-   generiruyutsya pri vvode v psql komand, nachinayuschihsya s obratnoj
-   kosoj cherty. Vy takzhe mozhete zapustit' psql s opciej -E tak, chtoby
-   `eta programma vydavala zaprosy, kotorye ona ispol'zuet dlya
-   vypolneniya zadannyh vami komand. PostgreSQL takzhe predostavlyaet SQL
-   sovmestimyj s INFORMATION SCHEMA interfejs, s pomosch'yu kotorogo, vy
-   mozhete sformirovat' zapros na poluchenie informacii o baze dannyh.
-   
-   Takzhe suschestvuyut sistemnye tablicy, nachinayuschiesya s pg_.
-   
-   Ispol'zujte psql -l dlya polucheniya spiska vseh baz dannyh.
-   
-   Takzhe posmotrite fajl pgsql/src/tutorial/syscat.source. On pokazyvaet
-   mnogie iz operatorov SELECT neobhodimyh dlya polucheniya informacii iz
-   sistemnyh tablic bazy dannyh.
-   
-  4.3) Kak izmenit' tip dannyh kolonki?
-  
-   V 8.0 i bolee pozdnih versiyah, izmenenie tipa kolonki vypolnyaetsya
-   ochen' legko cherez ALTER TABLE ALTER COLUMN TYPE.
-   
-   V bolee rannih versiyah sdelajte tak:
-    BEGIN;
-    ALTER TABLE tab ADD COLUMN new_col new_data_type;
-    UPDATE tab SET new_col = CAST(old_col AS new_data_type);
-    ALTER TABLE tab DROP COLUMN old_col;
-    COMMIT;
-
-  4.4) Kakovy maksimal'nye razmery dlya strok v tablice, tablic i bazy dannyh?
-  
-   Suschestvuyut sleduyuschie ogranicheniya:
-   
-   Maksimal'nyj razmer bazy? neogranichen (suschestvuyut bazy na 32 TB)
-   Maksimal'nyj razmer tablicy? 32 TB
-   Maksimal'nyj razmer stroki? 400 Gb
-   Maksimal'nyj razmer polya? 1 GB
-   Maksimal'noe kolichestvo strok v tablice? neogranicheno
-   Maksimal'noe kolichestvo kolonok v tablice? 250-1600 v zavisimosti ot
-   tipa
-   Maksimal'noe kolichestvo indeksov v tablice? neogranicheno
-   
-   Razumeetsya, ponyatie "neogranicheno" na samom dele ogranichivaetsya
-   dostupnym diskovym prostranistvom i razmerami pamyati/svoppinga. Kogda
-   znacheniya perechislennye vyshe neopravdano bol'shie, mozhet
-   postradat' proizvoditel'nost'.
-   
-   Maksimal'nyj razmer tablicy v 32 TB ne trebuet chtoby operacionnaya
-   sistema podderzhivala fajly bol'shih razmerov. Bol'shie tablicy
-   hranyatsya kak mnozhestvo fajlov razmerom v 1 GB, tak chto
-   ogranicheniya, kotorye nakladyvaet fajlovaya sistema ne vazhny.
-   
-   Maksimal'nyj razmer tablicy i maksimal'noe kolichestvo kolonok mogut
-   byt' uvelicheny v chetyre raza, esli razmer bloka po umolchaniyu budet
-   uvelichen do 32k.
-   
-   Suschestvuet ogranichenie, po kotoromu indeksy ne mogut sozdavat'sya
-   dlya kolonok dlinnee chem 2,000 simvolov. K schast'yu takie indeksy
-   vryad li dejstvitel'no komu-to nuzhny. Unikal'nost' garantiruetsya
-   nailuchim obrazom, s pomosch'yu funkcional'nogo indeksa iz h`esha MD5
-   dlinnoj kolonki, a polnotekstovoe indeksirovanie pozvolyaet iskat'
-   slova vnutri kolonki.
-   
-  4.5) Kak mnogo diskovogo prostranstva v baze dannyh nuzhno dlya sohraneniya
-  dannyh iz obychnogo tekstovogo fajla?
-  
-   SUBD PostgreSQL mozhet potrebovat'sya diskovogo prostranstva do 5 raz
-   bol'she dlya sohraneniya dannyh iz prostogo tekstovogo fajla.
-   
-   V kachestve primera, rassmotrim fajl v 100,000 strok v kazhdoj, iz
-   kotoryh celoe chislo i tekstovoe opisanie. Pri `etom dlina teksta, v
-   srednem, sostavlyaet 20 bajt. Razmer prostogo fajla sostavit 2.8 MB.
-   Razmer bazy PostgreSQL, soderzhaschej `eti zhe dannye sostavit
-   priblizitel'no 5.2 MB iz kotoryh:
-    24 bajt: na kazhdyj zagolovok stroki v tablice (priblizitel'no)
-  + 24 bajta: odno pole s celochislennym tipom i odno tekstovoe pole
-  +  4 bajta: ukazatel' na stranice dlya vsej tablichnoj stroki
-   ----------------------------------------
-    56 bajt na stroku v tablice
-
-   Razmer stranicy dannyh v PostgreSQL sostavlyaet 8192 bajt (8 KB), tak chto:
-
-   8192 bajt na stranicu
-   ---------------------   =  158 strok v tablice na stranicu BD (okruglionno)
-     52 bajt na stroku v tablice
-
-     100000 strok dannyh
-   ----------------------- =  633 stranic v BD (okruglionno)
-   158 strok v tablice na stranicu
-
-   633 stranic BD * 8192 bajt na stranicu = 5,185,536 bajt (5.2 MB)
-
-   Indeksy ne trebuyut tak mnogo, no poskol'ku oni sozdayutsya dlya
-   bol'shogo kolichestva dannyh, oni takzhe mogut byt' veliki.
-   
-   Znacheniya NULL hranyatsya kak bitovye karty i po`etomu oni zanimayut
-   ochen' malo mesta.
-   
-  4.6) Pochemu moi zaprosy rabotayut medleno? Pochemu oni ne ispol'zuyut moi
-  indeksy?
-  
-   Indeksy ne ispol'zuyutsya dlya kazhdogo zaprosa. Oni ispol'zuyutsya
-   tol'ko esli tablica bol'she minimal'nogo razmera i zapros vybiraet
-   tol'ko malen'kij procent strok v tablice. Tak ustroeno, potomu chto
-   dostup k disku s primeneniem randomizacii pri skanirovanii indeksov
-   mozhet byt' medlennee, chem prostoe chtenie tablicy ili ee
-   posledovatel'noe skanirovanie.
-   
-   CHtoby opredelit' neobhodimost' ispol'zovaniya indeksa dlya kakoj-libo
-   tablicy, PostgreSQL dolzhen imet' statistiku po `etoj tablice. `Eta
-   statistika sobiraetsya pri ispol'zovanii VACUUM ANALYZE ili prosto
-   ANALYZE. Ispol'zuya statistiku, optimizator uznaet o tom kak mnogo
-   strok v tablice i esli on dolzhen ispol'zovat' indeksy, to on mozhet
-   prinimat' luchshie resheniya. Statistika takzhe vliyaet na opredelenie
-   optimal'nogo poryadka svyazyvaniya i metoda svyazyvaniya. Pri
-   izmenenii soderzhimogo tablicy dolzhen periodicheski vypolnyatsya sbor
-   statistiki.
-   
-   Obychno indeksy ne ispol'zuyutsya dlya ORDER BY ili dlya vypolneniya
-   svyazyvanij. Posledovatel'nyj perebor sleduyuschij za yavnoj
-   sortirovkoj obychno bystree, chem poisk po indeksam v bol'shoj
-   tablice. Odnako, ORDER BY chasto kombiniruetsya s LIMIT i v `etom
-   sluchae indeks budet ispol'zovat'sya, poskol'ku pri vypolnenii budet
-   vozvraschat'sya nebol'shaya chast' tablicy.
-   
-   Esli vam kazhetsya, chto optimizator nekorrektno vybiraet
-   posledovatel'nyj perebor, ispol'zujte SET enable_seqscan TO 'off' i
-   zapustite zapros snova, chtoby uvidet', dejstvitel'no li skanirovanie
-   indeksov bystree.
-   
-   Kogda ispol'zuyutsya operacii s shablonami, naprimer LIKE ili ~,
-   indeksy mogut byt' ispol'zovany v sleduyuschih sluchayah:
-     * Nachalo stroki poiska dolzhno sovpadat' s nachalom iskomoj stroki,
-       t.e.:
-          + LIKE shablony ne dolzhny nachinat'sya s %..
-          + ~ shablony regulyarnyh vyrazhenij dolzhna nachinat'sya na ^.
-     * Stroka poiska ne dolzhna nachinat'sya s simvola klassa, t.e.
-       [a-e].
-     * Poisk nezavisimyj ot registra, takoj kak ILIKE i ~* ne ispol'zuet
-       indeksy. Vmesto nego, ispol'zujte indeksy vyrazhenij, kotorye
-       opisyvayutsya v sekcii 4.8.
-     * Vo vremya initdb dolzhna ispol'zovat'sya lokal' po umolchaniyu C,
-       potomu chto ne suschestvuet vozmozhnosti uznat' sleduyuschij
-       naibol'shij simvol dlya ne-C lokali. Vy mozhete dlya takih
-       sluchaev sozdat' special'nyj indeks text_pattern_ops kotoryj
-       rabotaet tol'ko dlya LIKE indeksirovaniya. Dlya poiska slov takzhe
-       mozhno ispol'zovat' polnotekstovyj indeks.
-       
-  4.7) Kak posmotret' na to, kak optimizator vypolnyaet moj zapros?
-  
-   Smotrite stranicu rukovodstva posvyaschennuyu EXPLAIN.
-   
-  4.8) Kak mne vypolnit' poisk regulyarnogo vyrazheniya i poisk nezavisimyj ot
-  registra bukv poisk regulyarnogo vyrazheniya? Kak mne ispol'zovat' indeks
-  dlya poiska nezavisimogo ot registra bukv?
-  
-   Operator ~ proizvodit poisk regulyarnogo vyrazheniya, a operator ~*
-   proizvodit nezavisimyj ot registra bukv poisk regulyarnogo
-   vyrazheniya. Nezavisimyj ot registra variant LIKE nazyvaetsya ILIKE.
-   
-   Nezavisimoe ot registra sravnenie obychno vyrazhaetsya tak:
-    SELECT *
-    FROM tab
-    WHERE lower(col) = 'abc';
-
-   `Eta konstrukciya ne budet ispol'zovat' standartnyj indeks. Odnako,
-   esli vy sozdadite indeks vyrazheniya, on budet ispol'zovan:
-    CREATE INDEX tabindex ON tab (lower(col));
-
-   Esli vysheukazannyj indeks sozdaiotsya kak UNIQUE, to kolonka, dlya
-   kotoroj on sozdaiotsya mozhet hranit' simvoly i v verhnem, i v nizhnem
-   registre, indes ne mozhet imet' identichnyh znachenij, kotorye
-   otlichayutsya tol'ko registrom. CHtoby v kolonke mozhno bylo hranit'
-   simvoly tol'ko v opredelionnom registre, ispol'zujte ogranichenie
-   CHECK ili proverku cherez trigger.
-   
-  4.9) Kak mne opredelit', chto znachenie polya v kakom-libo zaprose ravno
-  NULL? Kak mne soedinit' vozmozhnye NULL? Mogu ya sortirovat' polya NULL ili
-  net?
-  
-   Vy prosto sravnivaete znachenie s IS NULL i IS NOT NULL, kak zdes':
-   SELECT *
-   FROM tab
-   WHERE col IS NULL;
-
-   CHtoby soedinit' s vozmozhnymi znacheniyami NULL, ispol'zujte
-   COALESCE() kak zdes':
-   SELECT COALESCE(col1, '') || COALESCE(col2, '')
-   FROM tab
-
-   CHtoby otsortirovat' dannye po znacheniyu ispol'zujte modifikatory IS
-   NULL i IS NOT NULL v vyrazhenii ORDER BY. Kogda oni budut generirovat'
-   znacheniya istina, to pri sortirovke oni budut vyshe, chem znacheniya
-   lozh', tak chto zapisi s NULL budut v otsortirovannom spiske sverhu:
-   SELECT *
-   FROM tab
-   ORDER BY (col IS NOT NULL);
-
-  4.10) Kakovy otlichiya mezhdu raznymi simvol'nymi tipami?
-  
-   Tip Vnutrennee imya Zamechaniya
-   VARCHAR(n) varchar razmer zadaet maksimal'nuyu dlinu, net zapolneniya
-   CHAR(n) bpchar zapolnyaetsya pustotoj do fiksirovannoj dliny
-   TEXT text net zadavaemogo verhnego ogranicheniya ili dliny
-   BYTEA bytea massiv bajt peremennoj dliny (mozhno ispol'zovat'
-   null-bajt bez opaski)
-   "char" char odin simvol
-   
-   Vnutrennee imya vy mozhete uvidet', kogda smotrite sistemnye katalogi
-   i v nekotoryh soobscheniyah ob oshibkah.
-   
-   Pervye chetyre tipa yavlyayutsya "varlena" tipami (t.e., pervye
-   chetyre bajta na diske yavlyayutsya dlinnoj, za kotoroj sleduyut
-   dannye). Takim obrazom, fakticheski ispol'zuemoe prostranstvo bol'she,
-   chem oboznachennyj razmer. Odnako, dlinnye znacheniya takzhe
-   szhimayutsya, tak chto zanimaemoe diskovoe prostranstvo mozhet takzhe
-   byt' i men'she, chem ozhidalos'.
-   VARCHAR(n) - `eto luchshee reshenie, kogda nuzhno hranit' stroki
-   peremennoj dliny, ne prevyshayuschie opredelennogo razmera. TEXT -
-   `eto luchshee reshenie dlya strok neogranichennoj dliny, s maksimal'no
-   dopustimoj dlinoj v 1 gigabajt.
-   
-   CHAR(n) - `eto luchshee reshenie dlya hraneniya strok, kotorye obychno
-   imeyut odinakovuyu dlinu. CHAR(n) zapolnyaetsya pustotoj do zadannoj
-   dliny, v to vremya kak VARCHAR(n) hranit tol'ko simvoly, iz kotoryh
-   sostoit stroka. BYTEA ispol'zuetsya dlya hraneniya binarnyh dannyh,
-   znacheniya kotoryh mogut vklyuchat' NULL bajty. Vse tipy opisannye
-   zdes', imeyut shodnye harakteristiki proizvoditel'nosti.
-   
-  4.11.1) Kak mne sozdat' pole serial/s-avto-uvelicheniem?
-  
-   PostgreSQL podderzhivaet tip dannyh SERIAL. On avtomaticheski sozdaet
-   posledovatel'nost'. Naprimer:
-    CREATE TABLE person (
-        id   SERIAL,
-        name TEXT
-    );
-
-   avtomaticheski transliruetsya v:
-    CREATE SEQUENCE person_id_seq;
-    CREATE TABLE person (
-        id   INT4 NOT NULL DEFAULT nextval('person_id_seq'),
-        name TEXT
-    );
-
-   Avtomaticheski sozdannaya posledovatel'nost' imeet imya vida
-   <tablica>_<kolonka_serial>_seq, gde tablica i kolonka_serial - `eto
-   sootvetstvenno imena tablicy i kolonki s tipom SERIAL. Smotrite
-   podrobnosti o posledovatel'nostyah na stranice rukovodstva
-   posvyaschennoj create_sequence.
-   
-  4.11.2) Kak mne poluchit' znachenie pri vstavke SERIAL?
-  
-   Prostejshij sposob poluchit' naznachennoe znachenie SERIAL `eto
-   ispol'zovat' RETURNING. Ispol'zuya dlya primera tablicu v 4.11.1, `eto
-   mozhet vyglyadet' tak:
-    INSERT INTO person (name) VALUES ('Blaise Pascal') RETURNING id;
-
-   Vy takzhe mozhete vyzvat' nextval() i ispol'zovat' `eto znachenie v
-   INSERT ili vyzvat' currval() posle INSERT.
-   
-  4.11.3) Ne mozhet li poluchit'sya tak, chto ispol'zovanie currval() i
-  nextval() privedet k zaciklirovaniyu s drugimi pol'zovatelyami?
-  
-   Net. currval() vozvraschaet tekuschee znachenie, naznachennoe vashej
-   sessiej, a ne drugimi sessiyami.
-   
-  4.11.4) Pochemu chisla iz moej posledovatel'nosti ne ispol'zuyutsya snova pri
-  otmene tranzakcii? Pochemu sozdayutsya razryvy pri numeracii v kolonke, gde
-  ya ispol'zuyu posledovatel'nost'/SERIAL?
-  
-   Dlya realizacii konkuretnosti, znacheniya posledovatel'nostej, pri
-   neobhodimosti vydayutsya vo vremya zapuska tranzakcij i ne
-   blokiruyutsya do polnogo vypolneniya tranzakcij. `Eto mozhet vyzyvat'
-   razryvy v numeracii pri otmene tranzakcij.
-   
-  4.12) CHto takoe OID? CHto takoe CTID?
-  
-   Esli tablica sozdana s WITH OIDS, to kazhdaya stroka poluchaet
-   unikal'nyj indentifikator OID. OID - `eto avtomaticheski naznachaemoe
-   unikal'noe 4-h bajtovoe celoe chislo, kotoroe unikal'no dlya vsej
-   ustanovlennoj SUBD. Odnako, posle togo kak ego znachenie prevysit 4
-   milliarda, znacheniya OID nachinayut dublirovat'sya. PostgreSQL
-   ispol'zuet OID dlya svyazyvaniya svoih vnutrennih tablic.
-   
-   Dlya unikal'nogo znacheniya v strokah tablicy pol'zovatelya, luchshim
-   sposobom yavlyaetsya ispol'zovanie SERIAL vmesto OID, potomu chto
-   posledovatel'nosti SERIAL unikal'ny tol'ko vnutri tablicy i takim
-   obrazom men'she podverzheny perepolneniyu. Dlya hraneniya znachenij
-   8-mi bajtnoj posledovatel'nosti dostupen tip SERIAL8.
-   
-   CTID ispol'zuetsya dlya identifikacii special'nyh fizicheskih zapisej
-   s blochnymi i offset znacheniyami. CTID izmenyaetsya posle togo kak
-   stroki v tablice byli izmeneny ili peregruzheny.
-   
-   TID ispol'zuetsya indeksnymi zapisyami v kachestve ukazatelya na
-   fizicheskie zapisi.
-   
-  4.13) Pochemu ya poluchayu oshibku "ERROR: Memory exhausted in
-  AllocSetAlloc()"?
-  
-   Predpolozhitel'no u vas zakonchilas' virtual'naya pamyat' ili chto
-   vashe yadro imeet malen'kij limit na opredelennye resursy. Popytajtes'
-   pered zapuskom servera BD vypolnit' sleduyuschie komandy:
-    ulimit -d 262144
-    limit datasize 256m
-
-   V zavisimosti ot komandnogo interpretatora shell, tol'ko odna iz
-   dannyh komand vypolnitsya uspeshno, no ona pozvolit vam ustanovit'
-   bol'shij segment dannyh processa i vozmozhno reshit problemu. `Eta
-   komanda izmenyaet parametry tekuschego processa i vseh ego potomkov,
-   sozdannyh posle eio zapuska. Esli u vas voznikla problema s SQL
-   klientom, potomu chto backend vozvraschaet slishkom bol'shoj ob"em
-   dannyh, popytajtes' vypolnit' `etu komandu pered zapuskom klienta.
-   
-  4.14) Kak mne uznat', kakaya versiya PostgreSQL zapuschena?
-  
-   Iz psql, naberite SELECT version();
-   
-  4.15) Kak mne sozdat' kolonku kotoraya po umolchaniyu budet soderzhat'
-  tekuschee vremya?
-  
-   Ispol'zujte CURRENT_TIMESTAMP:
-CREATE TABLE test (x int, modtime TIMESTAMP DEFAULT CURRENT_TIMESTAMP );
-
-  4.16) Kak mne vypolnit' vneshnee svyazyvanie?
-  
-   PostgreSQL podderzhivaet vneshnee svyazyvanie, ispol'zuya standartnyj
-   sintaksis SQL. Vot dva primera:
-    SELECT *
-    FROM t1 LEFT OUTER JOIN t2 ON (t1.col = t2.col);
-
-   ili
-    SELECT *
-    FROM t1 LEFT OUTER JOIN t2 USING (col);
-
-   `Eto identichnye zaprosy svyazyvaniya t1.col i t2.col, takzhe
-   vozvraschayut lyubye nesvyazannye stroki v t1 (kotorye ne sovpadayut s
-   t2). RIGHT svyazyvanie dolzhno dobavit' nesvyazannye stroki t2. FULL
-   svyazyvanie dolzhno vozvratit' sovpavshie stroki plyus vse
-   nesvyazannye stroki iz t1 i t2. Slovo OUTER yavlyaetsya
-   neobyazatel'nym i naznachaetsya v LEFT, RIGHT i FULL svyazyvaniyah.
-   Obychnye svyazyvaniya nazyvayutsya INNER svyazyvaniya.
-   
-  4.17) Kak vypolnyat' zaprosy, ispol'zuyuschie neskol'ko baz dannyh?
-  
-   Ne suschestvuet sposoba sozdat' zapros k bazam dannyh otlichnym ot
-   tekuschej. Poskol'ku PostgreSQL zagruzhaet sistemnye katalogi
-   specifichnye dlya bazy dannyh, neponyatno dazhe, kak dolzhen sebya
-   vesti takoj mezhbazovyj zapros.
-   
-   contrib/dblink pozvolyaet zaprosy mezhdu bazami, ispol'zuya vyzovy
-   funkcij. Razumeetsya, klient mozhet odnovremenno takzhe ustanavlivat'
-   soedieneniya s razlichnymi bazami dannyh i takih obrazom ob"edinyat'
-   informaciyu iz nih.
-   
-  4.18) Kak mne vernut' iz funkcii neskol'ko strok tablicy?
-  
-   Vy mozhete legko ispol'zovat' funkcii, vozvraschayuschie spisok,
-   http://wiki.postgresql.org/wiki/Return_more_than_one_row_of_data_from_
-   PL/pgSQL_functions.
-   
-  4.19) Pochemu ya poluchayu oshibku "relation with OID #### ne suschestvuet",
-  kogda obraschayuts' k vremennym tablicam v funkciyah PL/PgSQL?
-  
-   V PostgreSQL do versii 8.3, PL/PgSQL k`eshiruet scenarii funkcii i
-   odin iz negativnyh `effektov `etogo sostoit v tom, chto esli funkciya
-   PL/PgSQL obraschaetsya k vremennoj tablice i `eta tablica pozdnee
-   udalyaetsya i peresozdaetsya, a funkciya zatem vyzyvaetsya snova, to
-   ee vyzov privedet k oshibke, potomu chto sk`eshirovannoe soderzhimoe
-   funkcii soderzhit ukazatel' na staruyu vremennuyu tablicu. CHtoby
-   reshit' `etu problemu, ispol'zujte EXECUTE dlya dostupa k vremennym
-   tablicam v PL/PgSQL. Ispol'zovanie `etogo operatora zastavit zapros
-   peregenerirovat'sya kazhdyj raz.
-   
-   V PostgreSQL 8.3 i pozdnee, `etoj problemy net.
-   
-  4.20) Kakie est' resheniya dlya replikacii?
-  
-   Hotya "replikaciya" -- `eto edinyj termin, est' neskol'ko raznyh
-   tehnologij dlya vypolneniya replikacij s raznymi osobennostyami dlya
-   kazhdoj.
-   
-   Replikaciya Master/slave pozvolyaet imet' odin glavnyj (master) server
-   dlya vypolneniya zaprosov chteniya/zapisi, v to vremya kak
-   podchinionnye (slave) servera mogut proizvodit' tol'ko zaprosy
-   chteniya/SELECT. Naibolee populyarnym resheniem dlya replikacii
-   master-slave v PostgreSQL yavlyaetsya Slony-I.
-   
-   Replikaciya Multi-master pozvolyaet vypolnyat' zaprosy chteniya/zapisi
-   na neskol'kih, repliciruemyh drug s drugom komp'yuetrah. `Eta
-   osobennost' takzhe privodit k potere proizvoditel'nosti, potomu chto
-   neobhodima sinhronizaciya izmenenij mezhdu neskol'kimi serverami.
-   Naibolee populyarnym resheniem dlya takoj replikacii v PostgreSQL
-   yavlyaetsya PGcluster.
-   
-  4.21) Pochemu imena tablicy i kolonok ne raspoznayutsya v v moiom zaprose?
-  Pochemu ne sohranyayutsya zaglavnye bukvy?
-  
-   Naibolee chasto imena neraspoznayutsya iz-za ispol'zovaniya dvojnyh
-   kavychek v imeni tablicy ili kolonki pri sozdanii tablicy. Pri
-   ispol'zovanii dvojnyh kavychek, imya tablicy i kolonki (kotorye
-   nazyvayut identifikatorami) sohranyayutsya v registro-zavisimom vide;
-   `eto oznachaet, chto vy dolzhny ispol'zovat' dvojnye kavychki, kogda
-   ukazyvaete `eti imena v zaprose. Nekotorye interfejsy, takie kak
-   pgAdmin, vo vremya sozdaniya tablicy dobavlyayut dvojnye kavychki
-   avtomaticheski. Takim obrazom, chtoby identifikatory raspoznavalis' vy
-   dolzhny sledovat' odnomu iz sleduyuschih pravil:
-     * Izbegat' ispol'zovaniya dvojnyh kavychek pri sozdanii tablic
-     * Ispol'zovat' v identifikatorah tol'ko simvoly nizhnego registra
-     * Ispol'zovat' dvojnye kavychki dlya identifikatorov v zaprosah
diff --git a/doc/FAQ_turkish b/doc/FAQ_turkish
deleted file mode 100644
index d1c886d2a9..0000000000
--- a/doc/FAQ_turkish
+++ /dev/null
@@ -1,1192 +0,0 @@
-
-                  PostgreSQL i�in S�k�a Sorulan Sorular (SSS)
-                                       
-   Son g�ncelleme : 15 Kas�m 2004 Pazartesi - 15:03:23
-   
-   Current maintainer: Bruce Momjian ([email protected])
-   
-   �evirenler : Devrim G�nd�z ([email protected])
-   Nicolai Tufar ([email protected])
-   Volkan YAZICI ([email protected])
-   
-   Bu belgenin en g�ncel hali,
-   http://www.PostgreSQL.org/docs/faqs/FAQ_turkish.html ve
-   http://www.gunduz.org/seminer/pg/FAQ_turkish.html adreslerinde
-   g�r�lebilir.
-   
-   Platforma �zel sorular�n�z, http://www.PostgreSQL.org/docs/index.html
-   adresinde yan�tlan�r.
-     _________________________________________________________________
-   
-                               Genel Sorular
-                                      
-   1.1) PostgreSQL nedir? Nas�l okunur?
-   1.2) PostgreSQL'in haklar� nedir?
-   1.3) PostgreSQL, hangi Unix platformlar�nda �al���r?
-   1.4) Hangi Unix olmayan uyarlamalar� bulunmaktad�r?
-   1.5) PostgreSQL'i nereden indirebilirim?
-   1.6) Deste�i nereden alabilirim?
-   1.7) En son s�r�m� nedir?
-   1.8) Hangi belgelere ula�abilirim?
-   1.9) Bilinen hatalar ya da eksik �zelliklere nereden ulasabilirim?
-   1.10) Nas�l SQL ��renebilirim?
-   1.11) PostgreSQL 2000 y�l�na uyumlu mudur?
-   1.12) Geli�tirme tak�m�na nas�l kat�labilirim??
-   1.13) Bir hata raporunu nas�l g�nderebilirim?
-   1.14) PostgreSQL, di�er VTYS(DBMS) lerle nas�l kar��la�t�r�labilir?
-   1.15) PostgreSQL'e maddi a��dan nas�l destek olabilirim?
-   
-                         Kullan�c�/istemci Sorular�
-                                      
-   2.1) PostgreSQL i�in ODBC s�r�c�leri var m�?
-   2.2) PostgreSQL'i web sayfalar�nda kullanabilmek i�in hangi ara�lar
-   bulunmaktad�r?
-   2.3) PostgreSQL'in grafik kullan�c� arabirimi var m�d�r?
-   2.4) PostgreSQL ile ileti�imi kurabilmek i�in hangi dilleri
-   kullanabilirim?
-   
-                             Y�netimsel Sorular
-                                      
-   3.1) PostgreSQL'i /usr/local/pgsql dizininden ba�ka dizinlere nas�l
-   kurabilirim?
-   3.2) Postmaster'� ba�latt���mda Bad System Call ya da core dumped
-   mesaj� al�yorum. Neden?
-   3.3) Postmaster'� ba�latt���mda, IpcMemoryCreate hatas� al�yorum.
-   Neden?
-   3.4) Postmaster'�, ba�latt���mda, IpcSemaphoreCreate hatas� al�yorum.
-   Neden?
-   3.5) Di�er bilgisayarlar�n benim PostgreSQL veritaban� sunucuma
-   ba�lant�lar�n� nas�l kontrol edebilirim?
-   3.6) Veritaban� motorunu daha iyi ba�ar�m icin nas�l ayarlayabilirim?
-   3.7) Hangi hata ay�klama �zellikleri bulunmaktad�r?
-   3.8) Ba�lanmaya �al���rken, neden "Sorry, too many clients" hatas�n�
-   al�yorum. Neden?
-   3.9) pgsql_tmpdizinin i�indeki dosyalar nelerdir?
-   3.10) PostgreSQL s�r�mlerini y�kseltmek i�in neden bir dump/reload
-   i�lemi ger�ekle�tirmek zorunday�m?
-   3.11) Nas�l bir donan�m kullanmal�y�m?br>
-   
-                             ��letimsel Sorular
-                                      
-   4.1) Binary cursor ve normal cursor aras�ndaki fark ned�r?
-   4.2) Sorgunun sadece ilk birka� sat�r�n� nas�l SELECT edebilirim?
-   4.3) psql'in i�inde g�rd�g�m tablolar�n ya da di�er �eylerin listesini
-   nas�l alabilirim?
-   4.4) Bir tablodan bir kolonu nas�l kald�rabilirim?
-   4.5) Bir sat�r, tablo ve veritaban� i�in en fazla b�y�kl�k nedir?
-   4.6) Tipik bir metin dosyas�ndaki veriyi saklamak i�in ne kadar disk
-   alan� gereklidir?
-   4.7) Veritaban�nda hangi tablo ya da index'lerin tan�mland���n� nas�l
-   g�rebilirim?
-   4.8) Sorgular�m cok yava�, ya da index'lerimi kullanm�yorlar. Neden?
-   4.9) Query-optimizer'�n sorgular�m� nas�l de�erlendirdi�ini, i�leme
-   soktu�unu nas�l g�rebilirim?
-   4.10) R-tree index nedir?
-   4.11) Genetic Query Optimizer nedir?
-   4.12) D�zenli ifade (Regular Expression) aramalar�n� ve b�y�k/k���k
-   harfe duyars�z aramalar� nas�l yapabilirim? Bu b�y�k/k���k harfe
-   duyarl� aramalar i�in index'i nas�l kullanabilirim?
-   4.13) Bir sorguda, bir alan�n NULL oldu�unu nas�l ortaya
-   ��karabilirim?
-   4.14) �esitli karakter tipleri aras�ndaki farklar nelerdir?
-   4.15.1) Nas�l serial/otomatik artan (auto-incrementing) bir alan
-   yaratabilirim?
-   4.15.2) Serial giri�inin de�erini nas�l alabilirim?
-   4.15.3) currval() ve nextval() di�er kullan�c�lara sorun yaratmaz m�?
-   4.15.4) Neden sequence say�lar�n transaction i�leminin iptalinden
-   sonra yeniden kullan�l�yor? Neden sequence/SERIAL kolonumdaki
-   say�larda atlamalar oluyor?
-   4.16) OID nedir? TID nedir?
-   4.17) PostgreSQL' de kullan�lan baz� terimlerin anlamlar� nelerdir?
-   4.18) Neden "ERROR: Memory exhausted in AllocSetAlloc()" hatas�n�
-   al�yorum?
-   4.19) Hangi PostgreSQL s�r�m�n� �al�st�rd���m� nas�l g�rebilirim?
-   4.20) Neden large-object i�lemlerim, "invalid large obj descriptor"
-   hatas�n� veriyor?
-   4.21) �u andaki zaman� �ntan�ml� de�er olarak kabul eden kolonu nas�l
-   yarat�r�m?
-   4.22) Neden IN kullanan subquery'lerim �ok yava�?
-   4.23) Outer join i�lemini nas�l yapabilirim?
-   4.24) Ayn� anda birden fazla veritaban�nda nas�l i�lem yapabilirim?
-   4.25) Bir fonksiyondan nas�l �oklu sat�r ya da kolon d�nd�rebilirim?
-   4.26) Neden Pl/PgSQL fonksiyonlar� i�inden g�venli bir �ekilde tablo
-   yaratma/kald�rma i�lemlerini yapam�yoruz?
-   4.27) Hangi �ifreleme se�enekleri bulunmaktad�r?
-   
-                    PostgreSQL �zelliklerini Geni�letmek
-                                      
-   5.1) Kullan�c�-tan�ml� bir fonksiyon yazd�m. psql'de �al��t�rd���m
-   zaman neden core dump ediyor?
-   5.2) PostgreSQL'e nas�l yeni veri tipleri/fonksiyonlar ekleyebilirim?
-   5.3) Bir tuple d�nd�rmek i�in bir C fonksiyonunu nas�l yazar�m?
-   5.4) Bir kaynak dosyas�nda de�i�iklik yapt�m. Yeniden derlememe ra�men
-   de�i�iklik ge�erli olmuyor. Neden?
-     _________________________________________________________________
-   
-                               Genel Sorular
-                                      
-    1.1) PostgreSQL nedir? Nas�l okunur?
-    
-   PostgreSQL, Post-Gres-Q-L. olarak okunur
-   
-   PostgreSQL, yeni-nesil VTYS ara�t�rma prototipi olan POSTGRES
-   veritaban� y�netim sisteminin geli�tirilmesidir. POSTGRES'in zengin
-   veri tiplerini ve g��l� veri modelini tutarken, SQL'in geli�tirilmi�
-   alt k�mesi olan PostQuel dilini kullan�r. PostgreSQL �cretsizdir ve
-   kaynak kodu a��k da��t�l�r.
-   
-   PostgreSQL, PostgreSQL geli�tirme listesine �ye olan bir Internet
-   geli�tirici tak�m� taraf�ndan geli�tirilir. �u andaki koordinat�r,
-   Marc G. Fournier ([email protected]). (Bu tak�ma nas�l
-   kat�lacag�n�z� ��renmek i�in 1.6 numaral� maddeyi okuyunuz.) Bu tak�m,
-   t�m PostgreSQL geli�iminden sorumludur.
-   
-   PostgreSQL 1.01 s�r�m�n�n yazarlar� Andrew Yu ve Jolly Chen idi.
-   Bunlar�n d���nda bir ka� kisi de uyarlama, hata ay�klama ve kodun
-   geli�tirilmesi i�in �al�sm��t�. PostgreSQL'in t�redi�i orijinal
-   Postgres kodu, lisans, lisans�st� ve akademisyenler taraf�ndan,
-   Professor Michael Stonebraker (University of California, Berkeley)
-   koordinat�rl�g�nde yaz�lm��t�r.
-   
-   Berkley'deki yaz�l�m�n ad� Postgres idi. SQL uyumlulu�u 1995'te
-   eklenince, ad� Postgres 95 oldu. 1996 y�l�n�n sonlar�nda ad�
-   PostgreSQL olarak de�i�tirildi.
-   
-    1.2) PostgreSQL'in haklar� nedir?
-    
-   PostgreSQL Data Base Management System
-   
-   Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
-   Portions Copyright (c) 1994-6 Regents of the University of California
-   
-   Permission to use, copy, modify, and distribute this software and its
-   documentation for any purpose, without fee, and without a written
-   agreement is hereby granted, provided that the above copyright notice
-   and this paragraph and the following two paragraphs appear in all
-   copies.
-   
-   IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY
-   FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
-   INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND
-   ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN
-   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   
-   THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
-   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
-   PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
-   CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
-   UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-   
-   �stteki metin klasik a��k-kod lisans� olan BSD lisans�d�r. Kaynak
-   kodun nas�l kullan�labilece�ine dair s�n�rlamalar� yoktur. Bu lisans�
-   seviyoruz. De�i�tirme niyetimiz bulunmamaktad�r.
-   
-    1.3) PostgreSQL, hangi Unix platforlar�nda �al���r?
-    
-   Genel olarak, modern bir Unix-uyumlu platform PostgreSQL'i
-   �al��t�racakt�r. Ayr�nt�l� bilgi i�in kurulum belgelerine
-   bakabilirsiniz.
-   
-    1.4) Hangi Unix olmayan uyarlamalar� bulunmaktad�r?
-    
-   PostgreSQL 8.0 s�r�m� ile , PostgreSQL art�k Win2000, WinXP ve Win2003
-   gibi Microsoft Windows NT tabanl� i�letim sistemlerinde do�al olarak
-   �al��maya ba�lam��t�r. Paketlenmi� bir kurulum program�,
-   http://pgfoundry.org/projects/pginstaller. adresinden indirilebilir.
-   
-   Ayr�ca, http://forge.novell.com adresinde Novell Netware 6 portu
-   bulunmaktad�r.
-   
-    1.5) PostgreSQL'i nereden indirebilirim?
-    
-   PostgreSQL i�in ana anonim ftp sitesi ftp://ftp.PostgreSQL.org/pub
-   adresidir. Yans�lar i�in, ana web sayfam�za bakabilirsiniz.
-   
-    1.6) Nereden destek alabilirim?
-    
-   Ana e-posta listesi : [email protected]. PostgreSQL
-   konusundaki tart��malara a��kt�r. �ye olmak i�in, a�a��daki sat�rlar�
-   e-postan�z�n body k�sm�na (konu k�sm�na de�il) yaz�p,
-   [email protected] adresine g�nderin:
-subscribe
-end
-
-   Ayn� zamanda, bir digest listesi bulunmaktad�r. Bu listeye �ye olmak
-   i�in, [email protected] adresine, body
-   k�sm�nda
-subscribe
-end
-
-   yazan bir e-posta atman�z yeterli olacakt�r.
-   
-   Digest postalar, ana liste 30k civar�nda e-postaya ula�t���nda �yelere
-   g�nderilmektedir.
-   
-   Bug'lar i�in bir e-posta listesi bulunmaktad�r. Bu listeye �ye olmak
-   i�in, [email protected] adresine, body k�sm�nda
-subscribe
-end
-
-   yazan bir e-posta atman�z yeterli olacakt�r.
-   
-   Ayn� zamanda, geli�tiriciler i�in tart��ma listesi bulunmaktad�r. Bu
-   listeye �ye olmak i�in, [email protected] adresine,
-   body k�sm�nda
-subscribe
-end
-
-   yazan bir e-posta atman�z yeterli olacakt�r.
-   
-   Bunun d���ndaki e-posta listelerine ve PostgreSQL hakk�nda bilgiye,
-   PostgreSQL WWW ana sayfas�ndan ulasabilirsiniz:
-   http://www.PostgreSQL.org
-   
-   Ayn� zamanda, EFNet �zerinde, #PostgreSQL adl� bir IRC kanal�
-   bulunmaktad�r. Bunun i�in, irc -c '#PostgreSQL' "$USER"
-   irc.phoenix.net Unix komutunu kullanabilirsiniz.
-   
-   Ticari destek veren firmalar�n listesine
-   
-   http://www.postgresql.org/users-lounge/commercial-support.html
-   
-   adresinden ula�bilirsiniz.
-   
-    1.7) En son s�r�m nedir?
-    
-   PostgreSQL'in son s�r�m� 7.4.6'd�r.
-   
-   Her 6-8 ayda ana s�r�m ��kar�lmas� planlanmaktad�r.
-   
-    1.8) Hangi belgelere ula�abilirim?
-    
-   Da��t�m�n i�inde, kitap��klar, kitap��k sayfalar� ve baz� k���k
-   �rnekler verilmektedir. /doc dizinine bak�n�z. Ayr�ca, bu el
-   kitap��klar�n� online olarak http://www.PostgreSQL.org/docs/
-   adresinden inceleyebilirsiniz.
-   
-   http://www.PostgreSQL.org/docs/awbook.html ve
-   http://www.commandprompt.com/ppbook adreslerinde PostgreSQL kitaplar�
-   bulunmaktad�r. PostgreSQL kitablar�n�n listesine,
-   http://www.ca.PostgreSQL.org/books/ adresinden ula�aiblirsiniz.
-   Ayr�ca, PostgreSQL konusundaki teknik makalelere de
-   http://techdocs.PostgreSQL.org/ adresinden ula�abilirsiniz.
-   
-   psql'in, \d ile baslayan veri tipler, operatorler, fonksiyonlar,
-   aggregate'ler, vb. ile ilgili g�zel komutlar� vard�r.
-   
-   Web sitemiz daha fazla belgeyi i�ermektedir.
-   
-    1.9) Bilinen hatalar ya da eksik �zelliklere nereden ula�abilirim?
-    
-   PostgreSQL SQL-92 uyumlulu�u i�indedir, standartlardan fazla da
-   �zellikleri bulunmaktad�r. Bilinen hatalar, eksik �zellikler ve
-   gelecek ile ilgili planlar i�in TODO listesine bak�n�z.
-   
-    1.10) Nas�l SQL ��renebilirim?
-    
-   http:/www.PostgreSQL.org/docs/awbook.html adresindeki kitap SQL
-   �gretecektir. http://www.commandprompt.com/ppbook adresinde de bir
-   baska PostgreSQL kitab� bulunmaktad�r.
-   
-   http://www.intermedia.net/support/sql/sqltut.shtm,
-   http://ourworld.compuserve.com/homepages/graeme_birchall/HTM_COOK.HTM
-   http://sqlcourse.com ve http://sqlcourse2.com adreslerinde de g�zel
-   belgeler bulunmaktad�r.
-   
-   Bir ba�kas� da, http://members.tripod.com/er4ebus/sql/index.htm
-   adresinde bulunan "Teach Yourself SQL in 21 Days, Second Edition"
-   kitab�d�r.
-   
-   Baz� kullan�c�lar�m�z da �u kitab� �nermektedirler: "The Practical SQL
-   Handbook, Bowman, Judith S., et al.,Addison-Wesley". Baz�lar� ise "The
-   Complete Reference SQL, Groff et al., McGraw-Hill" kitab�n�
-   �nermektedirler.
-   
-    1.11) PostgreSQL 2000 y�l�na uyumlu mudur?
-    
-   Evet.
-   
-    1.12) Geli�tirme tak�m�na nas�l kat�labilirim?
-    
-   �ncelikle, en son kaynak kodunu indirin ve web sitemizdeki ya da
-   da��t�m�n i�indeki PostgreSQL Developer belgesini okuyun. Ard�ndan,
-   pgsql-hackers ve pgsql-patches listelerine �ye olun. ���nc� olarak da,
-   pgsql-pacthes listesine y�ksek kalitede yamalar g�nderin.
-   
-   PostgreSQL CVS ar�ivine eri�im izni olan, 10 kadar geli�tirici
-   bulunmaktad�r. Hepsi defalarca, di�er ki�ilerin yapt���ndan �ok daha
-   y�ksek-kaliteli yamalar g�ndermi�lerdir. Ayr�ca biz de bu
-   geli�tiricilerin ekledikleri yamalar�n y�ksek kalitede oldu�una
-   g�veniyoruz.
-   
-    1.13) Bir hata raporunu nas�l g�nderebilirim?
-    
-   PostgreSQL BugTool sayfas�na gidiniz. O sayfada bir bug bildirmek i�in
-   neleri yapman�z gerekti�i anlat�lm��t�r.
-   
-   Ayr�ca, ftp://ftp.PostgreSQL.org/pub ftp adresimizde, yeni bir
-   PostgreSQL s�r�m� ya da yamas� olup olmad���ni kontrol ediniz.
-   
-    1.14) PostgreSQL, diger DBMS'lerle nas�l kar��last�r�labilir?
-    
-   Bir yaz�l�m�n g�c�n� �l�mek i�in �e�itli yollar vard�r: Yaz�l�m�n
-   �zellikleri, ba�ar�m�, g�venilirli�i, deste�i ve �creti.
-   
-   �zellikler:
-   
-   PostgreSQL mevcut b�y�k ticari veritabanlar�n�n, transaction,
-   subselect, trigger, view, foreign key referential integrity ve
-   sophisticated locking gibi (user-defined types), rules, inheritance ve
-   lock cak��malar�n� d���rmek i�in multi-version uyumluluk �zellikleri
-   bulunmaktad�r.
-   
-   Performans (Ba�ar�m):
-   
-   PostgreSQL, di�er ticari ve a��k kaynak kodlu veritabanlar�yla yak�n
-   ba�ar�m� sa�lar. Baz� a��lardan daha h�zl�d�r, di�er a��lardan da
-   yava�t�r. MySQL ya da daha zay�f veritabanlar� ile
-   kar��la�t�r�ld���nda, INSERT/UPDATE i�lemlerinde, transaction bazl�
-   �al�st���m�z i�in daha yava��z. MySQL, yukar�daki "�zellikler"
-   k�sm�nda belirtilenlerden hi� birine sahip de�ildir. Biz, ba�ar�m�m�z�
-   her s�r�mde artt�rsak da, esneklik ve geli�mi� �zellikler i�in
-   yap�lanm�� durumday�z. PostgreSQL'i MySQL ile kar��la�t�ran �u web
-   sitesine bakabilirsiniz: http://openacs.org/why-not-mysql.html
-   
-   G�venilirlik:
-   
-   DBMS'lerin g�venilir olmas� gerketi�i, yoksa de�erleri olmayaca��n�
-   d���n�yoruz. �ok iyi test edilmi�, dengeli �al�san minimum say�da hata
-   i�eren kod sunmaya �al���yoruz. Her bir s�r�m en az 1 ayl�k beta
-   testlerinden ge�irilmektedir. S�r�m ge�mi�ine bakarsan�z, �retime
-   haz�r, dengeli ve kararl� kodlar sundu�umuzu g�rebilirsiniz. Bu
-   alanda, di�er veritaban� yaz�l�mlar�na �st�nl���m�z oldu�una
-   inanmaktay�z.
-   
-   Destek:
-   
-   E-posta listemiz, olu�an herhangi bir sorunu ��zebilecek b�y�k say�da
-   kullan�c� ve geli�tirici grubunu i�erir. Sorununuz i�in, en az bir
-   ticari veritaban� kadar rahat ��z�m bulabilirsiniz. Gelistiricilere,
-   kullan�c� grubuna, belgelere ve kaynak koda direk olarak eri�ebilme,
-   PostgreSQL deste�ini, di�er DBMS'lere g�re daha �nemli k�lar.
-   Gereksinimi olanlara, ticari destek verilebilir. (Destek i�in 1.6
-   b�l�m�ne bak�n�z.)
-   
-   Fiyat:
-   
-   Ticari ve ticari olmayan t�m kullan�mlar�n�z i�in PostgreSQL
-   �cretsizdir. Kodumuzu, yukar�da belirtilen BSD-stili lisanstaki
-   s�n�rlamalar hari�, �r�n�n�z�n i�ine ekleyebilirsiniz.
-   
-    1.15) PostgreSQL'e maddi a��dan nas�l destek olabilirim?
-    
-   PostgreSQL, 1996 y�l�ndan beri 1. s�n�f altyap�ya sahiptir. Bunun
-   i�in, y�llar boyu �al���p bu altyap�y� olu�turup y�neten Marc
-   Fournier'e te�ekk�rler.
-   
-   Bir a��k kaynak kodlu proje i�in, kaliteli altyap� �ok �nemlidir. Bu
-   altyap�, projenin kesilmesini �nler ve projenin ilerlemesini
-   h�zland�r�r.
-   
-   Tabii ki bu altyap� ucuz de�ildir. ��lerin y�r�mesi i�in �e�itli y�l�k
-   ve anl�k harcamalar�m�z olmaktad�r. E�er siz ya da �irketinizin bu
-   �abam�za ba���ta bulunabilecek paras� varsa, l�tfen
-   http://store.pgsql.com/ adresine gidiniz ve ba���ta, hibede bulununuz.
-   
-   Web sayfas�n�n 'PostgreSQL Inc.' den bahsetmesine ra�men, "katk�da
-   bulunanlar" (contributors) maddesi sadece PostgreSQL projesini
-   desteklemek i�indir ve belirli bir �irketin para kayna�� de�ildir.
-   isterseniz, ba�lant� adresine bir �ek g�nderebilirsiniz.
-     _________________________________________________________________
-   
-                         Kullan�c�/�stemci Sorular�
-                                      
-    2.1) PostgreSQL icin ODBC s�r�c�leri var m�?
-    
-   iki tane ODBC s�r�c�s� bulunmaktad�r: PsqlODBC ve OpenLink ODBC.
-   
-   PsqlODBC'i
-   http://gborg.postgresql.org/project/psqlodbc/projdisplay.php
-   adresinden indirebilirsiniz.
-   
-   OpenLink ODBC http://www.openlinksw.com adresinden al�nabilir.Bu
-   s�r�c�, kendi standart ODBC istemci yaz�l�m� ile �al�st���ndan,
-   destekledikleri her platformda (Win, Mac, Unix, VMS) PostgreSQL ODBC
-   bulunmalidir.
-   
-   �cretsiz s�r�m� olmakla beraber, ticari kalitede destek almak
-   isteyenlere satmak isteyeceklerdir. Sorular�n�z� l�tfen
-   [email protected] adresine g�nderiniz.
-   
-    2.2) PostgreSQL'i web sayfalar�nda kullanabilmek i�in hangi ara�lar
-    bulunmaktad�r?
-    
-   http://www.webreview.com/ adresinde, arka planda veritaban� �al�st�ran
-   Web sayfalar� i�in giri� seviyesinde bilgi bulunmaktad�r.
-   
-   Web ile b�t�nle�me i�in, PHP () m�kemmel bir arabirim sunar.
-   
-   Karma��k sorunlar i�in, �o�u kisi Perl arabirimini ve CGI.pm ya da
-   mod_perl kullan�r.
-   
-    2.3) PostgreSQL'in grafik kullan�c� arabirimi var m�d�r?
-    
-   �e�itli grafik arabirimlerimiz bulunmaktad�r. Bunlar�n aras�nda,
-   PgAccess (http://www.pgaccess.org/), PgAdmin II
-   (http://www.pgadmin.org/, sadece Win32 i�in), RHDB Admin
-   (http://sources.redhat.com/rhdb/) ve Rekall
-   (http://www.thekompany.com/products/rekall/) bulunmaktad�r. Ayr�ca,
-   PostgreSQL i�in web tabanl� bir arabirim olan PHPPgAdmin
-   (http://phppgadmin.sourceforge.net/) bulunmaktad�r.
-   
-   Daha ayr�nt�l� liste i�in
-   http://techdocs.postgresql.org/guides/GUITools adresine
-   bakabilirsiniz.
-   
-    2.4) PostgreSQL ile ileti�imi kurabilmek i�in hangi dilleri kullanabilirim?
-    
-     * C (libpq)
-     * Embedded C (ecpg)
-     * Java (jdbc)
-     * Python (PyGreSQL)
-     * TCL (libpgtcl)
-       
-   Di�erleri i�in, http://gborg.postgresql.org adresindeki
-   Drivers/Interfaces b�l�m�ne bakabilirsiniz.
-     _________________________________________________________________
-   
-                             Y�netimsel Sorular
-                                      
-    3.1) PostgreSQL'i, /usr/local/pgsql dizininden ba�ka dizinlere nas�l
-    kurabilirim?
-    
-   configure beti�ini �al�st�r�rken, --prefix se�ene�ini veriniz.
-   
-    3.2) postmaster'i baslatt�g�mda, a Bad System Call ya da core dumped mesaj�
-    al�yorum. Neden?
-    
-   Bunun bir�ok nedeni olabilir. Ancak ilk kontrol edilmesi gereken sey,
-   �ekirdeginize System V uzant�lar�n�n kurulu olup olmad�g�n� kontrol
-   etmek olabilir. PostgreSQL shared memory ve semaphores i�in �ekirdek
-   destegine gereksinim duyar.
-   
-    3.3) postmaster'i ba�latt���mda, �pcMemoryCreate hatas� al�yorum. Neden?
-    
-   Ya �ekirde�inizde shared memory deste�iniz d�zg�nce
-   yap�land�r�lmam��t�r, ya da �ekirde�inizdeki mevcut shared memory
-   miktar�n� b�y�tmeniz gerekecektir. Gereksinim duyaca��n�z miktar,
-   mimarinize ve postmaster i�in ayarlad�g�n�z tampon ile backend i�lemi
-   say�s�na ba�l�d�r. T�m sistemler i�in, tamponlar ve i�lemlerde
-   �ntan�ml� say�larla, ~ 1MB kadar yere gereksinmeniz olacakt�r.
-   PostgreSQL 7.3.2 Sistem Y�neticileri Rehberi'ne, shared memory ve
-   semaphorelar hakk�ndaki ayr�nt�l� bilgi i�in bakabilirsiniz.
-   
-    3.4) postmaster'� ba�latt���mda, �pcSemaphoreCreate hatas� al�yorum. Neden?
-    
-   E�er hata, "�pcSemaphoreCreate: semget failed (No space left on
-   device)" ise, �ekirde�iniz yeterli semaphore ile yap�land�r�lmam��
-   demektir. Postgres, her bir potansiyel backend i�in bir semaphore
-   gereksinimi duyar. Ge�ici bir ��z�m, postmaster� backend i�lemleri
-   i�in daha az miktarda s�n�rla ba�latmak olabilir. -N'i varsay�lan
-   de�er olan 32'den k���k bir de�erle ba�lat�n�z. Daha kal�c� bir ��z�m,
-   �ekirde�inizin SEMMNS ve SEMMNI parametrelerini y�kseltmek olacakt�r.
-   
-   �al��mayan semaphore'lar a��r veritaban� i�lemlerinde ��kme
-   yaratabilirler.
-   
-   E�er hata mesaj�n�z ba�ka bir �ey ise, �ekirde�inizde semaphore
-   deste�ini yap�land�rmam�� olabilirsiniz. Shared memory ve
-   semaphore'lar hakk�ndaki daha ayr�nt�l� bilgi i�in PostgreSQL 7.3.2
-   Sistem Y�neticileri Rehberi'ne bakabilirsiniz.
-   
-    3.5) Diger bilgisayarlar�n benim PostgreSQL veritaban� sunucuma
-    ba�lant�lar�n� nas�l kontrol edebilirim?
-    
-   �n tan�ml� olarak, PostgreSQL sadece yerel makineden Unix domain
-   sockets kullanarak ba�lan�lmas�na izin verir. Diger makineler,
-   postmaster'a -i etiketini ge�irmezseniz ve $PGDATA/pg_hba.conf
-   dosyas�n� d�zenleyerek host-based authentication'a olanak vermezseniz,
-   ba�lant� yapamayacaklard�r.
-   
-    3.6) Veritabani motorunu daha iyi ba�ar�m i�in nas�l ayarlayabilirim?
-    
-   Index'ler sorgular� h�zland�rabilir. EXPLAIN komutu, PostgreSQL'in
-   sorgunuzu nas�l yorumlad���n� ve hangi index'leri kulland���n�
-   g�rmenize izin verir.
-   
-   E�er cok fazla INSERT i�lemi yap�yorsan�z, bunlar� b�y�k bir toplu
-   i�lem dosyas�kullan�p COPY komutu ile veritaban�na girmeyi deneyiniz.
-   Bu, tekil INSERT'lerden daha h�zl�d�r. �kinci olarak, BEGIN
-   WORK/COMMIT transaction blo�u i�inde olmayan ifadeler kendi
-   transaction'lar�ndaym�� gibi d���n�l�r. �oklu ifadeleri tek bir
-   transaction blo�u i�inde yapabilirsiniz. Bu, transaction overhead'ini
-   d���recektir. Tek bir transaction blo�u i�inde birden �ok ifadeyi
-   �al��t�rmay� deneyebilirsiniz. Bu da ayn� �ekilde, transaction
-   overhead'ini d���r�r.
-   
-   �e�itli ayarlama se�enekleri mevcuttur. fsync() i�lemini, postmaster'�
-   -o -F se�ene�i ile ba�latarak devre d��� b�rakabilirsiniz. Bu i�lem,
-   fsync()'lerin her transactiondan sonra diski flush etmesini
-   engelleyecektir.
-   
-   Ayn� zamanda, postmaster'i -B se�ene�i ile ba�lat�p, backend i�lemleri
-   taraf�ndan kullan�lan shared memory buffers say�lar�n�
-   artt�rabilirsiniz. E�er bu parametreyi �ok y�ksek tutarsan�z,
-   �ekirde�inizin shared memory b�lgesindeki limiti a�ma olas�l���n�z
-   y�z�nden postmaster ba�layamayabilir. Her bir tampon (buffer) 8K'd�r.
-   �ntan�ml� say� ise 64 tampondur.
-   
-   Ayn� �ekilde, backend'in -S se�ene�ini ge�ici s�ralamalar i�in backend
-   s�re�leri taraf�ndan kullan�lacak haf�zay� artt�rmak amac�yla
-   kullanabilirsiniz. -S se�ene�i kilobayt cinsinden de�er al�r ve �n
-   tan�ml� de�eri 512'dir (512 K)
-   
-   Tablolardaki veriyi bir index'e e�lemek amac�yla gruplama i�in CLUSTER
-   komutunu kullanabilirsiniz. Ayr�nt�l� bilgi i�in CLUSTER komutunun
-   yard�m sayfas�na bakabilirsiniz.
-   
-    3.7) Hangi hata ay�klama �zellikleri bulunmaktad�r?
-    
-   PostgreSQL, hata ay�klama amac�yla kullan�labilecek durum bilgisi
-   rapor eden �e�itli �zeliklere sahiptir.
-   
-   �ncelikle, configure beti�ini --enable-cassert se�ene�iyle
-   �al��t�r�rsan�z, bir �ok assert() backend cal��mas�n� g�zlemler ve
-   beklenmeyen bir durumda program� durdurur.
-   
-   Postmaster ve postgres �e�itli hata ay�klama se�eneklerine sahiptir.
-   �ncelikle, postmaster'� ba�latt���n�zda, standart ��kt�y� ve hatalar�
-   bir log dosyas�na y�nlendirdi�inize emin olun:
-cd /usr/local/pgsql
-./bin/postmaster >server.log 2>&1 &
-
-   Bu i�lem PostgreSQL ana dizinine server.log dosyas� yerle�tirecektir.
-   Bu dosya sunucunun ya�ad��� sorunlar ya da hatalar hakk�nda yararl�
-   bilgiler i�erir. -d se�ene�i, hata ay�klama seviyesini belirten bir
-   rakam ile kullan�l�r. Y�ksek hata ay�klama seviyelerinin b�y�k log
-   dosyalar� olu�turaca��n� unutmay�n�z.
-   
-   E�er postmaster �al��m�yorsa, postgres backend'ini komut sat�r�ndan
-   �al��t�rabilir ve SQL ifadenizi direk olarak yazabilirsiniz. Bu sadece
-   hata ay�klama amac�yla �nerilir. Burada, noktal� virg�l�n de�il de
-   yeni bir sat�r�n sorguyu sonland�rd���n� unutmay�n�z. E�er hata
-   ay�klama sembolleri ile derlediyseniz, ne oldu�unu g�rmek i�in bir
-   hata ay�klay�c� kullanabilirsiniz. backend postmaster'dan
-   ba�lat�lmad���ndan, e�de�er bir ortamda �al��mamaktad�r ve
-   locking/backend etkile�im sorunlar� artabilir.
-   
-   E�er postmaster �al���yorsa, bir pencerede psql'i �al��t�r�n ve psql
-   taraf�ndan kullan�lan postgres s�recinin s�re� numaras�n� (PID) bulun.
-   Postgres s�reci ile ili�kilendirmek i�in bir hata ay�klar�c� kullan�n.
-   Sorgular� psql arac�l��� ile �al��t�rabilirsiniz. E�er postgres
-   ba�lang�c�nda hata ay�klamak istiyorsan�z, PGOPTIONS="-W n" se�ene�ini
-   ayarlayabilir ve psql'i ba�latabilirsiniz. Bu i�lem, ba�lang�c�n n
-   saniye kadar gecikmesini sa�layacakt�r; b�ylece hata ay�klay�c�y�
-   s�rece ili�kilendirdikten sonra ba�lang�� s�recinin devam etmesini
-   sa�layabilirsiniz.
-   
-   postgres program� hata ay�klama ve ba�ar�m �l��mleri i�in -s, -A ve -t
-   se�eneklerine sahiptir.
-   
-    3.8) Ba�lanmaya �al���rken, neden "Sorry, too many clients" hatas�n�
-    al�yorum?
-    
-   Postmaster'�n e�zamanl� olarak ba�latabilece�i backend s�re�leri
-   s�n�rlar�n� artt�rman�z gerekmektedir.
-   
-   �n tan�ml� de�er 32 s�re�tir. Bunu, postmaster'� uygun -N de�eri ile
-   ya da postgresql.conf dosyas�n� d�zenleyerek yeniden ba�latmakla
-   artt�rabilirsiniz.
-   
-   E�er -N de�erini 32'den b�y�k yapacaksan�z, ayn� zamanda -B de�erini
-   de de�i�tirmeniz gerekti�ini unutmay�n. -B, -N'nin en az 2 kat� kadar
-   olmal�d�r; daha iyi ba�ar�m i�in bu say�y� daha da artt�rmal�s�n�z.
-   Y�ksek say�daki backend s�re�leri i�in, �e�itli �ekirdek yap�land�rma
-   parametrelerini artt�rman�z gerekecektir. Yap�lmas� gerekenler,
-   SHMMAX, SEMMNS, SEMMNI, NPROC, MAXUPRC ve a��labilecek dosyalar�n
-   maksimum say�s� olan NFILE ve NINODE de�erlerini kar��t�rmakt�r. Bunun
-   nedeni, PostgreSQL'in izin verilen backend s�re�lerinin say�s�
-   �zerinde bir s�n�r� olmas�d�r. B�ylelikle sistem kaynaklar�n�n d���na
-   ��k�lmayacakt�r.
-   
-   PostgreSQL'in 6.5 s�r�m�ne kadar, en fazla backend say�s� 64 idi ve
-   bunu de�i�tirmek i�in include/storage/sinvaladt.h dosyas� i�indeki
-   MaxBAckendid sabitini de�i�tirdek sonra yaz�l�m� yeniden derlemek
-   gerekiyordu.
-   
-    3.9) pgsql_tmp dizinin i�indeki dosyalar nelerdir?
-    
-   Sorgu �al�st�r�c� (query executer) taraf�ndan yarat�lan ge�ici
-   dosyalard�r. �rnegin, bir s�ralama ORDER BY ile yap�lacaksa ve
-   s�ralama backend'in -s parametresinin izin verdi�inden daha fazla
-   alana gereksinim duyuyorsa, ekstra veriyi tutmak i�in ge�ici dosyalar
-   yarat�l�r.
-   
-   Ge�ici dosyalar, e�er s�ralama s�ras�nda backend g��mezse otomatik
-   olarak silinecektir. E�er �al��an durumda bir backend'iniz yoksa,
-   pg_tempNNN.NN dosyalar�n� silmeniz g�venlidir.
-   
-    3.10) PostgreSQL s�r�mlerini y�kseltmek i�in neden bir dump/reload i�lemi
-    ger�ekle�tirmek zorunday�m?
-    
-   PostgreSQL tak�m� ara s�r�mlerde sadece k���k de�i�iklikler
-   yapmaktad�r; bu y�zden 7.2 s�r�m�nden 7.2.1'e y�kseltmek dump/restore
-   i�lemi gerekmemektedir. Ancak, esas s�r�mlerde (�rnek: 7.2'den 7.3'e)
-   �o�unlukla sistem tablolar�n�n ve veri dosyalar�n�n i� yap�s�
-   de�i�tirilir. Bu de�i�iklikler �o�unlukla karma��kt�r; dolay�s�yla
-   veri dosyalar�n�n geriye d�n�k uyumlulu�u i�lemlerini yapm�yoruz. Dump
-   i�lemi, veriyi genel bi�imde alaca��ndan yeniden y�kleme esnas�nda
-   veri, yeni i� bi�ime uygun �ekilde yerle�tirilecektir.
-   
-   Disk bi�iminin de�i�medi�i s�r�mlerde, pg_upgrade beti�i g�ncellemenin
-   bir dump/restore gerektirmeden yap�lmas�n� sa�layacakt�r. pg_upgrade
-   beti�inin o s�r�m i�in bulunup bulunmad���n� s�r�m notlar� i�inde
-   bulabilirsiniz.
-   
-    3.11) Nas�l bir donan�m kullanmal�y�m?
-    
-   PC donan�m� tamamen uyumlu oldu�u i�in, insanlar t�m PC donan�mlar�n�n
-   ayn� kalitede oldu�unu d���n�rler. Oysa b�yle de�ildir. ECC RAM, SCSI
-   ve kaliteli anakartlar daha ucuz donan�mlara g�re daha �ok
-   g�venilirlerdir ve ba�ar�mlar� daha y�ksektir. PostgreSQL hemen hemen
-   t�m donan�mda �al��abilmektedir, ancak g�venilirlik ve ba�ar�m �nemli
-   ise donan�m se�eneklerini �ok iyi ara�t�rmak gereklidir. E-posta
-   listelerimi donan�mlarla ilgili sorular ve de ticaret i�in
-   kullan�labilir.
-     _________________________________________________________________
-   
-                             ��letimsel Sorular
-                                      
-    4.1) Binary cursor ve normal cursor aras�ndaki fark nedir?
-    
-   DECLARE yard�m sayfas�na bak�n�z.
-   
-    4.2) Sorgunun sadece ilk birka� sat�r�n� nas�l SELECT edebilirim?
-    
-   FETCH yard�m sayfas�na bak�n�z, ya da SELECT ... LIMIT ... kullan�n�z.
-   
-   �lk birka� sat�r� almak isteseniz bile, t�m sorgu de�erlendirilmek
-   durumunda kal�nabilir. ORDER BY i�eren bir sorgu d���n�n. E�er ORDER
-   BY i�e e�le�en bir index varsa, PostgreSQL istenen ilk birka� sat�r�
-   i�leyebilir, ya da t�m sorgu istenen sat�rlar �retilene kadar
-   i�lenebilir.
-   
-    4.3) psql'in i�inde g�rd�g�m tablolar�n ya da di�er �eylerin listesini
-    nas�l alabilirim?
-    
-   pgsql/src/bin/psql/describe.c i�indeki psql kaynak kodunu
-   okuyabilirsiniz. Bu kod, psql'in \ ile ba�layan komutlar�n�n ��kt�s�n�
-   olusturan SQL komutlar�n� i�erir. Ayn� zamanda, psql'i -E se�ene�i ile
-   ba�lat�p, verdi�iniz komutlar� �al��t�rmak i�in yapt��� sorgular�n
-   ��kt�lar�n� g�rebilirsiniz.
-   
-    4.4) Bir tablodan bir kolonu nas�l kald�rabilirim?
-    
-   Bu �zellik (ALTER TABLE DROP COLUMN) 7.3 s�r�m� ile gelmi�tir. Eski
-   s�r�mlerde a�a��dakileri uygulamal�s�n�z:
-BEGIN;
-LOCK TABLE old_table;
-SELECT ...  -- select all columns but the one you want to remove
-INTO TABLE new_table
-FROM old_table;
-DROP TABLE old_table;
-ALTER TABLE new_table RENAME TO old_table;
-COMMIT;
-                
-    4.5) Bir sat�r, tablo ve veritaban� i�in en fazla b�y�kl�k nedir?
-    
-   S�n�rlar:
-   
-   Veritaban� i�in en fazla b�y�kl�k nedir?
-   S�n�rs�z (32 TB'l�k veritaban� bulunmaktad�r)
-   Bir tablo i�in en fazla b�y�kl�k nedir?
-   32 TB
-   Bir sat�r i�in en fazla b�y�kl�k nedir?
-   1.6 TB
-   Bir alan i�in en fazla b�y�kl�k nedir?
-   1 GB
-   Tabloda en fazla sat�r say�s� ka�t�r?
-   S�n�rs�z
-   Bir tabloda olabilecek en fazla kolon say�s� ka�t�r?
-   Kolon tiplerine ba�l� olarak 250-1600
-   Bir tabloda olabilecek en fazla index say�s� ka�t�r?
-   S�n�rs�z
-   
-   Tabii ki bunlar asl�nda s�n�rs�z degildir. Burada belirtilen s�n�rlar,
-   fiziksel s�n�rlar�n haricindeki s�n�rlard�r. Bo� disk alan�,
-   haf�za/takas alan� na ba�l� s�n�rlamalar vard�r. Ba�ar�m, s�n�r
-   de�erlere yakla�t�k�a, ya da de�erler �ok b�y�k oldu�unda d��ebilir.
-   
-   Bir tablo i�in b�y�kl�k s�n�r� olan 32 TB, i�letim sisteminin b�y�k
-   dosya deste�i olup olmamas�ndan ba��ms�zd�r. B�y�k tablolar, 1 GB'lik
-   dosyalarda sakland��� i�in, dosya sistemi s�n�rlar�nin bir �nemi
-   yoktur.
-   
-   Tablo ve kolon say�s� b�y�kl�kleri, �n tan�ml� blok b�y�kl��� 32k ya
-   ��kar�larak artt�r�labilir.
-   
-    4.6) Tipik bir metin dosyas�ndaki veriyi saklamak i�in ne kadar disk alan�
-    gereklidir?
-    
-   Bir PostgreSQL veritaban�, veriyi "flat" metin dosyas�nda saklamak
-   i�in gereken alan�n 5 kat fazla disk alan�na gereksinim duyabilir.
-   
-   Her sat�r�nda bir tamsay� ve metin (text) i�eren, 100.000 sat�rl�k bir
-   dosya d���n�n. Her sat�r�n ortalama 20 byte oldu�unu farzedelim. Metin
-   dosyas� 2.8 MB olacakt�r. Bu veriyi tutan PostgreSQL veritaban�
-   yakla��k 6.4 MB yer kaplayacakt�r.
-  36 byte: Her bir sat�r ba�l��� (yakla��k)
-+ 24 byte: Bir tamsay� (int) alan� ve bir metin (text) alan�
-+  4 byte: Sayfada tuple a pointer
-----------------------------------------
-  64 byte -> kay�t ba��na
-
-   PostgreSQL'de veri sayfas� (data page) b�y�kl��� 8192 byte (8k)d�r,
-   dolay�s�yla:
-8192 byte -> page ba��na
--------------------------  =  Her bir veritaban� page'� ba��na 128 sat�r (yakla��k)
-  Sat�r ba��na 64 byte
-
-100000 veri sat�r�
---------------------  =  782 veritaban� sayfas�
-     128 sat�r
-
-   782 veritaban� sayfas� * sayfa ba��na 8192 byte = 6,406,144 bytes (6.4
-   MB)
-   
-   Index'ler �ok fazla yere gereksinim duymazlar, ama index'lenmi� veriyi
-   tutacaklar�ndan b�y�k olabilirler.
-   
-   NULL de�erler bitmapler i�inde tutulur; dolay�s�yla �ok az yer
-   kaplarlar.
-   
-    4.7) Veritaban�nda hangi tablo ya da index'lerin tan�mland���n� nas�l
-    g�rebilirim?
-    
-   psql, bu t�r bilgileri g�stermek i�in, \ ile ba�layan bir �ok komut
-   sunmaktad�r. \? komutu ile bu komutlar� g�rebilirsiniz. Ayr�ca,
-   bunlar� a��klayan ve pg_ ile ba�layan �ok say�da sistem tablosu
-   bulunmaktad�r. Ayn� zamanda, psql -l ile t�m veritabanlar�n�
-   listeyelebirsiniz.
-   
-   Ayr�ca, pgsql/src/tutorial/syscat.source kodunu inceleyebilirsiniz. Bu
-   dosya, veritaban� sistem dosyalar�ndan bilgiyi almak i�in gereksinim
-   duyulan bir �ok SELECT'leri g�sterir.
-   
-    4.8) Sorgular�m cok yava�, ya da index'lerimi kullanm�yorlar. Neden?
-    
-   Indexler her sorgu taraf�ndan otomatik olarak kullan�lmazlar. Indexler
-   e�er bir tablonun b�y�kl��� minimum bir b�y�kl�kten fazla ise ve sorgu
-   tablodaki sat�rlar�n sadece k���k bir y�zdesini se�iyorsa kullan�l�r.
-   Bunun nedeni, index eri�iminin neden oldu�u raslansal disk eri�imi nin
-   diskin ya da tablonun s�ral� okunmas�ndan daha yavas olabilmesidir.
-   
-   Bir index'in kullan�l�p kullan�lmayaca��n� belirlemek i�in, PostgreSQL
-   tablo hakk�ndaki istatistiklere gereksinmesi vard�r. Bu istatistikler,
-   VACUUM ANALYZE kullan�larak toplan�rlar. Optimizer, istatistikleri
-   kullanarak, tabloda ka� sat�r oldu�unu ve bilir ve indexin kullan�l�p
-   kullan�lmayaca��na daha iyi karar verir. Istatistikler, ayn� zamanda
-   en uygun join s�ras�n� ve y�ntemini belirlemekte �ok �nemlidir.
-   �statistik toplanmas�, tablo i�erikleri de�i�tik�e periyodik olarak
-   yap�lmal�d�r.
-   
-   Indexler normalde ORDER BY sorgular� ya da join i�lemlerini
-   ger�ekle�tirmek i�in kullan�lmazlar. A��k bir s�ralamay� takip eden
-   s�ral� bir arama (sequential scan), b�y�k bir tabloda index aramas�
-   yapmaktan genelde daha h�zl�d�r.
-   Ancak, ORDER BY ile birle�mi� LIMIT genellikle bir index
-   kullanacakt�r; ��nk� tablonun sadece belirli bir miktar�
-   d�nd�r�lecektir. Asl�nda, MAX() ve MIN() fonksiyonlar�n�n index
-   kullanmamalar�ndan dolay�, bu gibi de�erleri ORDER BY ve LIMIT
-   kullanarak da almak olas�d�r:
-    SELECT col
-    FROM tab
-    ORDER BY col [ DESC ]
-    LIMIT 1;
-
-   E�er optimizer'�n s�ral� arama yapmas�n�n yanl�� oldu�una
-   inan�yorsan�z, SET enable_seqscan TO 'off' kullan�n ve index kullanan
-   aramalar�n hala daha h�zl� olup olmad���n� g�r�n.
-   
-   LIKE ya da ~ gibi operat�rler kullan�yorsan�z, index'ler sadece
-   a�a��daki ko�ullarda kullan�labilir:
-     * Arama dizininin ba��, dizinin ba�� ile ba�lanmal�d�r. Yani,
-          + LIKE sorgular� % ile ba�lamamal�d�r.
-          + D�zenli ifade sorgular� ^ i�e ba�lamamal�d�r.
-     * Arama metni bir karakter s�n�f� ile ba�layamaz. �rnek: [a-e]
-     * ILIKE ve ~* gibi b�y�k/k���k harfe duyars�z aramalar index'lerden
-       yararlanmazlar. Onun yerine, b�l�m 4.12'de anlat�lan fonksiyonel
-       index'leri kullanabilirsiniz.
-     * initdb s�ras�nda �ntan�ml� C locale'i kullan�lmal�d�r.
-       
-    4.9) query-optimizer'�n sorgular�m� nas�l de�erlendirdi�ini, i�leme
-    soktu�unu nas�l g�rebilirim?
-    
-   EXPLAIN yard�m sayfas�na bak�n�z.
-   
-    4.10) R-tree index nedir?
-    
-   R-tree index, uzaysal (spatial) verileri indexlemek i�in kullan�l�r.
-   Bir hash index, dizi aramalar�nda (range search) kullan�lamaz. B-tree
-   index dizi aramalar�nda sadece tek boyutlu �al��maktad�r. R-tree, �ok
-   boyutlu veriyi destekler. �rne�in, e�er bir R-tree index point veri
-   tipi �zerinde in�a edililebilirse, sistem "select all points within a
-   bounding rectangle" gibi sorgulara daha verimli yan�tlar verecektir.
-   
-   Orijinal R-tree tasar�m�n� a��klayan belge:
-   
-   Guttman, A. "R-trees: A Dynamic Index Structure for Spatial
-   Searching." Proceedings of the 1984 ACM SIGMOD Int'l Conf on Mgmt of
-   Data, 45-57.
-   
-   Bu belgeyi, Stonebraker'�n "Readings in Database Systems" kitab�nda
-   bulabilirsiniz.
-   
-   G�m�l� R-tree indexleri poligon ve boxlar� kullanabilir. Teorik
-   olarak, R-tree indexlerin �zelliklerini geni�letmek bir miktar �aba
-   gerektirir ve bunun nas�l yap�laca��na dair bir belgemiz hen�z
-   bulunmamaktad�r.
-   
-    4.11) Genetic Query Optimizer nedir?
-    
-   GEQO mod�l�, Genetic Algorithm(GA) kullan�larak tablolar
-   birle�tirildi�inde sorgu optimizasyonunu h�zland�r�r.
-   
-    4.12) D�zenli ifade (Regular Expression) aramalar�n� ve b�y�k/k���k harfe
-    duyars�z aramalar� nas�l yapabilirim? Bu b�y�k(k���k harfe duyarl� aramalar
-    i�in index'i nas�l kullanabilirim?
-    
-   ~ operat�r� d�zenli ifade e�le�mesi ve ~* b�y�k/k���k harfe duyars�z
-   d�zenli ifade e�le�mesi yapar. B�y�k/k���k harfe duyarl� olan LIKE'�n
-   b�y�k/k���k harfe duyars�z olan bi�imi ILIKE't�r ve PostgreSQL 7.1
-   s�r�m� ile birlikte gelmi�tir.
-   
-   B�y�k-k���k harfe duyars�z e�itlik kar��la�t�rmalar� a�a��daki gibi
-   ifade edilir:
-SELECT *
-FROM tab
-WHERE lower(col) = 'abc'
-                
-   Bu standart bir index yaratmayacakt�r. Ancak e�er fonksiyonel bir
-   index yarat�rsan�z; o kullan�lacakt�r:
-CREATE INDEX tabindex on tab (lower(col));
-
-    4.13) Bir sorguda, bir alanin "NULL" oldu�unu nas�l ortaya ��karabilirim?
-    
-   Kolonu, IS NULL ve IS NOT NULL ile test edebilirsiniz.
-   
-    4.14) �esitli karakter tipleri aras�ndaki farklar nelerdir?
-    
-Veri Tipi           �� Ad�              Not
---------------------------------------------------
-VARCHAR(n)      varchar         boyut en b�y�k uzunlu�u verir; sadece verilen kadar veri tutulur.
-CHAR(n)         bpchar          belirtilen uzunlu�a kadar sonuna  bo�luk eklenir.
-TEXT            text            uzunlukta herhangi bir �st s�n�r yoktur.
-BYTEA           bytea           variable-length byte array (null-byte safe)
-"char"          char            bir karakter
-                
-   �� adlar� (internal name) sistem kataloglar�n� ve baz� hata
-   mesajlar�n� incelerken g�receksiniz.
-   
-   �lk d�rt veri tipi "varlena" tipidir (yani, diskteki ilk 4 bayt
-   uzunluktur; devam� da veridir.) Dolay�s�yla, kullan�lan ger�ek alan,
-   belirtilen alandan biraz daha b�y�kt�r. Ancak, bu veri tipleri,
-   s�k��t�r�lmaya tabi tutulabilir; dolay�s�yla disk alan� beklenilenden
-   k���k olabilir. VARCHAR(n) b�y�kl��� artabilen ama en b�y�k uzunlu�u
-   s�n�rl� olan verileri saklamak i�in en uygun y�ntemdir. TEXT, 1 GB
-   b�y�kl��e kadar olan verileri tutmak i�in kullan�l�r.
-   
-   CHAR(n), ayn� uzunluktaki dizilerin saklanmas� i�in kullan�m�r.
-   CHAR(n) belirtilen uzunlu�a kadar bo�luk ile doldurur; ancak
-   VARCHAR(n) sadece verilen karakterleri saklar. BYTEA binary veri
-   saklamak i�indir; ayr�ca "NULL" bayt i�eren de�erleri de saklar.
-   Burada anlat�lan �� veri tipi de benzer ba�ar�m karakteristiklere
-   sahiptir.
-   
-    4.15.1) Nas�l serial/otomatik artan (auto-incrementing) bir alan
-    yaratabilirim?
-    
-   PostgreSQL'de SERIAL veri tipi vard�r. Bu veri tipi bir sequence ve
-   kolon �zerinde bir index yarat�r.
-   
-   �rnek, a�a��daki sorgu:
-CREATE TABLE person (
-    id   SERIAL,
-    name TEXT
-);
-                
-   buna �evrilir:
-CREATE SEQUENCE person_id_seq;
-CREATE TABLE person (
-    id   INT4 NOT NULL DEFAULT nextval('person_id_seq'),
-    name TEXT
-);
-CREATE UNIQUE INDEX person_id_key ON person ( id );
-                
-   Sequenceler hakk�nda daha fazla bilgi i�in create_sequence yard�m
-   sayfas�na bakabilirsiniz. Her sat�r�n OID alan�n� tekil bir say�
-   olarak alabilirsiniz. Ancak, veritaban�n�z�n dump'�n� al�p yeniden
-   y�klerseniz, OID de�erlerini koruyabilmek i�in pg_dump'�n -o
-   parametresini ya da "COPY WITH OIDS" se�ene�ini kullanman�z
-   gerekecektir.
-   
-    4.15.2) SERIAL giri�inin degerini nas�l alabilirim?
-    
-   Bir yakla��m, sequence nesnesindeki SERIAL de�erini, veriyi girmeden
-   �nce nextval() ile al�p, ald���n�z de�eri kendinizin girmesidir.
-   4.15.1'deki �rnek tabloyu kullanarak bir �rnek verelim:
-new_id = execute("SELECT nextval('person_id_seq')");
-
-    execute("INSERT INTO person (id, name) VALUES (new_id, 'Blaise Pascal')");
-
-   Di�er sorgular i�in new_id'de yeni de�erin saklanmas� gerekir.
-   Otomatik olarak yarat�lan SEQUENE nesnesinin ad�, <tablo ad�>_<serial
-   kolonu ad�>_seq �eklinde olacakt�r (< > i�aretleri olmadan).
-   
-   Alternatif olarak, atanm�� SERIAL de�erini, de�er girildikten sonra
-   currval() fonksiyonu ile alabilirsiniz:
-                execute("INSERT INTO person (name) VALUES ('Blaise Pascal')");
-                new_id = execute("SELECT currval('person_id_seq')");
-                
-   Son olarak, �n tan�ml� de�eri bulmak i�in INSERT ifadesinden d�nen OID
-   de�erini kullanabilirsiniz; ancak bu en az ta��nabilir ��z�m
-   olacakt�r. Perl'de, Edmund Mergl'in DBD:Pg m�d�l� ile birlikte DBI
-   kullanarak, OID de�eri $sth->execute() �al��t�r�ld�ktan sonra
-   $sth->(pg_oid_status) ile al�nabilir.
-   
-    4.15.3) currval() ve nextval() di�er kullan�c�lara sorun yaratmaz m�?
-    
-   Hay�r. curval(), t�m kullan�c�lar de�il, backend taraf�ndan atanan
-   ge�erli de�eri d�nd�r�r.
-   
-    4.15.4) Neden sequence say�lar� transaction i�leminin iptalinden sonra
-    yeniden kullan�l�yor? Neden sequence/SERIAL kolonumdaki say�larda atlamalar
-    oluyor?
-    
-   Uyumlulu�u artt�rmak i�in, sequence de�erleri �al��an transaction'lara
-   gerekti�i �ekilde aktar�l�r ve transaction bitene kadar o de�er
-   kilitlenmez. Bu, iptal edilen transaction i�lemleri nedeniyle
-   bo�luklara neden olur.
-   
-    4.16) OID nedir? TID nedir?
-    
-   OIDler, tekil sat�r numaralar�na PostgreSQL'in yan�t�d�r.
-   PostgreSQL'de yarat�lan her say�, tekil bir OID al�r. initdb i�lemi
-   s�ras�nda yarat�lan t�m OID'ler 16384'ten k���kt�r
-   (backend/access/transam.h). Kullan�c�lar taraf�ndan yarat�lan t�m
-   OID'ler bu say�ya e�it ya da bu say�dan b�y�kt�r. Varsay�lan durumda,
-   t�m bu OIDler sadece bir tablo ya da veritaban�nda de�il, t�m
-   PostgreSQL kurulumunda tekildir.
-   
-   PostgreSQL OIDleri, tablolar aras�nda sat�rlar� ili�kilendirmek i�in
-   kendi i� tablolar�nda kullan�r. Bu OIDler belirli kullan�c�
-   sat�rlar�n� belirtmek i�in kullanabilir ve join i�lemlerinde
-   kullan�l�r. OID de�erlerini saklamak i�in OID kolon tipini kullanman�z
-   �nerinir. Daha h�zl� bir eri�im i�in, OID alan�nda bir index
-   yaratabilirsiniz.
-   
-   OID'ler yeni sat�rlara, t�m veritabanlar� taraf�nda kullan�lan ortak
-   bir alandan atan�rlar. E�er OID'i ba�ka bir de�ere e�itlemek
-   isterseniz ya da tablonun bir kopyas�n� orijinal OIDler ile ��karmak
-   isterseniz, bu m�mk�nd�r:
-                        CREATE TABLE new_table(old_oid oid, mycol int);
-                        SELECT old_oid, mycol INTO new FROM old;
-                        COPY new TO '/tmp/pgtable';
-                        DELETE FROM new;
-                        COPY new WITH OIDS FROM '/tmp/pgtable';
-                
-   OIDler 4-bit tamsay� olarak saklan�rlar ve 4 milyarda overflow
-   olacakt�r. Kimse bu say�ya ula�t���na dair bir bilgi iletmedi ve bu
-   s�n�r� kimse bu s�n�ra ula�madan kald�raca��z.
-   
-   TIDler, belirli fiziksel sat�rlar block ve offset de�erleri ile
-   belirtmekte kullan�l�r. TIDler, sat�rlar de�i�ti�inde ya da yeniden
-   y�klendi�inde de�i�irler. Index girdileri taraf�ndan fiziksel
-   sat�rlar� g�stermek i�in kullan�l�rlar.
-   
-    4.17) PostgreSQL'de kullan�lan baz� terimlerin anlamlar� nelerdir?
-    
-   Kaynak kodun bir k�sm� ve eski belgeler, daha geni� kullan�m alan�
-   olan terimleri kullan�rlar. Bunlar�n baz�lar�:
-     * table, relation, class
-     * row, record, tuple
-     * column, field, attribute
-     * retrieve, select
-     * replace, update
-     * append, insert
-     * OID, serial value
-     * portal, cursor
-     * range variable, table name, table alias
-       
-   Genel veritaban� terimleri,
-   http://hea-www.harvard.edu/MST/simul/software/docs/pkgs/pgsql/glossary
-   /glossary.html adresinde bulunabilir.
-   
-    4.18) Neden "ERROR: Memory exhausted in AllocSetAlloc()" hatas�n� al�yorum?
-    
-   Sisteminizde sanal belle�inizi t�ketmi� olabilirsiniz, ya da
-   �ekirde�iniz belli kaynaklar icin d���k bir s�n�ra sahip olabilir.
-   postmaster'� ba�latmadan �nce a�a��dakileri deneyebilirsiniz:
-ulimit -d 262144
-limit datasize 256m
-                
-   Kabu�unuza ba�l� olarak, bunlardan sadece biri olumlu sonu�
-   verecektir, ama bu i�lem veri segment s�n�r�n�z� artt�racak, ve belki
-   de sorgunuzun tamamlanmas�n� sa�layacakt�r. Bu komut, varolan i�leme
-   (current process) ve komut �al��t�r�ld�ktan sonraki t�m alt i�lemlere
-   uygulan�r. E�er SQL istemcinizle, backend'in �ok fazla veri d�nd�rmesi
-   nedeniyle bir sorun ya��yorsan�z, bunu istemciyi ba�latmadan �nce
-   deneyiniz.
-   
-    4.19) Hangi PostgreSQL s�r�m�n� �al��t�rd���m� nas�l g�rebilirim?
-    
-   psql arabiriminde, select version(); yaz�n�z.
-   
-    4.20) Neden large-object i�lemlerim, "invalid large obj descriptor"
-    hatas�n� veriyor?
-    
-   Large object i�lemlerinizin u�lar�na, yani lo_open ... lo_close
-   komutlar�n�n �evresine, BEGIN WORK ve COMMIT koyman�z gerekmektedir;
-   
-   �u anda, PostgreSQL kurallar� large objectleri transaction commit
-   edildi�inde kapatarak uygulamaktad�r. Dolay�s�yla handle ile yap�lacak
-   ilk �ey invalid large obj descriptor hatas� ile
-   sonu�lanacakt�r.Dolay�s�yla �al��an kodunuz e�er transaction
-   kullanmazsan�z hata mesajlar� �retecektir.
-   
-   E�er ODBC gibi bir istemci arabirimi kullan�yorsan�z, auto-commit'i
-   kapatman�z gerekebilir.
-   
-    4.21) �u andaki zaman� �ntan�ml� de�er olarak kabul eden How do I create a
-    column that will default to the current time?
-    
-   Alttakini kullanabilirsiniz:
-CURRENT_TIMESTAMP:
-CREATE TABLE test (x int, modtime timestamp DEFAULT CURRENT_TIMESTAMP );
-                
-    4.22) Neden IN kullanan subquery'lerim �ok yavas?
-    
-   7.4 s�r�m�nden �nce, subqueryler. E�er subquery sadece birka� sat�r ve
-   outer query bol say�da sat�r d�nd�r�yorsa, IN en h�zl�s�d�r. Sorgular�
-   h�zland�rmak i�in IN yerine EXISTS kullan�n:
-SELECT *
-    FROM tab
-    WHERE col1 IN (SELECT col2 FROM TAB2)
-                
-   sorgusunu, a�a��daki ile de�i�tirin:
-SELECT *
-    FROM tab
-    WHERE EXISTS (SELECT col2 FROM TAB2 WHERE col1 = col2)
-                
-   Bu i�lemin h�zl� olmas� i�in, subcol'un indexlenmi� bir kolon olmas�
-   gerekmektedir.
-   
-   7.4 s�r�m� ve sonras�nda, IN asl�nda normal sorgularla ayn� karma��k
-   join tekniklerini kullan�r ve EXISTS'e tercih edilir.
-   
-    4.23) Outer join i�lemini nas�l yapabilirim?
-    
-   PostgreSQL outer joins islemlerini SQL standartlar�n� kullanarak
-   ger�ekle�tirmektedir. A�a��da 2 �rnek bulunmaktad�r:
-SELECT *
-FROM t1 LEFT OUTER JOIN t2 ON (t1.col = t2.col);
-                
-   ya da
-SELECT *
-FROM t1 LEFT OUTER JOIN t2 ON (t1.col = t2.col);
-                
-   Bu �zde� sorgular t1.col' i t2.col'ye join ederler ve ayn� zamanda
-   t1'deki unjoined sat�rlar� (t2'de e�lenmemi� olanlarla) d�nd�r�rler.
-   RIGHT JOIN t2'nin unjoined sat�rlar�n� ekleyecektir. Bir FULL join,
-   e�le�mi� b�t�n sat�rlar� ve t1 ile t2'den t�m ba�lanmam�� (unjoined)
-   sat�rlar� al�r. OUTER s�zc��� se�imseldir ve LEFT, RIGHT ve FULL join
-   i�lemlerinde oldu�u kabul edilir. S�radan join i�lemleri INNER JOIN
-   olarak adland�r�l�r.
-   
-   �nceki s�r�mlerde, OUTER JOINler UNION ve NOT IN kullan�larak sim�le
-   edilebiliyordu. �rne�in, tab1 ve tab2'yi birle�tirirken, a�a��daki
-   sorgu iki tablonun d��tan ba�lanmas�n� sa�lar:
-SELECT tab1.col1, tab2.col2
-FROM tab1, tab2
-WHERE tab1.col1 = tab2.col1
-UNION ALL
-SELECT tab1.col1, NULL
-FROM tab1
-WHERE tab1.col1 NOT IN (SELECT tab2.col1 FROM tab2)
-ORDER BY col1
-                
-    4.24) Ayn� andan birden fazla veritaban�nda nas�l i�lem yapabilirim?
-    
-   Mevcut veritaban�n�z d���ndaki ba�ka bir veritaban�n�z� sorgulaman�z�n
-   bir yolu bulunmamaktad�r. Bunun nedeni, PostgreSQL'in veritaban�na
-   �zel sistem kataloglar� y�klemesidir. Bu nedenle, cross-database bir
-   sorgunun nas�l davranaca��n� kestirmek zordur.
-   
-   contrib/dblink fonksiyon �a�r�lar�n� kullanarak cross-database
-   sorgulara izin verir. Tabii ki, bir istemci de�i�ik veritabanlar�na
-   ayn� anda eri�im sa�layabilir ve bilgiyi bu �ekilde birle�tirebilir.
-   
-    4.25) Bir fonksiyondan nas�l �oklu sat�r ya da kolon d�nd�rebilirim?
-    
-   7.3 s�r�m�nde, bir fonksiyondan kolayl�kla �oklu sat�r ya da s�tun
-   d�nd�rebilirsiniz.
-   (http://techdocs.postgresql.org/guides/SetReturningFunctions)
-   
-    4.26) Neden Pl/PgSQL fonksiyonlar� i�inden g�venli bir �ekilde tablo
-    yaratma/kald�rma i�lemlerini yapam�yoruz?
-    
-   PL/PgSQL fonksiyon i�erikleri cache'ler. Bunun istenmeyen bir taraf�,
-   e�er bir PL/PgSQL fonksiyonu ge�ici bir tabloya eri�iyorsa ve bu tablo
-   ileride kald�r�l�p yeniden olu�turulduktan sonra fonksiyon yeniden
-   �a�r�l�rsa, fonksiyon �al��mayacakt�r; ��nk� cache'lenmi� fonksiyon
-   hala eski ge�ici tabloyu g�steriyor olacakt�r. ��z�m, ge�ici tablo
-   eri�imleri i�in PL/PgSQL'de EXECUTE kullanmakt�r. Bu, sorgunun her
-   seferinde yeniden i�lenmesini sa�layacakt�r.
-   
-    4.27) 4.28) Hangi �ifreleme se�enekleri bulunmaktad�r?
-    
-     * contrib/pgcrypto SQL sorgular�nda kullan�labilmesi i�in �ifreleme
-       fonksiyonlar� i�ermektedir.
-     * �stemciden sunucuya ileti�imi �ifrelemek i�in, sunucuda ssl
-       se�ene�i postgresql.conf i�inde a��k olmal�d�r. Ayr�ca,pg_hba.conf
-       dosyas� i�inde host ya da hostssl kayd� mutlaka olmal�d�r ve
-       istemci sslmode kapat�lmamal�d�r. (Ayn� zamanda,PostgreSQL'in
-       do�al SSL ba�lant�lar� d���nda ssh ya da ssl gibi 3.parti
-       �ifrelenmi� veri iletimi de m�mk�nd�r.)
-     * Veritaban� kullan�c� ad� ve �ifreleri 7.3 s�r�m� ile birlikte
-       otomatik olarak �ifrelenirler. �nceki s�r�mlerde, postgresql.conf
-       i�indeki PASSWORD_ENCRYPTION se�ene�ini aktif hale getirmeniz
-       gerekmektedir.
-     * Sunucunun kendisini �ifreli dosya sistemi �zerinde
-       �al��t�rabilirsiniz.
-     _________________________________________________________________
-   
-                    PostgreSQL �zelliklerini Geni�letmek
-                                      
-    5.1) Kullan�c�-tan�ml� bir fonksiyon yazd�m. psql'de �al��t�rd���m zaman
-    neden core dump ediyor?
-    
-   Sorunun nedeni birden fazla �ey olabilir. Kullan�c�-tan�ml�
-   fonksiyonunuzu stand-alone bir programda �al��t�rmay� deneyiniz.
-   
-    5.2) PostgreSQL'e nas�l yeni tipler/fonksiyonlar ekleyebilirim?
-    
-   �al��malar�n�z� pgsql-hackers e-posta listesine g�nderiniz. Kodunuz
-   incelendikten sonra contrib dizinine konacakt�r.
-   
-    5.3) Bir tuple dond�rmek icin bir C fonksiyonunu nasil yazar�m?
-    
-   PostgreSQL 7.3 s�r�m� ile birlikte, C, PL/PgSQL ve SQL kullan�larak
-   tablo-d�nd�ren fonksiyonlar tamamen desteklenmektedir. Ayr�nt�l� bilgi
-   i�in PostgreSQL 7.3.2 Kullan�c� Rehberi'ne bakabilrisiniz. Bir �rne�i
-   contrib/tablefunc i�inde bulabilirsiniz.
-   
-    5.4) Bir kaynak dosyas�nda de�i�iklik yapt�m. Yeniden derlememe ra�men
-    de�i�iklik ge�erli olmuyor. Neden?
-    
-   Makefile'lar include dosyalar� i�in tam bir ba��ml�l�k i�ermezler.
-   �ncelikle make clean, ard�ndan da baska bir make i�lemi yapman�z
-   gerekir. GCC kullan�yorsan�z, configure beti�inin --enable-depend
-   se�ene�ini, derleyicinin ba��ml�l�klar� otomatik olarak hesaplamas�
-   i�in kullanabilirsiniz.
diff --git a/doc/Makefile b/doc/Makefile
index 247b04752c..32ef320b4d 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,108 +1,16 @@
 #----------------------------------------------------------------------------
 #
-# PostgreSQL documentation installation makefile
+# PostgreSQL documentation top-level makefile
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/doc/Makefile,v 1.37 2009/06/27 21:06:46 tgl Exp $
+# $PostgreSQL: pgsql/doc/Makefile,v 1.39 2009/08/09 22:47:59 petere Exp $
 #
 #----------------------------------------------------------------------------
 
-# This makefile is responsible for installing the documentation. The
-# files to be installed are prepared specially and are placed in this
-# directory during distribution bundling. In CVS-based trees these
-# files don't exist, so we skip the installation in that case.
-#
-# Before we install the man pages, we massage the section numbers to
-# follow the local conventions.
-#
-# To actually build the documenation, look into the src/ and src/sgml
-# subdirectories.
-
 subdir = doc
 top_builddir = ..
 include $(top_builddir)/src/Makefile.global
 
-.NOTPARALLEL:
-
-ifneq ($(wildcard $(srcdir)/postgres.tar.gz),)
-found_html = yes
-endif
-
-ifneq ($(wildcard $(srcdir)/man.tar.gz),)
-# SCO OpenServer's man system is sufficiently different to not bother.
-ifneq ($(PORTNAME), sco)
-found_man = yes
-endif
-endif
-
-
-ifdef found_man
-ifndef sqlmansect
-sqlmansect = 7
-endif
-sqlmansectnum = $(shell expr X'$(sqlmansect)' : X'\([0-9]\)')
-
-fix_sqlmansectnum = sed -e '/^\.TH/s/"7"/"$(sqlmansect)"/' \
-			-e 's/\\fR(7)/\\fR($(sqlmansectnum))/g' \
-			-e '1s/^\.so man7/.so man$(sqlmansectnum)/g;1s/^\(\.so.*\)\.7$$/\1.$(sqlmansect)/g'
-
-all: man1/.timestamp man$(sqlmansectnum)/.timestamp
-
-man1/.timestamp: man7/.timestamp
-	@echo timestamp >$@
-
-man7/.timestamp: man.tar.gz
-	gzip -d -c $< | $(TAR) xf -
-ifneq ($(sqlmansectnum),7)
-	for file in man1/*.1; do \
-	  mv $$file $$file.bak && \
-	  $(fix_sqlmansectnum) $$file.bak >$$file && \
-	  rm -f $$file.bak || exit; \
-	done
-endif
-	@echo timestamp >$@
-
-ifneq ($(sqlmansectnum),7)
-man$(sqlmansectnum)/.timestamp: man7/.timestamp
-	$(mkinstalldirs) man$(sqlmansectnum)
-	for file in man7/*.7; do \
-	  $(fix_sqlmansectnum) $$file >man$(sqlmansectnum)/`basename $$file | sed 's/.7$$/.$(sqlmansect)/'` || exit; \
-	done
-	@echo timestamp >$@
-endif
-endif # found_man
-
-
-install: all installdirs
-ifdef found_html
-	gzip -d -c $(srcdir)/postgres.tar.gz | ( cd $(DESTDIR)$(htmldir)/html && $(TAR) xf - )
-endif
-ifdef found_man
-	for file in man1/*.1 man$(sqlmansectnum)/*.$(sqlmansect) ; do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/$$file || exit; \
-	done
-endif
-
-
-installdirs:
-ifdef found_html
-	$(mkinstalldirs) '$(DESTDIR)$(htmldir)'/html
-endif
-ifdef found_man
-	$(mkinstalldirs) $(addprefix '$(DESTDIR)$(mandir)'/man, 1 $(sqlmansectnum))
-endif
-
-
-uninstall:
-ifdef found_html
-	rm -f $(addprefix $(DESTDIR)$(htmldir)/html/, $(shell gunzip -c $(srcdir)/postgres.tar.gz | $(TAR) tf -))
-endif
-ifdef found_man
-	rm -f $(filter-out %/, $(addprefix $(DESTDIR)$(mandir)/, $(shell gunzip -c $(srcdir)/man.tar.gz | $(TAR) tf - | sed -e 's,man7/,man$(sqlmansectnum)/,' -e 's/.7$$/.$(sqlmansect)/')))
-endif
-
-
-clean distclean maintainer-clean:
-	rm -rf man1/ man7/ man$(sqlmansectnum)/
+all distprep html man install installdirs uninstall clean distclean maintainer-clean:
 	$(MAKE) -C src $@
diff --git a/doc/bug.template b/doc/bug.template
index ebca416801..d666433bef 100644
--- a/doc/bug.template
+++ b/doc/bug.template
@@ -27,7 +27,7 @@ System Configuration:
 
   Operating System (example: Linux 2.4.18)	:
 
-  PostgreSQL version (example: PostgreSQL 8.4.0):  PostgreSQL 8.4.0
+  PostgreSQL version (example: PostgreSQL 9.0beta3):  PostgreSQL 9.0beta3
 
   Compiler used (example: gcc 3.3.5)		:
 
diff --git a/doc/src/FAQ/FAQ_MINGW.html b/doc/src/FAQ/FAQ_MINGW.html
deleted file mode 100644
index 159553873a..0000000000
--- a/doc/src/FAQ/FAQ_MINGW.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta http-equiv="content-type"
- content="text/html; charset=ISO-8859-1">
-  <title>PostgreSQL Native Win32 Status Report</title>
-</head>
-<body>
-<h1 style="text-align: center;">Compiling PostgreSQL On Native Win32 FAQ<br>
-</h1>
-<P>Last updated: Thu Oct 14 18:22:57 EDT 2004</P>
-<P>Current maintainer: Bruce Momjian &lt;<A href=
-"mailto:[email protected]">[email protected]</A>&gt;<BR>
-</P>
-
-<P>The most recent version of this document can be viewed at <A href=
-"http://www.postgresql.org/docs/faqs.FAQ_MINGW.html">
-http://www.postgresql.org/docs/faqs.FAQ_MINGW.html</A>.</P>
-
-<P>The FAQ Running & Installing PostgreSQL On Native Windows is at <A href=
-"http://pginstaller.projects.postgresql.org/faq/FAQ_windows.html">
-http://pginstaller.projects.postgresql.org/faq/FAQ_windows.html</A>.</P>
-
-<p>The native Win32 port is built from source using MinGW tools.&nbsp;
-There is also a precompiled binary installer called <span
- style="font-style: italic;">pginstaller</span> which you can find at
-from <a href="http://pgfoundry.org/projects/pginstaller">http://pgfoundry.org/projects/pginstaller</a>.&nbsp;
-It is a fully native build and uses no additional software like MinGW.
-The ready-made installer files are available on the main PostgreSQL ftp servers
-in the binary/win32 directory.
-<br>
-</p>
-<h2>Tools for Building Binaries<br>
-</h2>
-<p> The native Win32 port requires a 32-bit NT-based Microsoft
-operating
-system, like Windows NT 4, Windows 2000/2003, or Windows XP. (NT 4
-is no longer supported since version 8.2)&nbsp; Earlier
-operating systems do not have sufficient infrastructure. Building the
-port also
-requires MinGW and Msys, which can be downloaded from <a
- href="http://www.mingw.org/">http://www.mingw.org/</a>. MinGW is
-a Unix-like build environment for Microsoft operating systems.
-Msys is a collection of unix tools required to run shell scripts like <i>configure.&nbsp;
-</i>Neither is required to run the resulting binaries;&nbsp; they are
-needed only for creating the binaries.&nbsp; Work is in progress to support
-building using Visual C++ in a future version.<br>
-</p>
-<h2>Steps For Building Binaries<br>
-</h2>
-<ul>
-  <li>Download the nightly snapshot tarball from <a
- href="ftp://ftp.postgresql.org/pub/dev">ftp://ftp.postgresql.org/pub/dev</a>
-or checkout via CVS (you will need <i>bison, flex,</i> and <i>perl</i>
-installed to build from CVS)<br>
-  </li>
-  <li>Run <i>configure</i> (you might need to add the --without-zlib
-argument, depending on whether you have installed <span
- style="font-style: italic;">zlib
-    </span>on MinGW)</li>
-  <li>Run <i>make install</i></li>
-</ul>
-Note:&nbsp; it is suggested that you run <i>psql</i> under <i>CMD.EXE.</i>,
-as the Msys console has buffering issues.<br>
-<br>
-If you make a change that you want to contribute, make a context diff
-and send
-it to the mailing list. <br>
-<h2>Resources</h2>
-There are several resources that helped us complete this port:<br>
-<ul>
-  <li>PeerDirect port of PostgreSQL 7.2 to Win32 (<a
- href="ftp://momjian.postgresql.org/pub/postgresql/win32/PeerDirect">ftp://momjian.postgresql.org/pub/postgresql/win32/PeerDirect</a>)</li>
-  <li>CONNX Win32 signal code(<a
- href="ftp://momjian.postgresql.org/pub/postgresql/win32/CONNX">ftp://momjian.postgresql.org/pub/postgresql/win32/CONNX</a>)</li>
-  <li>SRA port of PostgreSQL to Win32 (unfortunately, this is not
-publically available because the threaded portion is proprietary)</li>
-  <li>CHM help files (<a
- href="http://www.pgadmin.org/snapshots/help/en_US/pgadmin3.chm">http://www.pgadmin.org/snapshots/help/en_US/pgadmin3.chm</a>)</li>
-</ul>
-</body>
-</html>
diff --git a/doc/src/FAQ/FAQ_brazilian.html b/doc/src/FAQ/FAQ_brazilian.html
deleted file mode 100644
index 35e7c051e0..0000000000
--- a/doc/src/FAQ/FAQ_brazilian.html
+++ /dev/null
@@ -1,942 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-  <HEAD>
-    <META name="generator" content="HTML Tidy, see www.w3.org">
-    <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <TITLE>FAQ do PostgreSQL</TITLE>
-  </HEAD>
-
-  <BODY bgcolor="#ffffff" text="#000000" link="#ff0000" vlink="#a00000"
-  alink="#0000ff">
-    <H1>Perguntas Frequentes (FAQ) sobre PostgreSQL</H1>
-
-    <P>&Uacute;ltima atualiza&ccedil;&atilde;o: Sex Nov 16 10:53:50 EST 2007</P>
-
-    <P>Mantenedor atual: Bruce Momjian (<A href=
-    "mailto:[email protected]">[email protected]</A>)
-    </P>
-
-    <P>Traduzido por: Euler Taveira de Oliveira (<A href=
-    "mailto:[email protected]">[email protected]</A>)</P>
-
-    <P>A vers&atilde;o mais recente desse documento pode ser vista em <A href=
-    "http://www.postgresql.org/files/documentation/faqs/FAQ.html">
-    http://www.postgresql.org/files/documentation/faqs/FAQ.html</A> (EN).<BR>
-    <A href="http://www.postgresql.org/files/documentation/faqs/FAQ_brazilian.html">
-    http://www.postgresql.org/files/documentation/faqs/FAQ_brazilian.html</A> (pt_BR).</P>
-
-     <P>Perguntas sobre plataformas espec&iacute;ficas s&atilde;o respondidas em <A href=
-    "http://www.postgresql.org/docs/faq/">http://www.postgresql.org/docs/faq/</A>.</P>
-    <HR>
-
-    <H2 align="center">Perguntas Gerais</H2>
-     <A href="#item1.1">1.1</A>) O que &eacute; PostgreSQL? Como ele &eacute; pronunciado?
-     O que &eacute; Postgres?<BR>
-     <A href="#item1.2">1.2</A>) Quem controla o PostgreSQL?<BR>
-     <A href="#item1.3">1.3</A>) Qual &eacute; a licen&ccedil;a do PostgreSQL?<BR>
-     <A href="#item1.4">1.4</A>) Quais plataformas o PostgreSQL pode ser executado?<BR>
-     <A href="#item1.5">1.5</A>) Onde eu posso conseguir o PostgreSQL?<BR>
-     <A href="#item1.6">1.6</A>) Qual &eacute; a &uacute;ltima vers&atilde;o?<BR>
-     <A href="#item1.7">1.7</A>) Onde eu posso conseguir suporte?<BR>
-	 <A href="#item1.8">1.8</A>) Como eu posso submeter um relato de um bug?<BR>
-     <A href="#item1.9">1.9</A>) Como eu posso saber quais s&atilde;o os bugs conhecidos ou caracter&iacute;sticas ausentes?<BR>
-     <A href="#item1.10">1.10</A>) Que documenta&ccedil;&atilde;o est&aacute; dispon&iacute;vel?<BR>
-     <A href="#item1.11">1.11</A>) Como eu posso aprender <SMALL>SQL</SMALL>?<BR>
-     <A href="#item1.12">1.12</A>) Como posso submeter uma corre&ccedil;&atilde;o (patch) ou me juntar a equipe de desenvolvimento?<BR>
-     <A href="#item1.13">1.13</A>) Como &eacute; o PostgreSQL comparado a outros <SMALL>SGBD</SMALL>s?<BR>
-		 <A href="#item1.14">1.14</A>) O PostgreSQL gerenciar� as mudan&ccedil;as de hor&aacute;rio devido ao hor&aacute;rio de ver&atilde;o em v&aacute;rios pa&iacute;ses?<BR>
-     
-
-     <H2 align="center">Perguntas sobre Clientes</H2>
-	 <A href="#item2.1">2.1</A>) Quais interfaces est&atilde;o dispon&iacute;veis para PostgreSQL?<BR>
-     <A href="#item2.2">2.2</A>) Quais ferramentas est&atilde;o dispon&iacute;veis para utilizar o PostgreSQL com p&aacute;ginas Web?<BR>
-     <A href="#item2.3">2.3</A>) O PostgreSQL tem interfaces gr&aacute;ficas para interagir com usu&aacute;rio?<BR>
-     
-
-    <H2 align="center">Perguntas Administrativas</H2>
-    <A href="#item3.1">3.1</A>) Como eu instalo o PostgreSQL em um local diferente de <I>/usr/local/pgsql</I>?<BR>
-	<A href="#item3.2">3.2</A>) Como eu controlo conex&otilde;es de outras m&aacute;quinas?<BR>
-    <A href="#item3.3">3.3</A>) Como eu ajusto o servidor de banco de dados para obter uma performance melhor?<BR>
-    <A href="#item3.4">3.4</A>) Quais caracter&iacute;sticas de depura&ccedil;&atilde;o est&atilde;o dispon&iacute;veis?<BR>
-    <A href="#item3.5">3.5</A>) Por que eu recebo <I>"Sorry, too many clients"</I> quando eu tento conectar?<BR>
-    <A href="#item3.6">3.6</A>) Qual &eacute; o processo de atualiza&ccedil;&atilde;o do PostgreSQL?<BR>
-    <A href="#item3.7">3.7</A>) Que tipo de hardware eu devo usar?<BR>
-
-
-     <H2 align="center">Perguntas Operacionais</H2>
-     <A href="#item4.1">4.1</A>) Como eu fa&ccedil;o um <SMALL>SELECT</SMALL> somente dos primeiros registros de uma consulta? Um registro rand&ocirc;mico?<BR>
-	 <A href="#item4.2">4.2</A>) Como eu descubro quais tabelas, &iacute;ndices, bancos de dados e usu&aacute;rios est&atilde;o definidos? Como eu vejo as consultas utilizadas pelo <I>psql</I> para mostr&aacute;-los?<BR>
-     <A href="#item4.3">4.3</A>) Como voc&ecirc; muda o tipo de dado de uma coluna?<BR>
-     <A href="#item4.4">4.4</A>) Qual &eacute; o tamanho m&aacute;ximo de um registro, uma tabela e um banco de dados?<BR>
-     <A href="#item4.5">4.5</A>) Quanto espa&ccedil;o em disco &eacute; necess&aacute;rio para armazenar dados de um arquivo texto?<BR>
-     <A href="#item4.6">4.6</A>) Por que minhas consultas est&atilde;o lentas? Por que elas n&atilde;o est&atilde;o utilizando meus &iacute;ndices?<BR>
-     <A href="#item4.7">4.7</A>) Como eu vejo como o otimizador de consultas est&aacute; avaliando minha consulta?<BR>
-	 <A href="#item4.8">4.8</A>) Como eu fa&ccedil;o buscas com express&otilde;es regulares e buscas com express&otilde;es regulares sem diferenciar mau&uacute;sculas de min&uacute;sculas? Como eu utilizo um &iacute;ndice para buscas sem distinguir mai&uacute;sculas de min&uacute;sculas?<BR>
-	 <A href="#item4.9">4.9</A>) Em uma consulta, como eu detecto se um campo &eacute; <SMALL>NULL</SMALL>? Como eu posso concatenar poss&iacute;veis <SMALL>NULL</SMALL>s? Como eu posso ordenar por um campo que &eacute; <SMALL>NULL</SMALL> ou n&atilde;o?<BR>
-    <A href="#item4.10">4.10</A>) Qual &eacute; a diferen&ccedil;a entre os v&aacute;rios tipos de dado de caracteres?<BR>
-	<A href="#item4.11.1">4.11.1</A>) Como eu crio um campo serial/auto incremento?<BR>
-    <A href="#item4.11.2">4.11.2</A>) Como eu consigo o valor de um campo
-    <SMALL>SERIAL</SMALL>?<BR>
-    <A href="#item4.11.3">4.11.3</A>) <I>currval()</I> n&atilde;o lida com condi&ccedil;&atilde;o de corrida com outros usu&aacute;rios?<BR>
-    <A href="#item4.11.4">4.11.4</A>) Por que os n&uacute;meros da minha sequ&ecirc;ncia n&atilde;o s&atilde;o reutilizados quando uma transa&ccedil;&atilde;o &eacute; abortada? Por que h&aacute; intervalos nos n&uacute;meros da minha sequ&ecirc;ncia/coluna SERIAL?<BR>
-    <A href="#item4.12">4.12</A>) O que &eacute; um <SMALL>OID</SMALL>? O que &eacute; um <SMALL>CTID</SMALL>?<BR>
-    <A href="#item4.13">4.13</A>) Por que eu recebo o erro <I>"ERROR: Memory exhausted in AllocSetAlloc()"</I>?<BR>
-    <A href="#item4.14">4.14</A>) Como eu informo qual vers&atilde;o do PostgreSQL eu estou utilizando?<BR>
-    <A href="#item4.15">4.15</A>) Como eu crio uma coluna que conter&aacute; por padr&atilde;o a hora atual?<BR>
-    <A href="#item4.16">4.16</A>) Como eu fa&ccedil;o uma jun&ccedil;&atilde;o externa (outer join)?<BR>
-    <A href="#item4.17">4.17</A>) Como eu fa&ccedil;o consultas utilizando m&uacute;ltiplos bancos de dados?<BR>
-    <A href="#item4.18">4.18</A>) Como eu retorno m&uacute;ltiplos registros ou colunas de uma fun&ccedil;&atilde;o?<BR>
-	<A href="#item4.19">4.19</A>) Por que eu obtenho erros "relation with OID ######
-	does not exist" ao acessar tabelas tempor&aacute;rias em fun&ccedil;&otilde;es PL/PgSQL?<BR>
-    <A href="#item4.20">4.20</A>) Quais solu&ccedil;&otilde;es de replica&ccedil;&atilde;o est&atilde;o dispon&iacute;veis?<BR>
-	<A href="#item4.21">4.21</A>) Por que os nomes de minhas tabelas e colunas n&atilde;o
-	s&atilde;o reconhecidos em minha consulta? Por que as mai&uacute;sculas n&atilde;o s&atilde;o preservadas?<BR>
-     
-
-    <HR>
-
-    <H2 align="center">Perguntas Gerais</H2>
-
-    <H3 id="item1.1">1.1) O que &eacute; PostgreSQL? Como ele &eacute; pronunciado? O que &eacute; Postgres?</H3>
-
-		<P>PostgreSQL &eacute; pronunciado <I>Post-Gres-Q-L</I>.
-	(Para os curiosos que querem saber como se diz "PostgreSQL", um
-	<a href="http://www.postgresql.org/files/postgresql.mp3">arquivo de &aacute;udio</a> est&aacute; dispon&iacute;vel).</P>
-
-	<P>O PostgreSQL &eacute; um sistema de banco de dados objeto-relacional que tem as
-	caracter&iacute;sticas de sistemas de bancos de dados comerciais tradicionais com
-	melhoramentos encontrados nos sistemas <SMALL>SGBD</SMALL>s de pr&oacute;xima gera&ccedil;&atilde;o.
-	PostgreSQL &eacute; livre e o c&oacute;digo-fonte completo est&aacute; dispon&iacute;vel.</P>
-
-	<P>O desenvolvimento do PostgreSQL &eacute; feito por um grupo de desenvolvedores
-	volunt&aacute;rios (na sua maioria) espalhados pelo mundo e que se comunicam via
-	Internet. &Eacute; um projeto da comunidade e n&atilde;o &eacute; controlado por nenhuma
-	empresa. Para se envolver, veja a FAQ do desenvolvedor em <A href=
-	"http://www.postgresql.org/docs/faqs.FAQ_DEV.html">
-	http://www.postgresql.org/docs/faqs.FAQ_DEV.html</A>
-	</P>
-
-	<P>Postgres &eacute; um apelido para o PostgreSQL amplamente utilizado. Era o nome original do
-	projeto em Berkeley e dentre os outros apelidos &eacute; o preferido. Se voc&ecirc; acha
-	'PostgreSQL' dif&iacute;cil de pronunciar, diga apenas 'Postgres'.</P>
-
-	<H3 id="item1.2">1.2) Quem controla o PostgreSQL?<BR></H3>
-
-	<P>Se voc&ecirc; est&aacute; procurando por um mantenedor, comit&ecirc; central ou empresa
-	controladora do PostgreSQL, desista --- n&atilde;o h&aacute; um(a). N&oacute;s temos um
-	comit&ecirc; core e committers CVS, mas estes grupos s&atilde;o mais para quest&otilde;es
-	administrativas do que controle. O projeto &eacute; direcionado pela comunidade
-	de desenvolvedores e usu&aacute;rios, que qualquer um pode se juntar. Tudo o que
-	voc&ecirc; precisa &eacute; se inscrever nas listas de discuss&atilde;o e participar das
-	discuss&otilde;es. Veja a <a href="http://www.postgresql.org/docs/faqs.FAQ_DEV.html">
-	FAQ do desenvolvedor</A> para obter informa&ccedil;&otilde;es como se envolver com o
-	desenvolvimento do PostgreSQL.</P>
-
-    <H3 id="item1.3">1.3) Qual &eacute; a licen&ccedil;a do PostgreSQL?</H3>
-
-	<P>O PostgreSQL &eacute; distribu&iacute;do sob a licen&ccedil;a BSD cl&aacute;ssica. Basicamente,
-	ela permite que usu&aacute;rios fa&ccedil;am qualquer coisa com o c&oacute;digo, incluindo
-	revender os bin&aacute;rios sem o c&oacute;digo-fonte. A &uacute;nica restri&ccedil;&atilde;o &eacute; que voc&ecirc;
-	n&atilde;o nos responsabilize legalmente por problemas com o programa de computador.
-	H&aacute; tamb&eacute;m a exig&ecirc;ncia de que esta licen&ccedil;a apare&ccedil;a em todas as c&oacute;pias
-	do programa de computador. Aqui est&aacute; a licen&ccedil;a BSD que usamos atualmente:</P>
-    <P>PostgreSQL est&aacute; sujeito a seguinte licen&ccedil;a:</P>
-
-    <P>PostgreSQL Data Base Management System</P>
-
-    <P>Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
-    Portions Copyright (c) 1994-1996 Regents of the University of California</P>
-
-    <P>Permission to use, copy, modify, and distribute this software
-    and its documentation for any purpose, without fee, and without a
-    written agreement is hereby granted, provided that the above
-    copyright notice and this paragraph and the following two
-    paragraphs appear in all copies.</P>
-
-    <P>IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY
-    PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
-    DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS
-    SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
-    CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>
-
-    <P>THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
-    SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE
-    UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,
-    SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.</P>
-
-    <H3 id="item1.4">1.4) Quais plataformas o PostgreSQL pode ser executado?</H3>
-
-    <P>Em geral, qualquer plataforma moderna compat&iacute;vel com Unix deve ser capaz de executar o PostgreSQL. As plataformas que foram testadas antes do lan&ccedil;amento de uma vers&atilde;o s&atilde;o listadas nas instru&ccedil;&otilde;es de instala&ccedil;&atilde;o.</P>
-
-	<P>O PostgreSQL tamb&eacute;m executa nativamente nos sistemas operacionais Microsoft Windows
-	baseados no NT tais como Win200 SP4, WinXP e Win2003. Um instalador pr&eacute;-empacotado est&aacute;
-	dispon&iacute;vel em <a href= "http://pgfoundry.org/projects/pginstaller">
-	http://pgfoundry.org/projects/pginstaller</a>. Vers&otilde;es do Windows baseadas no MS-DOS
-	(Win95, Win98, WinMe) podem executar o PostgreSQL utilizando o Cygwin.</P>
-
-	<p>H&aacute; tamb&eacute;m uma vers&atilde;o para o Novell Netware 6 em
-	<a href="http://forge.novell.com">http://forge.novell.com</a>
-	e uma vers&atilde;o para OS/2 (eComStation) em <a href=
-	"http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&amp;button=Search&amp;key=postgreSQL&amp;stype=all&amp;sort=type&amp;dir=%2F">
-	http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&amp;button=Search&amp;key=postgreSQL&amp;stype=all&amp;sort=type&amp;dir=%2F</a>.</p>
-
-    <H3 id="item1.5">1.5) Onde eu posso conseguir o PostgreSQL?</H3>
-
-	<P>Via navegador web, utilize <a href="http://www.postgresql.org/ftp/">
-	http://www.postgresql.org/ftp/</a> e via ftp, utilize
-	<A href="ftp://ftp.postgresql.org/pub/">
-	ftp://ftp.postgresql.org/pub/</A>.</P>
-
-
-    <H3 id="item1.6">1.6) Qual &eacute; a &uacute;ltima vers&atilde;o?</H3>
-
-    <P>A &uacute;ltima vers&atilde;o do PostgreSQL &eacute; a vers&atilde;o 8.2.5.</P>
-
-	<P>N&oacute;s planejamos lan&ccedil;ar vers&otilde;es novas a cada ano com vers&otilde;es
-	corretivas em alguns meses.</P>
-
-    <H3 id="item1.7">1.7) Onde eu posso conseguir suporte?</H3>
-
-	<P>A comunidade do PostgreSQL fornece assist&ecirc;ncia a muitos de seus
-	usu&aacute;rios via e-mail. O principal s&iacute;tio web para inscri&ccedil;&atilde;o nas listas
-	de e-mail &eacute; <a href="http://www.postgresql.org/community/lists/">
-	http://www.postgresql.org/community/lists/</a>. As listas <I>general</I>
-	e <I>bugs</I> s&atilde;o um bom lugar para in&iacute;cio.</P>
-
-    <P>O principal canal de IRC &eacute; o <I>#postgresql</I> na Freenode (<I>irc.freenode.net</I>). Para se conectar voc&ecirc; pode utilizar o comando Unix <code>irc -c '#postgresql' "$USER" irc.freenode.net</code> ou utilizar qualquer outro cliente de IRC. Um canal hisp&acirc;nico (<I>#postgresql-es</I>) e um franc&ecirc;s (<I>#postgresqlfr</I>) tamb&eacute;m existem na mesma rede. H&aacute; tamb&eacute;m um canal PostgreSQL na EFNet.</P>
-
-    <P>Uma lista de empresas que prestam suporte comercial est&aacute; dispon&iacute;vel em <A href=
-	"http://www.postgresql.org/support/professional_support">
-	http://www.postgresql.org/support/professional_support</A>.</P>
-
-    <H3 id="item1.8">1.8) Como eu informo a exist&ecirc;ncia de um bug?</H3>
-
-    <P>Visite o formul&aacute;rio que reporta bugs do PostgreSQL em <A href=
-    "http://www.postgresql.org/support/submitbug">http://www.postgresql.org/support/submitbug</A>.</P>
-    <P>Verifique tamb&eacute;m o nosso ftp <A href=
-    "ftp://ftp.postgresql.org/pub">ftp://ftp.postgresql.org/pub</A> para
-    ver se h&aacute; uma vers&atilde;o mais recente do PostgreSQL.</P>
-
-	<P>Bugs submetidos utilizando o formul&aacute;rio ou informado a qualquer
-	lista de discuss&atilde;o do PostgreSQL tipicamente gera uma das seguintes
-	respostas:</P>
-	<ul>
-	<li>N&atilde;o &eacute; um bug e o porqu&ecirc;</li>
-	<li>&Eacute; um bug conhecido e j&aacute; est&aacute; na lista de
-	<A href="http://www.postgresql.org/docs/faqs.TODO.html">AFAZERES</A></li>
-	<li>O bug foi corrigido na vers&atilde;o atual</li>
-	<li>O bug foi corrigido mas n&atilde;o foi empacotado em um vers&atilde;o oficial</li>
-	<li>Um pedido foi feito para obter informa&ccedil;&otilde;es detalhadas:
-		<ul>
-	<li>Sistema Operacional</li>
-	<li>Vers&atilde;o do PostgreSQL</li>
-	<li>Exemplo de teste que reproduz o bug</li>
-	<li>Informa&ccedil;&otilde;es sobre depura&ccedil;&atilde;o</li>
-	<li>Sa&iacute;da reconstituidora de vest&iacute;gios (backtrace) do depurador</li>
-	</ul>
-	</li>
-	<li>O bug &eacute; novo. O seguinte pode ocorrer:
-		<ul>
-	<li>Uma corre&ccedil;&atilde;o &eacute; criada e ser&aacute; inclu&iacute;da na pr&oacute;xima vers&atilde;o</li>
-	<li>O bug n&atilde;o pode ser corrigido imediatamente e &eacute; adicionado
-	a lista de <A href="http://www.postgresql.org/docs/faqs.TODO.html">AFAZERES</A></li>
-	</ul>
-	</li>
-	</ul>
-
-	<H3 id="item1.9">1.9) Como eu posso saber quais s&atilde;o os bugs conhecidos
-	ou funcionalidades ausentes?</H3>
-
-	<P>O PostgreSQL suporta um subconjunto extendido do <SMALL>SQL:2003</SMALL>.
-	Veja nossa lista de <A href="http://www.postgresql.org/docs/faqs.TODO.html">AFAZERES</A>
-	que cont&eacute;m bugs conhecidos, funcionalidades ausentes e planos futuros.</P>
-
-	<P>Uma solicita&ccedil;&atilde;o de funcionalidade geralmente resulta em uma das
-	seguintes respostas:</P>
-	<ul>
-	<li>A funcionalidade j&aacute; est&aacute; na lista de <A href="http://www.postgresql.org/docs/faqs.TODO.html">AFAZERES</A></li>
-	<li>A funcionalidade n&atilde;o &eacute; desej&aacute;vel porque:
-		<ul>
-		<li>Ela duplica uma funcionalidade existente que j&aacute; segue o
-		padr&atilde;o SQL</li>
-		<li>A funcionalidade aumentar&aacute; a complexidade do c&oacute;digo mas
-		adicionar&aacute; pouco benef&iacute;cio</li>
-		<li>A funcionalidade ser&aacute; insegura ou n&atilde;o-confi&aacute;vel</li>
-		</ul>
-	</li>
-	<li>A nova funcionalidade &eacute; adicionada a lista de
-	<A href="http://www.postgresql.org/docs/faqs.TODO.html">AFAZERES</A></li>
-	</ul>
-
-	<P>O PostgreSQL n&atilde;o utiliza sistema de acompanhamento de bugs porque
-	n&oacute;s achamos mais eficiente responder diretamente o e-mail e manter a
-	lista de <A href="http://www.postgresql.org/docs/faqs.TODO.html">AFAZERES</A>
-	atualizada. Na pr&aacute;tica, bugs n&atilde;o duram muito no programa; e bugs que afetam
-	uma grande quantidade de usu&aacute;rios s&atilde;o corrigidos rapidamente. O &uacute;nico lugar
-	para encontrar todas as mudan&ccedil;as, melhorias e corre&ccedil;&otilde;es em uma vers&atilde;o do
-	PostgreSQL &eacute; ler as mensagens de log do
-	<a href="http://www.postgresql.org/developer/sourcecode/">CVS</a>. At&eacute; mesmo
-	as notas de lan&ccedil;amento n&atilde;o listam todas as mudan&ccedil;as feitas no programa.</P>
-
-    <H3 id="item1.10">1.10) Que documenta&ccedil;&atilde;o est&aacute; dispon&iacute;vel?</H3>
-
-	<P>O PostgreSQL inclui vasta documenta&ccedil;&atilde;o, incluindo um manual extenso,
-	p&aacute;ginas de manuais (man pages) e alguns exemplos teste. Veja o diret&oacute;rio
-	<I>/doc</I>. Voc&ecirc; tamb&eacute;m pode pesquisar os manuais online em <A href=
-	"http://www.postgresql.org/docs">http://www.postgresql.org/docs</A>.
-	</P>
-
-	<P>H&aacute; dois livros sobre PostgreSQL dispon&iacute;veis online em <A href=
-	"http://www.postgresql.org/docs/books/awbook.html">http://www.postgresql.org/docs/books/awbook.html</A>
-	e <A href=
-	"http://www.commandprompt.com/ppbook/">http://www.commandprompt.com/ppbook/</A>.
-	H&aacute; uma lista de livros sobre PostgreSQL dispon&iacute;veis para compra. Um dos mais
-	populares &eacute; o do Korry Douglas. Uma lista de an&aacute;lise sobre os livros pode ser
-	encontrada em <A href=
-	"http://www.postgresql.org/docs/books/">http://www.postgresql.org/docs/books/</A>.
-	H&aacute; tamb&eacute;m uma cole&ccedil;&atilde;o de artigos t&eacute;cnicos sbore PostgreSQL em <A href="http://www.postgresql.org/docs/techdocs/">http://www.postgresql.org/docs/techdocs/</A>.</P>
-
-	<P>O programa cliente de linha de comando <I>psql</I> tem alguns comandos \d para
-	mostrar informa&ccedil;&otilde;es sobre tipos, operadores, fun&ccedil;&otilde;es, agrega&ccedil;&otilde;es, etc. - utilize \?
-	para mostrar os comandos dispon&iacute;veis.</P>
-
-	<P>Nosso s&iacute;tio web cont&eacute;m ainda mais documenta&ccedil;&atilde;o.</P>
-
-    <H3 id="item1.11">1.11) Como eu posso aprender <SMALL>SQL</SMALL>?</H3>
-
-	<P>Primeiro, considere os livros espec&iacute;ficos sobre PostgreSQL mencionados
-	acima. Muitos de nossos usu&aacute;rios gostam do <I>The Practical SQL Handbook</I>,
-	Bowman, Judith S., et al., Addison-Wesley. Outros do <I>The
-	Complete Reference SQL</I>, Groff et al., McGraw-Hill.</P>
-
-	<P>H&aacute; tamb&eacute;m bons tutoriais dispon&iacute;veis online:
-	<UL>
-	<LI> <A href="http://www.intermedia.net/support/sql/sqltut.shtm">http://www.intermedia.net/support/sql/sqltut.shtm</A>
-    </LI>
-    <LI>
-    <A href="http://sqlcourse.com/">http://sqlcourse.com</A>
-    </LI>
-    <LI>
-    <A href="http://www.w3schools.com/sql/default.asp">http://www.w3schools.com/sql/default.asp</A>
-    </LI>
-    <LI><A href=
-    "http://mysite.verizon.net/Graeme_Birchall/id1.html">http://mysite.verizon.net/Graeme_Birchall/id1.html</A>
-    </LI>
-    </UL>
-
-    <H3 id="item1.12">1.12) Como posso submeter uma corre&ccedil;&atilde;o (patch) ou me juntar a equipe de desenvolvimento?</H3>
-
-	<P>Veja a <a href="http://www.postgresql.org/docs/faqs.FAQ_DEV.html">
-	FAQ do Desenvolvedor</A>.</P>
-
-    <H3 id="item1.13">1.13) Como &eacute; o PostgreSQL comparado a outros <SMALL>SGBD</SMALL>s?</H3>
-
-	<P>H&aacute; v&aacute;rias maneiras de se medir um software: funcionalidades, performance, confiabilidade, suporte e pre&ccedil;o.</P>
-
-    <DL>
-      <DT><B>Funcionalidades</B></DT>
-
-	  <DD>PostgreSQL tem muitas caracter&iacute;sticas presentes em muitos <SMALL>SGBD</SMALL>s comerciais como transa&ccedil;&otilde;es, subconsultas, gatilhos, vis&otilde;es, integridade referencial de chave estrangeira e bloqueio (lock) sofisticado. N&oacute;s temos algumas funcionalidades que eles n&atilde;o tem, como tipos definidos pelo usu&aacute;rio, heran&ccedil;a, regras e controle de concorr&ecirc;ncia de m&uacute;ltiplas vers&otilde;es para reduzir bloqueios (locks).<BR>
-      <BR>
-      </DD>
-
-      <DT><B>Performance</B></DT>
-
-	  <DD>A performance do PostgreSQL &eacute; compar&aacute;vel a outros bancos de dados comerciais e de c&oacute;digo livre. Ele &eacute; mais r&aacute;pido em algumas coisas, mais lento em outras. Nossa performance &eacute; geralmente +/- 10% comparada a de outros bancos de dados.
-      <BR>
-      </DD>
-
-      <DT><B>Confiabilidade</B></DT>
-
-      <DD>N&oacute;s sabemos que um <SMALL>SGBD</SMALL> deve ser confi&aacute;vel ou ele &eacute; in&uacute;til. N&oacute;s empenhamos em lan&ccedil;ar vers&otilde;es bem testadas, de c&oacute;digo est&aacute;vel e que tenha o m&iacute;nimo de bugs. Cada vers&atilde;o tem no m&iacute;nimo um m&ecirc;s de teste em vers&atilde;o beta, e nosso hist&oacute;rico de vers&otilde;es mostra que n&oacute;s podemos fornecer vers&otilde;es est&aacute;veis e s&oacute;lidas que est&atilde;o prontas para uso em produ&ccedil;&atilde;o. N&oacute;s acreditamos que somos comparados a nosso favor com outros sistemas de bancos de dados nessa &aacute;rea.<BR>
-      <BR>
-      </DD>
-
-      <DT><B>Suporte</B></DT>
-
-      <DD>Nossas listas de discuss&atilde;o fornecem contato com um grupo de desenvolvedores e usu&aacute;rios para ajudar a resolver muitos problemas encontrados. Enquanto n&oacute;s n&atilde;o podemos garantir o conserto, <SMALL>SGBD</SMALL>s comerciais nem sempre fornecem tamb&eacute;m. Com acesso direto aos desenvolvedores, a comunidade de usu&aacute;rios, manuais e o c&oacute;digo fonte faz com que o suporte do PostgreSQL seja superior ao de outros <SMALL>SGBD</SMALL>s. H&aacute; suporte comercial por incidente dispon&iacute;veis para aqueles que precisam de um. (Veja <A href="#item1.7">se&ccedil;&atilde;o 1.7 da FAQ</A>).<BR>
-      <BR>
-      </DD>
-
-      <DT><B>Pre&ccedil;o</B></DT>
-
-      <DD>N&oacute;s somos livres para uso dele tanto comercial quanto n&atilde;o comercial. Voc&ecirc; pode adicionar nosso c&oacute;digo ao seu produto sem limita&ccedil;&otilde;es, exceto aquelas descritas na nossa licen&ccedil;a BSD mencionada acima.<BR>
-      <BR>
-      </DD>
-    </DL>
-
-		<H3 id="item1.14">1.14) O PostgreSQL gerenciar&aacute; mudan&ccedil;as no hor&aacute;rio devido ao hor&aacute;rio de ver&atilde;o em v&aacute;rios pa&iacute;ses?</H3>
-
-		<P>Mudan&ccedil;as no hor&aacute;rio de ver&atilde;o dos USA foram inclu&iacute;das nas vers&otilde;es 8.0 .[4+] do PostgreSQL e em todas as vers&otilde;es grandes, i.e. 8.1. Mudan&ccedil;as no Canad&aacute; e Austr&aacute;lia Oeste foram inclu&iacute;das na 8.0.[10+], 8.1.[6+] e em todas as vers&otilde;es grandes subsequentes. Vers&otilde;es do PostgreSQL anteriores a 8.0 utilizam o banco de dados de zona hor&aacute;ria do sistema operacional para informa&ccedil;&otilde;es sobre hor&aacute;rio de ver&atilde;o.</P>
-
-    <HR>
-
-    <H2 align="center">Perguntas sobre Clientes</H2>
-
-	<H3 id="item2.1">2.1) Quais interfaces est&atilde;o dispon&iacute;veis para PostgreSQL?</H3>
-
-	<p>A instala&ccedil;&atilde;o do PostgreSQL inclui somente as interfaces <SMALL>C</SMALL> e
-	<SMALL>C</SMALL> embutida. Todas as outras interfaces s&atilde;o projetos independentes
-	que podem ser obtidos separadamente; sendo separados permitem que eles tenham
-	suas pr&oacute;prias datas de lan&ccedil;amento e time de desenvolvedores.</P>
-
-	<P>Algumas linguagens de programa&ccedil;&atilde;o como <SMALL>PHP</SMALL> incluem uma
-	interface para PostgreSQL. Interfaces para linguagens como Perl,
-	<SMALL>TCL</SMALL>, Python e muitas outras est&atilde;o dispon&iacute;veis em
-	<a href="http://www.pgfoundry.org">http://www.pgfoundry.org</A>.
-	</P>
-
-    <H3 id="item2.2">2.2) Quais ferramentas est&atilde;o dispon&iacute;veis para utilizar o PostgreSQL com p&aacute;ginas Web?</H3>
-
-    <P>Uma boa introdu&ccedil;&atilde;o para p&aacute;ginas web que utilizam bancos de dados pode ser vista em:
-    <A href="http://www.webreview.com">http://www.webreview.com</A></P>
-
-	<P>Para integra&ccedil;&atilde;o na Web, PHP (<A
-	href="http://www.php.net">http://www.php.net</A>)
-	&eacute; uma excelente interface.</P>
-
-	<P>Para casos complexos, muitos usam a Interface Perl e DBD::Pg com CGI.pm
-	ou mod_perl.</P>
-
-    <H3 id="item2.3">2.3) O PostgreSQL tem interfaces gr&aacute;ficas para iteragir com o usu&aacute;rio?</H3>
-
-	<P>H&aacute; um vasto n&uacute;mero de Ferramentas Gr&aacute;ficas (GUI), que est&atilde;o dispon&iacute;veis
-	para o PostgreSQL, comerciais e de desenvolvedores de c&oacute;digo aberto. Uma
-	lista detalhada pode ser encontrada em <A href="http://www.postgresql.org/docs/techdocs.54">
-	Documenta&ccedil;&atilde;o da Comunidade PostgreSQL</A></P>
-
-    <HR>
-
-    <H2 align="center">Perguntas Administrativas</H2>
-
-    <H3 id="item3.1">3.1) Como eu instalo o PostgreSQL em um local diferente de <I>/usr/local/pgsql</I>?</H3>
-
-    <P>Especifique a op&ccedil;&atilde;o <I>--prefix</I> quando executar o <I>configure</I>.</P>
-
-    <H3 id="item3.2">3.2) Como eu controlo conex&otilde;es de outras m&aacute;quinas?</H3>
-
-	<P>Por padr&atilde;o, o PostgreSQL s&oacute; permite conex&otilde;es da m&aacute;quina local utilizando soquetes de dom&iacute;nio Unix ou conex&otilde;es TCP/IP. Outras m&aacute;quinas n&atilde;o poder&atilde;o conectar-se a menos que voc&ecirc; modifique <I>listen_addresses</I> no <I>postgresql.conf</I>, habilite a autentica&ccedil;&atilde;o por m&aacute;quina modificando o arquivo <I>$PGDATA/pg_hba.conf</I> e reinicie o servidor PostgreSQL.</P>
-
-    <H3 id="item3.3">3.3) Como eu ajusto o servidor de banco de dados para obter uma performance melhor?</H3>
-
-	<P>H&aacute; tr&ecirc;s grandes &aacute;reas para melhorar a performance em potencial:</P>
-
-	<DL>
-	<DT><B>Mudan&ccedil;a de Consultas</B></DT>
-
-	<DD>Isto involve modificar consultas para obter melhor performance:
-	<ul>
-	<li>Cria&ccedil;&atilde;o de &iacute;ndices, incluir express&otilde;es e &iacute;ndices parciais</li>
-	<li>Utiliza&ccedil;&atilde;o o COPY ao inv&eacute;s de m&uacute;ltiplos comandos <SMALL>INSERT</SMALL>s</li>
-	<li>Agrupamento de m&uacute;ltiplos comandos em uma &uacute;nica transa&ccedil;&atilde;o para diminuir
-	a despesa com efetiva&ccedil;&otilde;es (commit)</li>
-	<li>Utiliza&ccedil;&atilde;o do <SMALL>CLUSTER</SMALL> quando recuperar v&aacute;rios registros de
-	um &iacute;ndice</li>
-	<li>Utiliza&ccedil;&atilde;o do <SMALL>LIMIT</SMALL> para retornar um subconjunto da sa&iacute;da
-	da consulta</li>
-	<li>Utiliza&ccedil;&atilde;o de Consultas preparadas</li>
-	<li>Utiliza&ccedil;&atilde;o de <SMALL>ANALYZE</SMALL> para manter as estat&iacute;sticas do
-	otimizador corretas</li>
-	<li>Utiliza&ccedil;&atilde;o regular do <SMALL>VACUUM</SMALL> ou <I>pg_autovacuum</I></li>
-	<li>Remo&ccedil;&atilde;o de &iacute;ndices durante grande mudan&ccedil;a de dados</li>
-	</ul><BR>
-	<BR>
-	</DD>
-
-	<DT><B>Configura&ccedil;&atilde;o do Servidor</B></DT>
-
-	<DD>Um grande n&uacute;mero de configura&ccedil;&otilde;es que afetam a performance.
-	Para obter detalhes adicionais, veja <a href=
-	"http://www.postgresql.org/docs/current/static/runtime-config.html">
-    Administration Guide/Server Run-time Environment/Run-time
-	Configuration</a> para listagem completa, e para
-	coment&aacute;rios veja <a href=
-	"http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_conf_e.html">
-    http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_conf_e.html</a>
-    e <a href="http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html">
-    http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html</a>.
-    <BR>
-    <BR>
-    </DD>
-
-	<DT><B>Sele&ccedil;&atilde;o do Hardware</B></DT>
-
-	<DD>O efeito do hardware na performance &eacute; detalhado em
-    <a href="http://www.powerpostgresql.com/PerfList/">
-    http://www.powerpostgresql.com/PerfList/</a> e <a
-    href="http://momjian.us/main/writings/pgsql/hw_performance/index.html">
-    http://momjian.us/main/writings/pgsql/hw_performance/index.html</a>.
-    <BR>
-    <BR>
-    </DD>
-    </DL>
-
-    <H3 id="item3.4">3.4) Quais caracter&iacute;sticas de depura&ccedil;&atilde;o est&atilde;o dispon&iacute;veis?</H3>
-
-	<P>H&aacute; muitas vari&aacute;veis de configura&ccedil;&atilde;o do servidor <CODE>log_*</CODE>
-	que habilitam a exibi&ccedil;&atilde;o de consultas e estat&iacute;sticas que podem ser
-	muito &uacute;teis para depura&ccedil;&atilde;o e medidas de performance.</P>
-
-    <H3 id="item3.5">3.5) Por que eu recebo <I>"Sorry, too many clients"</I> quando eu tento conectar?</H3>
-
-	<P>Voc&ecirc; atingiu o limite padr&atilde;o de 100 sess&otilde;es. Voc&ecirc;
-	precisa aumentar o limite do servidor PostgreSQL, que diz
-	quantos processos servidor concorrentes ele pode iniciar, alterando
-	o valor <I>max_connections</I> no <I>postgresql.conf</I> e
-	reiniciando o <I>postmaster</I>.</P>
-
-	<H3 id="item3.6">3.6) Qual &eacute; o processo de atualiza&ccedil;&atilde;o do PostgreSQL?</H3>
-
-	<P>Veja <a
-	href="http://www.postgresql.org/support/versioning">http://www.postgresql.org/support/versioning</a>
-	para discuss�o geral sobre atualiza��es e <a href=
-	"http://www.postgresql.org/docs/current/static/install-upgrading.html">
-	http://www.postgresql.org/docs/current/static/install-upgrading.html</a>
-	para instru&ccedil;&otilde;es espec&iacute;ficas.</P>
-
-    <H3 id="item3.7">3.7) Que tipo de hardware eu devo usar?</H3>
-
-    <P>Por causa do hardware de PC ser em sua maioria compat&iacute;vel, pessoas tendem a acreditar que todos os hardwares de PC s&atilde;o de mesma qualidade. N&atilde;o &eacute; verdade. ECC RAM, SCSI e placas m&atilde;e de qualidade s&atilde;o mais confi&aacute;veis e t&ecirc;m uma melhor performance do que hardwares mais baratos. O PostgreSQL executar&aacute; em quase todo hardware, mas se a confiabilidade e a performance forem importantes &eacute; prudente pesquisar sobre as op&ccedil;&otilde;es de hardware. Nossas listas de discuss&atilde;o podem ser usadas para discutir op&ccedil;&otilde;es de hardware e dilemas.</P>
-
-    <HR>
-
-    <H2 align="center">Perguntas Operacionais</H2>
-
-    <H3 id="item4.1">4.1) Como eu fa&ccedil;o um <SMALL>SELECT</SMALL> somente dos primeiros registros de uma consulta? Um registro rand&ocirc;mico?</H3>
-
-	<P>Para obter somente alguns registros, se voc&ecirc; sabe o n&uacute;mero de
-	registros necess&aacute;rios ao executar o <SMALL>SELECT</SMALL> utilize
-	o <SMALL>LIMIT</SMALL>. Se um &iacute;ndice corresponde no <SMALL>ORDER
-	BY</SMALL> &eacute; poss&iacute;vel que a consulta toda n&atilde;o tenha que ser
-	executada. Se voc&ecirc; n&atilde;o sabe o n&uacute;mero de registros ao executar o
-	<SMALL>SELECT</SMALL>, utilize um cursor e o <SMALL>FETCH</SMALL>.</P>
-	
-	<P>Para <SMALL>obter</SMALL> um registro rand&ocirc;mico, utilize:</P>
-<PRE>
-    SELECT col
-    FROM tab
-    ORDER BY random()
-    LIMIT 1;
-</PRE>
-
-	 <H3 id="item4.2">4.2) Como eu descubro quais tabelas, &iacute;ndices, bancos de dados e usu&aacute;rios est&atilde;o definidos? Como eu vejo as consultas utilizadas pelo <I>psql</I> para mostr&aacute;-los?</H3>
-
-	 <P>Utilize o comando \dt para ver tabelas no <I>psql</I>. Para obter
-	 uma lista completa dos comandos no psql voc&ecirc; pode utilizar \?.
-	 Alternativamente, voc&ecirc; pode ler o c&oacute;digo-fonte do <I>psql</I> no arquivo
-	 <I>pgsql/src/bin/psql/describe.c</I>, ele cont&eacute;m os comandos <SMALL>SQL</SMALL>
-	 que geram a sa&iacute;da para os comandos de contrabarra do <I>psql</I>. Voc&ecirc;
-	 tamb&eacute;m pode iniciar o <I>psql</I> com a op&ccedil;&atilde;o <I>-E</I> para que as consultas
-	 utilizadas para executar os comandos que voc&ecirc; informou seja exibida.
-	 O PostgreSQL tamb&eacute;m fornece uma inteface compat&iacute;vel com <SMALL>SQL</SMALL> do
-	 INFORMATION SCHEMA que voc&ecirc; pode consultar para obter informa&ccedil;&atilde;o sobre o
-	 banco de dados.</P>
-
-	 <P>H&aacute; tamb&eacute;m tabelas do sistema que come&ccedil;am com <I>pg_</I> que os descrevem
-	 tamb&eacute;m.</P>
-
-	 <P>Utilizando o <I>psql -l</I> listar&aacute; todos os bancos de dados.</P>
-
-	 <P>Veja tamb&eacute;m o arquivo <I>pgsql/src/tutorial/syscat.source</I>. Ele
-	 ilustra muitos dos comandos <SMALL>SELECT</SMALL>s necess&aacute;rios para obter
-	 informa&ccedil;&atilde;o das tabelas de sistema do banco de dados.</P>
-
-	 <H3 id="item4.3">4.3) Como voc&ecirc; muda o tipo de dado de uma coluna?</H3>
-
-	 <P>Mudar o tipo de dado de uma coluna pode ser feito facilmente na vers&atilde;o 8.0
-	 ou superior com <SMALL>ALTER TABLE ALTER COLUMN TYPE</SMALL>.</P>
-
-	 <P>Em vers&otilde;es anteriores, fa&ccedil;a isso:</P>
-<PRE>
-    BEGIN;
-    ALTER TABLE tab ADD COLUMN col_nova <i>novo_tipo_dado</i>;
-    UPDATE tab SET col_nova = CAST(col_antiga AS <i>novo_tipo_dado</i>);
-    ALTER TABLE tab DROP COLUMN col_antiga;
-    COMMIT;
-</PRE>
-	 <P>Voc&ecirc; pode ent&atilde;o querer fazer um <I>VACUUM FULL tab</I> para recuperar
-	 o espa&ccedil;o em disco utilizado pelos registros expirados.</P>
-
-    <H3 id="item4.4">4.4) Qual &eacute; o tamanho m&aacute;ximo de um registro, uma tabela e um banco de dados?</H3>
-
-    <P>Estes s&atilde;o os limites:</P>
-<BLOCKQUOTE>
-<TABLE>
-<TR><TD>Tamanho m&aacute;ximo de um banco de dados?</TD><TD>ilimitado (existem bancos de dados de 32 TB)</TD></TR>
-<TR><TD>Tamanho m&aacute;ximo de uma tabela?</TD><TD>32 TB</TD></TR>
-<TR><TD>Tamanho m&aacute;ximo de um registro?</TD><TD>400 GB</TD></TR>
-<TR><TD>Tamanho m&aacute;ximo de um campo?</TD><TD>1 GB</TD></TR>
-<TR><TD>N&uacute;mero m&aacute;ximo de registros em uma tabela?</TD><TD>ilimitado</TD></TR>
-<TR><TD>N&uacute;mero m&aacute;ximo de colunas em uma tabela?</TD><TD>250-1600 dependendo dos tipos das colunas</TD></TR>
-<TR><TD>N&uacute;mero m&aacute;ximo de &iacute;ndices em uma tabela?</TD><TD>ilimitado</TD></TR>
-</TABLE>
-</BLOCKQUOTE>
-
-	<P>&Eacute; claro, que eles n&atilde;o s&atilde;o ilimitados, mas limitados
-	ao espa&ccedil;o em disco dispon&iacute;vel e espa&ccedil;o em mem&oacute;ria/swap.
-	A Performance ser&aacute; penalizada quando estes valores se tornarem grandes.</P>
-
-	<P>O tamanho m&aacute;ximo de uma tabela com 32 TB n&atilde;o requer suporte a
-	arquivos grandes do sistema operacional. Tabelas grandes s&atilde;o armazenadas
-	como m&uacute;ltiplos arquivos de 1 GB ent&atilde;o o limite do sistema de
-	arquivos n&atilde;o &eacute; importante.</P>
-
-	<P>O tamanho m&aacute;ximo de uma tabela, o tamanho de um registro e o n&uacute;mero
-	m&aacute;ximo de colunas podem ser quadruplicados aumentando-se o tamanho padr&atilde;o
-	do bloco para 32k. O tamanho m&aacute;ximo de uma tabela pode tamb&eacute;m ser aumentado utilizando
-	particionamento de tabela.</P>
-
-	<P>Uma limita&ccedil;&atilde;o &eacute; que &iacute;ndices n&atilde;o podem ser criados em colunas maiores do que
-	2.000 caracteres. Felizmente, tais &iacute;ndices s&atilde;o raramente necess&aacute;rios. Unicidade &eacute;
-	melhor garantida por um &iacute;ndice de uma fun&ccedil;&atilde;o de um hash MD5 de uma coluna longa, e
-	indexa&ccedil;&atilde;o de texto longo permite a busca de palavras dentro da coluna.</P>
-
-    <H3 id="item4.5">4.5) Quanto espa&ccedil;o em disco &eacute; necess&aacute;rio para armazenar dados de um arquivo texto?</H3>
-
-    <P>Um banco de dados PostgreSQL ir&aacute; requerer at&eacute; cinco vezes a quantidade de espa&ccedil;o requerida para armazenar dados em um arquivo texto.</P>
-
-    <P>Como um exemplo, considere um arquivo com 100.000 linhas contendo um inteiro e uma descri&ccedil;&atilde;o em cada linha. Suponha que o tamanho m&eacute;dio da descri&ccedil;&atilde;o &eacute; de vinte bytes. O arquivo ter&aacute; 2,8 MB. O tamanho do arquivo do banco de dados PostgreSQL que cont&eacute;m esses dados pode ser estimado em 5,2 MB:</P>
-<PRE>
-    24 bytes: cada cabe&ccedil;alho de registro (aproximadamente)
-    24 bytes: um campo int e um campo texto
-   + 4 bytes: ponteiro na p&aacute;gina para a tupla
-   -------------------------------------------
-    52 bytes por registro
-
-   O tamanho de uma p&aacute;gina de dados no PostgreSQL &eacute; 8192 bytes (8 KB), ent&atilde;o:
-
-   8192 bytes por p&aacute;gina
-   ------------------------   =  158 registros por p&aacute;gina do banco de dados (arredondado para baixo)
-     52 bytes por registro
-
-   100000 registros de dados
-   ----------------------------  =  633 p&aacute;ginas do banco de dados (arredondado para cima)
-      158 registros por p&aacute;gina
-
-633 p&aacute;ginas do banco de dados * 8192 bytes por p&aacute;gina  =  5.185.536 bytes (5,2 MB)
-</PRE>
-
-	<P>&Iacute;ndices n&atilde;o requerem muito espa&ccedil;o, mas cont&eacute;m
-	dados que foram indexados, ent&atilde;o eles podem ocupar algum espa&ccedil;o.</P> 
-
-	<P><SMALL>NULL</SMALL>s s&atilde;o armazenados como bitmaps, ent&atilde;o eles
-	utilizam muito pouco espa&ccedil;o.</P>
-
-    <H3 id="item4.6">4.6) Por que minhas consultas est&atilde;o lentas? Por que elas n&atilde;o est&atilde;o utilizando meus &iacute;ndices?</H3>
-
-	<P>&Iacute;ndices n&atilde;o s&atilde;o utilizados por toda consulta. &Iacute;ndices s&atilde;o utilizados somente
-	se a tabela &eacute; maior do que um tamanho m&iacute;nimo, e a consulta seleciona somente uma
-	pequena porcentagem dos registros da tabela. Isto porque o acesso rand&ocirc;mico ao
-	disco causado pela busca indexada pode ser mais lento do que uma leitura ao longo
-	da tabela ou busca sequencial.</P>
-
-	<P>Para determinar se um &iacute;ndice deveria ser utilizado, o PostgreSQL deve ter
-	estat&iacute;sticas sobre a tabela. Estas estat&iacute;sticas s&atilde;o coletadas utilizando o
-	<SMALL>VACUUM ANALYZE</SMALL> ou simplesmente o <SMALL>ANALYZE</SMALL>.
-	Utilizando estat&iacute;sticas, o otimizador sbae quantos registros est&atilde;o na tabela,
-	e pode melhor determinar se &iacute;ndices deveriam ser utilizados.
-	Estat&iacute;sticas tamb&eacute;m s&atilde;o &uacute;teis para determinar a ordem de jun&ccedil;&atilde;o &oacute;tima e m&eacute;todos
-	de jun&ccedil;&atilde;o. Cole&ccedil;&atilde;o de estat&iacute;sticas deveriam ser feitas periodicamente a
-	medida que o conte&uacute;do da tabela muda.</P>
-
-	<P>&Iacute;ndices n&atilde;o s&atilde;o normalmente utilizados para <SMALL>ORDER BY</SMALL> ou para
-	fazer jun&ccedil;&otilde;es. Uma busca sequencial seguido por uma ordena&ccedil;&atilde;o expl&iacute;cita &eacute;
-	geralmente mais r&aacute;pida do que uma busca indexada em uma tabela grande.
-	Contudo, <SMALL>LIMIT</SMALL> combinado com <SMALL>ORDER BY</SMALL>
-	frequentemente utilizar&aacute; &iacute;ndice porque somente uma pequena por&ccedil;&atilde;o da tabela
-	ser&aacute; retornada.</P>
-
-	<P>Se voc&ecirc; acredita que o otimizador est&aacute; incorreto ao escolher uma busca
-	sequencial, utilize <CODE>SET enable_seqscan TO 'off'</CODE> e execute a
-	consulta novamente para ver se uma busca indexada &eacute; realmente mais r&aacute;pida.</P>
-
-	<P>Ao utilizar operadores curinga tais como <SMALL>LIKE</SMALL> ou <I>~</I>,
-	&iacute;ndices podem ser utilizados somente em algumas condi&ccedil;&otilde;es:</P>
-	<UL>
-	<LI>O in&iacute;cio da cadeia de caracteres da busca deve ser iniciar com uma
-	cadeia de caracteres, i.e.
-	<UL>
-	<LI>modelos <SMALL>LIKE</SMALL> n&atilde;o devem iniciar com <I>%</I>.</LI>
-	<LI>modelos <I>~</I> (express&otilde;es regulares) devem iniciar com <I>^</I>.</LI>
-	</UL></LI>
-	<LI>A cadeia de caracteres utilizada na busca n&atilde;o pode iniciar com a classe de
-	caracteres e.g. [a-e].</LI>
-	<LI>Busca que n&atilde;o diferenciam mai&uacute;sculas de min&uacute;sculas tais como <SMALL>ILIKE</SMALL> e 
-	<I>~*</I> n&atilde;o utilizam &iacute;ndices. Em vez disso, utilize &iacute;ndice de express&atilde;o, que
-	&eacute; descrito na se&ccedil;&atilde;o <a href="#item4.8">4.8</a>.</LI>
-	<LI>O idioma padr&atilde;o <I>C</I> deve ser usando durante o <i>initdb</i>
-	porque n&atilde;o &eacute; poss&iacute;vel saber o pr&oacute;ximo caracter em idiomas que n&atilde;o sejam o C.
-	Voc&ecirc; pode criar um &iacute;ndice especial <CODE>text_pattern_ops</CODE> para tais casos
-	que funcionam somente para indexa&ccedil;&atilde;o com <SMALL>LIKE</SMALL>. Tamb&eacute;m &eacute;
-	poss&iacute;vel utilizar indexa&ccedil;&atilde;o de busca textual para buscas por palavras.
-	</LI>
-	</UL>
-
-	<P>Em vers&otilde;es anteriores a 8.0, &iacute;ndices frequentemente n&atilde;o podem ser utilizados
-	a menos que os tipos de dados correspondam aos tipos de coluna do &iacute;ndice. Isto era
-	particularmente verdadeiro para &iacute;ndices de coluna int2, int8 e numeric.</P>
-
-    <H3 id="item4.7">4.7) Como eu vejo como o otimizador de consulta est&aacute; avaliando a minha consulta?</H3>
-
-    <P>Veja o comando <SMALL>EXPLAIN</SMALL> no manual.</P>
-
-    <H3 id="item4.8">4.8) Como eu fa&ccedil;o buscas com express&otilde;es regulares
-    e buscas com express&otilde;es regulares sem diferenciar mai&uacute;sculas de min&uacute;sculas? Como eu
-    utilizo um &iacute;ndice para buscas que n&atilde;o diferenciam mai&uacute;sculas de min&uacute;sculas?</H3>
-
-	<P>O operador <I>~</I> faz avalia&ccedil;&atilde;o de express&otilde;es regulares,
-	e <I>~*</I> faz avalia&ccedil;&atilde;o n&atilde;o sens&iacute;vel a mai&uacute;sculas
-	de express&otilde;es regulares. A variante n&atilde;o sens&iacute;vel a mai&uacute;sculas
-	do <SMALL>LIKE</SMALL> &eacute; chamada de <SMALL>ILIKE</SMALL>.</P>
-
-	<P>Compara&ccedil;&otilde;es de igualdade n&atilde;o sens&iacute;veis a mai&uacute;sculas
-	s&atilde;o normalmente expressadas como:</P>
-<PRE>
-    SELECT *
-    FROM tab
-    WHERE lower(col) = 'abc';
-</PRE>
-	Isso n&atilde;o ir&aacute; utilizar o &iacute;ndice padr&atilde;o. Contudo, se
-	voc&ecirc; criar um &iacute;ndice de express&atilde;o, ele ser&aacute; utilizado:
-<PRE>
-    CREATE INDEX tabindex ON tab (lower(col));
-</PRE>
-	<P>Se o &iacute;ndice acima &eacute; criado como <SMALL>UNIQUE</SMALL>, embora a
-	coluna possa armazenar caracteres mai&uacute;sculos e min&uacute;sculos, ele n&atilde;o
-	pode ter valores id&ecirc;nticos que diferem apenas em letras mai&uacute;sculas e min&uacute;sculas.
-	Para for&ccedil;ar uma letra mai&uacute;scula ou min&uacute;scula a ser armazenada na coluna, utilize
-	uma restri&ccedil;&atilde;o <SMALL>CHECK</SMALL> ou um gatilho.</P>
-
-	<H3 id="item4.9">4.9) Em uma consulta, como eu detecto se um campo &eacute; <SMALL>NULL</SMALL>? Como eu posso concatenar poss&iacute;veis <SMALL>NULL</SMALL>s? Como eu posso ordenar por um campo que &eacute; <SMALL>NULL</SMALL> ou n&atilde;o?</H3>
-
-    <P>Voc&ecirc; testa a coluna com <SMALL>IS NULL</SMALL> e <SMALL>IS
-    NOT NULL</SMALL>, como a seguir:</P>
-
-<PRE>
-   SELECT *
-   FROM tab
-   WHERE col IS NULL;
-</PRE>
-
-	<P>Para concatenar com poss&iacute;veis <SMALL>NULL</SMALL>s, utilize <I>COALESCE()</I>, assim:</P>
-<PRE>
-   SELECT COALESCE(col1, '') || COALESCE(col2, '')
-   FROM tab
-</PRE>
-
-	<P>Para ordenar pelo status <SMALL>NULL</SMALL>, utilize os modificadores
-	<SMALL>IS NULL</SMALL> e <SMALL>IS NOT NULL</SMALL> na sua cl&aacute;usula
-	<SMALL>ORDER BY</SMALL>. Coisas que s&atilde;o <I>verdadeiro</I> ser&atilde;o ordenadas acima
-	das coisas que s&atilde;o <I>falso</I>, ent&atilde;o a consulta a seguir ir&aacute; colocar
-	entradas NULL no in&iacute;cio da lista de resultados:</P>
-
-<PRE>
-   SELECT *
-   FROM tab
-   ORDER BY (col IS NOT NULL)
-</PRE>
-
-    <H3 id="item4.10">4.10) Qual &eacute; a diferen&ccedil;a entre os v&aacute;rios tipos de dado de caracteres?</H3>
-<BLOCKQUOTE>
-<TABLE>
-<TR><TH>Tipo</TH><TH>Nome Interno</TH><TH>Observa&ccedil;&atilde;o</TH></TR>
-<TR><TD>VARCHAR(n)</TD><TD>varchar</TD><TD>tamanho especifica o tamanho
-m&aacute;ximo, sem preenchimento</TD></TR>
-<TR><TD>CHAR(n)</TD><TD>bpchar</TD><TD>preenchimento em branco para
-comprimento fixo espec&iacute;fico</TD></TR>
-<TR><TD>TEXT</TD><TD>text</TD><TD>nenhum limite superior espec&iacute;fico no
-comprimento</TD></TR>
-<TR><TD>BYTEA</TD><TD>bytea</TD><TD>vetor de bytes de comprimento vari&aacute;vel
-(seguro a byte nulo)</TD></TR>
-<TR><TD>"char"</TD><TD>char</TD><TD>um caracter</TD></TR>
-</TABLE>
-</BLOCKQUOTE>
-
-	<P>Voc&ecirc; ver&aacute; o nome interno quando examinar o cat&aacute;logo do sistema e em algumas mensagens de erro.</P>
-
-	<P>Os primeiros quatro tipos acima s&atilde;o do tipo "varlena" (i.e., os primeiros quatro bytes no disco s&atilde;o o comprimento seguido pelos dados). Consequentemente o espa&ccedil;o atual utilizado &eacute; ligeiramente maior do que o tamanho declarado. Contudo, valores longos s&atilde;o tamb&eacute;m sujeitos a compress&atilde;o, ent&atilde;o o espa&ccedil;o em disco pode tamb&eacute;m ser bem menor do que o esperado.</P>
-
-	<SMALL>VARCHAR(n)</SMALL> &eacute; melhor quando est&aacute; armazenando cadeias de caracteres de comprimento vari&aacute;vel e h&aacute; um limite de tamanho desta cadeia. <SMALL>TEXT</SMALL> &eacute; para cadeias de caracteres de comprimento ilimitado, com o m&aacute;ximo de um gigabyte.
-	<P><SMALL>CHAR(n)</SMALL> &eacute; para armazenar cadeias de caracteres que s&atilde;o todas do mesmo tamanho. <SMALL>CHAR(n)</SMALL> preenche com espa&ccedil;os em branco at&eacute; o tamanho especificado, enquanto o <SMALL>VARCHAR(n)</SMALL> armazena somente os caracteres fornecidos. <SMALL>BYTEA</SMALL> &eacute; para armazenar dados bin&aacute;rios, particularmente valores que incluem bytes <SMALL>NULL</SMALL>. Todos os tipos descritos aqui tem caracter&iacute;sticas de performance similares.</P>
-
-    <H3 id="item4.11.1">4.11.1) Como eu crio um campo serial/auto incremento?</H3>
-
-	<P>PostgreSQL suporta o tipo de dados <SMALL>SERIAL</SMALL>. Ele cria
-	automaticamente uma sequ&ecirc;ncia. Por exemplo:</P>
-<PRE>
-    CREATE TABLE pessoa ( 
-        id   SERIAL, 
-        nome TEXT 
-    );
-</PRE>
-
-	&eacute; automaticamente traduzido em:
-<PRE>
-    CREATE SEQUENCE pessoa_id_seq;
-    CREATE TABLE pessoa ( 
-        id   INT4 NOT NULL DEFAULT nextval('pessoa_id_seq'),
-	nome TEXT 
-    );
-</PRE>
-
-	<P>Sequ&ecirc;ncias automaticamente criadas s&atilde;o nomeadas como
-	&lt;<i>tabela</i>&gt;_&lt;<i>colunaserial</i>&gt;_<i>seq</i>, onde
-	<i>tabela</i> e <i>colunaserial</i> s&atilde;o os nomes da tabela e
-	da coluna serial, respectivamente. Veja a p&aacute;gina sobre
-	<I>create_sequence</I> no manual para obter informa&ccedil;&otilde;es
-	adicionais sobre sequ&ecirc;ncias.
-
-    <H3 id="item4.11.2">4.11.2) Como eu consigo o valor de um campo
-    <SMALL>SERIAL</SMALL>?</H3>
-
-    <P>A maneira mais simples de obter o pr&oacute;ximo valor <SMALL>SERIAL</SMALL>
-    de uma sequ&ecirc;ncia &eacute; com <SMALL>RETURNING</SMALL>. Utilizando o
-    exemplo da tabela em <A href="#item4.11.1">4.11.1</A>, ele ficaria assim:
-
-<PRE>
-    INSERT INTO pessoa (nome) VALUES ('Blaise Pascal') RETURNING id;
-</PRE>
-
-    Voc&ecirc; tamb&eacute;m pode chamar <I>nextval()</I> e utilizar o valor no
-    <SMALL>INSERT</SMALL> ou chamar <I>currval()</I> <I>ap&oacute;s</I> o
-    <SMALL>INSERT</SMALL>.
-
-    <H3 id="item4.11.3">4.11.3) <I>currval()</I> n&atilde;o lida com condi&ccedil;&atilde;o de corrida com outros usu&aacute;rios?</H3>
-
-    <P>N&atilde;o. <I>currval()</I> retorna o valor atual atribuido pela sua sess&atilde;o, e n&atilde;o por todas as sess&otilde;es.</P>
-
-    <H3 id="item4.11.4">4.11.4) Por que os n&uacute;meros da minha sequ&ecirc;ncia n&atilde;o s&atilde;o reutilizados quando uma transa&ccedil;&atilde;o &eacute; abortada? Por que h&aacute; intervalos nos n&uacute;meros da minha sequ&ecirc;ncia/coluna SERIAL?</H3>
-
-    <P>Para melhorar a concorr&ecirc;ncia, valores da sequ&ecirc;ncia s&atilde;o atribu&iacute;dos a transa&ccedil;&otilde;es correntes e n&atilde;o s&atilde;o travados at&eacute; que a transa&ccedil;&atilde;o seja finalizada. Isso causa intervalos na numera&ccedil;&atilde;o por causa de transa&ccedil;&otilde;es abortadas.</P>
-
-    <H3 id="item4.12">4.12) O que &eacute; um <SMALL>OID</SMALL>? O que &eacute; um <SMALL>CTID</SMALL>?</H3>
-
-	<P>Se uma tabela &eacute; criada com <SMALL>WITH OIDS</SMALL>, cada registro recebe um <SMALL>OID</SMALL> &uacute;nico.
-	O<SMALL>ID</SMALL>s s&atilde;o automaticamente atribu&iacute;dos como inteiros de 4 bytes
-	que s&atilde;o &uacute;nicos ao longo de toda instala&ccedil;&atilde;o. Contudo, eles s&atilde;o limitados em
-	4 bilh&otilde;es e, ent&atilde;o, os O<SMALL>ID</SMALL>s come&ccedil;am a ser duplicados. O PostgreSQL
-	utiliza <SMALL>OID</SMALL>s para ligar as tabelas do sistema.</P>
-
-	<P>Para numerar registros nas tabelas do usu&aacute;rios, &eacute; melhor utilizar
-	<SMALL>SERIAL</SMALL> ao inv&eacute;s de O<SMALL>ID</SMALL>s porque
-	sequ&ecirc;ncias <SMALL>SERIAL</SMALL> s&atilde;o &uacute;nicas somente em uma tabela; e
-	s&atilde;o menos prop&iacute;cias a atingir o limite.
-	<SMALL>SERIAL8</SMALL> est&aacute; dispon&iacute;vel para armazenar valores de sequ&ecirc;ncias
-	com oito bytes.</P>
-
-	<P>C<SMALL>TID</SMALL>s s&atilde;o utilizados para identificar registros f&iacute;sicos
-	espec&iacute;ficos com valores de block e deslocamento. C<SMALL>TID</SMALL>s mudam
-	ap&oacute;s registros serem modificados ou recarregados. Eles s&atilde;o utilizados por
-	&iacute;ndices para apontar registros f&iacute;sicos.</P>
-
-    <H3 id="item4.13">4.13) Por que eu recebo o erro <I>"ERROR: Memory exhausted in AllocSetAlloc()"</I>?</H3>
-
-    <P>Voc&ecirc; provavelmente est&aacute; sem mem&oacute;ria virtual no seu sistema, ou o seu n&uacute;cleo (kernel) tem um limite baixo para certos recursos. Tente isto antes de iniciar o servidor PostgreSQL:</P>
-<PRE>
-    ulimit -d 262144
-    limit datasize 256m
-</PRE>
-
-    Dependendo da sua shell, somente um desses comando ter&aacute; sucesso, mas ele definir&aacute; o segmento de dados do seu processo com um limite maior e talvez permita que a consulta seja feita. Este comando &eacute; aplicado ao processo atual e todos os subprocessos criados depois do comando ser executado. Se voc&ecirc; tiver problemas com o cliente <SMALL>SQL</SMALL> porque o processo servidor retornou muitos dados, tente-o antes de iniciar o cliente.
-
-    <H3 id="item4.14">4.14) Como eu informo qual vers&atilde;o do PostgreSQL eu estou utilizando?</H3>
-
-    <P>No <I>psql</I>, digite <CODE>SELECT version();</CODE></P>
-
-    <H3 id="item4.15">4.15) Como eu crio uma coluna que conter&aacute; por padr&atilde;o a hora atual?</H3>
-
-    <P>Utilize <I>CURRENT_TIMESTAMP</I>:</P>
-<PRE>
-	CREATE TABLE teste (x int, modtime timestamp DEFAULT CURRENT_TIMESTAMP );
-</PRE>
-
-    <H3 id="item4.16">4.16) Como eu fa&ccedil;o uma jun&ccedil;&atilde;o externa (outer join)?</H3>
-
-    <P>PostgreSQL suporta jun&ccedil;&otilde;es externas utilizando a sintaxe padr&atilde;o do SQL. Aqui temos dois exemplos:</P>
-<PRE>
-    SELECT *
-    FROM t1 LEFT OUTER JOIN t2 ON (t1.col = t2.col);
-</PRE>
-    or 
-<PRE>
-    SELECT *
-    FROM t1 LEFT OUTER JOIN t2 USING (col);
-</PRE>
-
-	<P>Essas duas consultas ind&ecirc;nticas juntam t1.col com t2.col, e tamb&eacute;m
-	retornam qualquer registro que n&atilde;o foi juntado em t1 (aqueles que n&atilde;o
-	combinaram com t2). Uma jun&ccedil;&atilde;o a direita <SMALL>RIGHT</SMALL>
-	adicionaria registros que n&atilde;o foram juntados da tabela t2.
-	Uma jun&ccedil;&atilde;o completa (<SMALL>FULL</SMALL>) retornaria os registros
-	combinados mais todos os registros n&atilde;o combinados de t1 e t2.
-	A palavra <SMALL>OUTER</SMALL> &eacute; opcional e &eacute; assumida nas
-	jun&ccedil;&otilde;es <SMALL>LEFT</SMALL>, <SMALL>RIGHT</SMALL> e <SMALL>FULL</SMALL>.
-	Jun&ccedil;&otilde;es ordin&aacute;rias s&atilde;o chamadas jun&ccedil;&otilde;es
-	internas (<SMALL>INNER</SMALL>).</P>
-
-	<H3 id="item4.17">4.17) Como eu fa&ccedil;o consultas utilizando m&uacute;ltiplos bancos de dados?</H3>
-
-	<P>N&atilde;o h&aacute; outra maneira de consultar um banco de dados caso ele
-	n&atilde;o seja o atual. Porque o PostgreSQL carrega cat&aacute;logos do sistema
-	espec&iacute;ficos do banco de dados, &eacute; incerto como uma consulta em banco
-	de dados distintos pode se comportar.</P>
-
-	<P><I>contrib/dblink</I> permite consultas em bancos de dados distintos utilizando
-	chamadas de fun&ccedil;&otilde;es. &Eacute; claro, que um cliente pode fazer
-	conex&otilde;es simult&acirc;neas em bancos de dados diferentes e juntar os
-	resultados no cliente.</P>
-
-    <H3 id="item4.18">4.18) Como eu retorno m&uacute;ltiplos registros ou colunas de uma fun&ccedil;&atilde;o?</H3>
-
-	<P>&Eacute; f&aacute;cil utilizando fun&ccedil;&otilde;es que retornam conjunto,
-	<a href="http://www.postgresql.org/docs/techdocs.17">
-	http://www.postgresql.org/docs/techdocs.17</a>.</P>
-
-	<H3 id="item4.19">4.19) Por que eu obtenho erros "relation with OID ######
-	does not exist" ao acessar tabelas tempor&aacute;rias em fun&ccedil;&otilde;es PL/PgSQL?</H3>
-
-    <P>Em vers&otilde;es do PostgreSQL &lt; 8.3, PL/PgSQL armazena o conte&uacute;do da fun&ccedil;&atilde;o, e o efeito indesejado &eacute; que se uma fun&ccedil;&atilde;o PL/PgSQL acessa uma tabela tempor&aacute;ria, e aquela tabela &eacute; removida e criada novamente, e a fun&ccedil;&atilde;o &eacute; chamada novamente, a fun&ccedil;&atilde;o ir&aacute; falhar porque o conte&uacute;do armazenado da fun&ccedil;&atilde;o ainda apontar&aacute; para a tabela tempor&aacute;ria antiga. A solu&ccedil;&atilde;o &eacute; utilizar o <SMALL>EXECUTE</SMALL> para acesso a tabelas tempor&aacute;rias no PL/PgSQL. Isto ir&aacute; fazer com que a consulta seja avaliada toda vez.</P>
-
-    <P>Este problema n&atilde;o ocorre no PostgreSQL 8.3 ou superior.</P>
-
-    <H3 id="item4.20">4.20) Quais solu&ccedil;&otilde;es de replica&ccedil;&atilde;o est&atilde;o dispon&iacute;veis?</H3>
-
-	<P>Embora "replica&ccedil;&atilde;o" seja um termo simples, h&aacute; v&aacute;rias tecnologias para fazer
-	replica&ccedil;&atilde;o, com vantagens e desvantagens para cada um.</P>
-
-	<P>Replica&ccedil;&atilde;o mestre/escravo permite que um mestre receba consultas de leitura e
-	escrita, enquanto os escravos s&oacute; podem aceitar leitura/consultas <SMALL>SELECT</SMALL>.
-	A solu&ccedil;&atilde;o mais popular de replica&ccedil;&atilde;o mestre-escravo para PostgreSQL dispon&iacute;vel livremente
-	&eacute; <A href="http://main.slony.info">Slony-I</A>.</P>
-
-	<P>Replica&ccedil;&atilde;o com m&uacute;ltiplos mestres permite que consultas leitura/escrita sejam
-	enviadas para m&uacute;ltiplos computadores replicadores. Esta capacidade tamb&eacute;m tem
-	um s&eacute;rio impacto na performance por causa da necessidade de sincronizar as mudan&ccedil;as
-	entre os servidores. <A href="http://pgfoundry.org/projects/pgcluster/">PGCluster</a>
-	&eacute; a solu&ccedil;&atilde;o mais popular dispon&iacute;vel livremente para PostgreSQL.</P>
-
-	<P>H&aacute; tamb&eacute;m solu&ccedil;&otilde;es de replica&ccedil;&atilde;o comerciais e baseadas em hardware dispon&iacute;veis
-	que suportam uma variedade de modelos de replica&ccedil;&atilde;o.</P>
-
-	<H3 id="item4.21">4.21) Por que os nomes de minhas tabelas e colunas n&atilde;o
-	s&atilde;o reconhecidos em minha consulta? Por que as mai&uacute;sculas n&atilde;o s&atilde;o preservadas?</H3>
-
-	<P>A causa mais comum de nomes desconhecidos &eacute; o uso de aspas ao redor dos nomes da tabela ou coluna
-	durante a cria&ccedil;&atilde;o da tabela. Ao utilizar aspas, nomes de tabela e coluna
-	(chamados de identificadores) s&atilde;o armazenados <a
-	href="http://www.postgresql.org/docs/current/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS">
-	como especificado</a>, significando que voc&ecirc; deve utilizar aspas quando se
-	referir aos nomes na consulta. Algumas interfaces, como pgAdmin,
-	automaticamente colocam aspas nos identificadores durante a cria&ccedil;&atilde;o da tabela.
-	Ent&atilde;o, para identificadores serem reconhecidos, voc&ecirc; deve:
-	<UL>
-	<LI>Evitar colocar aspas no identificador ao criar tabelas</LI>
-	<LI>Utilizar somente caracteres min&uacute;sculos em identificadores</LI>
-	<LI>Colocar aspas em identificadores ao referenci&aacute;-los nas consultas</LI>
-	</UL>
-
-  </BODY>
-</HTML>
-
diff --git a/doc/src/FAQ/FAQ_chinese_simp.html b/doc/src/FAQ/FAQ_chinese_simp.html
deleted file mode 100644
index db0a0c306a..0000000000
--- a/doc/src/FAQ/FAQ_chinese_simp.html
+++ /dev/null
@@ -1,1011 +0,0 @@
-<!DOCTYPE html 

-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"

-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-

-<html>

-<head>

-

-  <title>PostgreSQL 常见问题（FAQ）</title>

-</head>

-

-

-

-<body>

-

-<h1> PostgreSQL 常见问题（FAQ） </h1>

-

-

-<p> 最近更新：2007 年 1 月 30 日 星期二 17:37:01 EST <br/>

-      中文版最近更新：2007 年 2 月 1 日 星期四 12:55:04 CST 

-</p>

-<p>   目前维护人员：Bruce Momjian (<a href="mailto:[email protected]">[email protected]</a>)<br/>

-   中文版维护人员：Daojing.Zhou（<a href="mailto:[email protected]">[email protected]</a>）

-</p>

-

-<p>

-   本文档的最新版本可以在

-   <a href="http://www.postgresql.org/files/documentation/faqs/FAQ.html">http://www.postgresql.org/files/documentation/faqs/FAQ.html</a>查看。

-</p>

-<p>

-   与操作系统平台相关的问题可在<a href="http://www.postgresql.org/docs/faq/">http://www.postgresql.org/docs/faq/</a>里找到答案。<br/>

-</p>

-<hr/>

-

-<h2><a name="常见问题"></a> 常见问题 </h2>

-

-

-<p>

-<a href="#1.1">1.1</a>)PostgreSQL 是什么？该怎么发音？<br/>

-<a href="#1.2">1.2</a>)谁控制和管理PostgreSQL ？<br/>

-<a href="#1.3">1.3</a>)PostgreSQL的版权是什么？<br/>

-<a href="#1.4">1.4</a>)PostgreSQL可以运行在哪些操作系统平台上？<br/>

-<a href="#1.5">1.5</a>)我从哪里能得到PostgreSQL？<br/>

-

-<a href="#1.6">1.6</a>)最新版的PostgreSQL 是什么？<br/>

-<a href="#1.7">1.7</a>)我从哪里能得到对PostgreSQL 的支持？<br/>

-<a href="#1.8">1.8</a>)我如何提交一个BUG报告？<br/>

-<a href="#1.9">1.9</a>)我如何了解已知的 BUG 或暂缺的功能？<br/>

-<a href="#1.10">1.10</a>)能够获取的最新文档有哪些？<br/>

-<a href="#1.11">1.11</a>)我应该怎样学习 SQL ？<br/>

-

-<a href="#1.12">1.12</a>)如何提交补丁或是加入开发队伍？<br/>

-<a href="#1.13">1.13</a>)PostgreSQL 和其他数据库系统比起来如何？<br/>

-<a href="#1.14">1.14</a>)PostgreSQL 可以处理最近各个国家夏时制的变化吗？<br/>

-</p>

-

-<h2><a name="用户客户端问题"></a> 用户客户端问题 </h2>

-<p>

-<a href="#2.1">2.1</a>)我们可以用什么语言和PostgreSQL 打交道？<br/>

-<a href="#2.2">2.2</a>)有什么工具可以把PostgreSQL 用于 Web 页面？<br/>

-

-<a href="#2.3">2.3</a>)PostgreSQL 拥有图形用户界面吗？<br/>

-</p>

-

-<h2><a name="系统管理问题"></a> 系统管理问题 </h2>

-<p>

-<a href="#3.1">3.1</a>)我怎样才能把PostgreSQL 装在 /usr/local/pgsql 以外的地方？<br/>

-<a href="#3.2">3.2</a>)我如何控制来自其他电脑的连接？<br/>

-<a href="#3.3">3.3</a>)我怎样调整数据库服务器以获得更好的性能？<br/>

-

-<a href="#3.4">3.4</a>)PostgreSQL 里可以获得什么样的调试特性？<br/>

-<a href="#3.5">3.5</a>)为什么在试图连接登录时收到“Sorry, too many clients” 消息？<br/>

-<a href="#3.6">3.6</a>)PostgreSQL的升级过程有哪些内容？<br/>

-<a href="#3.7">3.7</a>)(使用PostgreSQL)我需要使用什么计算机硬件 ？<br/>

-</p>

-

-<h2><a name="操作问题"></a> 操作问题 </h2>

-

-<p>

-<a href="#4.1">4.1</a>) 如何只选择一个查询结果的头几行？或是随机的一行？<br/>

-<a href="#4.2">4.2</a>) 如何查看表、索引、数据库以及用户的定义？如何查看<i>psql</i>里用到的查询指令并显示它们？<br/>

-<a href="#4.3">4.3</a>) 如何更改一个字段的数据类型？<br/>

-<a href="#4.4">4.4</a>) 单条记录，单个表，一个数据库的最大限制是多少？<br/>

-<a href="#4.5">4.5</a>) 存储一个典型的文本文件里的数据需要多少磁盘空间？<br/>

-

-<a href="#4.6">4.6</a>) 为什么我的查询很慢？为什么这些查询没有利用索引？<br/>

-<a href="#4.7">4.7</a>) 我如何才能看到查询优化器是怎样评估处理我的查询的？<br/>

-<a href="#4.8">4.8</a>) 我怎样做正则表达式搜索和大小写无关的正则表达式查找？怎样利用索引进行大小写无关查找？<br/>

-<a href="#4.9">4.9</a>) 在一个查询里，我怎样检测一个字段是否为 NULL？我如何才能准确排序而不论某字段是否含NULL值？<br/>

-<a href="#4.10">4.10</a>) 各种字符类型之间有什么不同？<br/>

-<a href="#4.11.1">4.11.1</a>) 我怎样创建一个序列号型或是自动递增的字段？<br/>

-

-<a href="#4.11.2">4.11.2</a>) 我如何获得一个插入的序列号的值？<br/>

-<a href="#4.11.3">4.11.3</a>) 同时使用 currval() 会导致和其他用户的冲突情况吗？<br/>

-<a href="#4.11.4">4.11.4</a>) 为什么不在事务异常中止后重用序列号呢？为什么在序列号字段的取值中存在间断呢？<br/>

-<a href="#4.12">4.12</a>) 什么是 OID？什么是 CTID ？<br/>

-<a href="#4.13">4.13</a>) 为什么我收到错误信息“<i>ERROR: Memory exhausted in AllocSetAlloc()</i>”？<br/>

-

-<a href="#4.14">4.14</a>) 我如何才能知道所运行的 PostgreSQL 的版本？<br/>

-<a href="#4.15">4.15</a>) 我如何创建一个缺省值是当前时间的字段？<br/>

-<a href="#4.16">4.16</a>) 如何执行外连接（outer join）查询？<br/>

-<a href="#4.17">4.17</a>) 如何执行涉及多个数据库的查询？<br/>

-<a href="#4.18">4.18</a>) 如何让函数返回多行或多列数据？<br/>

-<a href="#4.19">4.19</a>) 为什么我在使用PL/PgSQL函数存取临时表时会收到错误信息“relation with OID ##### does not exist”？<br/>

-

-<a href="#4.20">4.20</a>) 目前有哪些数据复制方案可用？<br/>

-<a href="#4.21">4.21</a>) 为何查询结果显示的表名或列名与我的查询语句中的不同？为何大写状态不能保留？<br/>

-</p>

-

-<hr/>

-

-<h2><a name="常见问题"></a> 常见问题 </h2>

-

-<h3> <a name="1.1"></a>1.1)PostgreSQL 是什么？该怎么发音？ </h3>

-

-

-<p>PostgreSQL 读作 <i>Post-Gres-Q-L</i>，有时候也简称为<i>Postgres</i> 。想听一下其发音的人员可从这里下载声音文件：

-   <a href="http://www.postgresql.org/files/postgresql.mp3">MP3 格式</a> 。

-</p>

-

-<p>PostgreSQL 是面向目标的关系数据库系统，它具有传统商业数据库系统的所有功能，同时又含有将在下一代 DBMS 系统的使用的增强特性。PostgreSQL 是自由免费的，并且所有源代码都可以获得。

-</p>

-

-<p>PostgreSQL 的开发队伍主要为志愿者，他们遍布世界各地并通过互联网进行联系，这是一个社区开发项目，它不被任何公司控制。

-   如想加入开发队伍，请参见开发人员常见问题（FAQ）

-   <a href="http://www.postgresql.org/files/documentation/faqs/FAQ_DEV.html">http://www.postgresql.org/files/documentation/faqs/FAQ_DEV.html</a>

-

-</p>

-

-<h3> <a name="1.2"></a>1.2) 谁控制PostgreSQL ？ </h3>

-<p>

-   如果你在寻找PostgreSQL的掌门人，或是什么中央委员会，或是什么所属公司，你只能放弃了---因为一个也不存在，但我们的确有一个

-   核心委员会和CVS管理组，但这些工作组的设立主要是为了进行管理工作而不是对PostgreSQL进行独占式控制，PostgreSQL项目是由任何人均

-   可参加的开发人员社区和所有用户控制的，你所需要做的就是订阅邮件列表，参与讨论即可（要参与PostgreSQL的开发详见

-   <a href="http://www.postgresql.org/docs/faqs.FAQ_DEV.html"> 开发人员常问题 (Developer's FAQ) </a>获取信息）。

-</p>

-

-

-<h3> <a name="1.3"></a>1.3)PostgreSQL的版权是什么? </h3>

-

-

-<p>PostgreSQL的发布遵从经典的BSD版权。它允许用户不限目的地使用PostgreSQL，甚至你可以销售PostgreSQL而不含源代码也可以，唯一的限制就是你不能因软件自身问题而向我们追诉法律责任，另外就是要求所有的软件拷贝中须包括以下版权声明。下面就是我们所使用的BSD版权声明内容：</p>

-

-<p>PostgreSQL数据库管理系统</p>

-

-<p>   部分版权（c）1996-2005，PostgreSQL 全球开发小组，部分版权（c）1994-1996 加州大学董事</p>

-

-<p>   （Portions copyright (c) 1996-2005,PostgreSQL Global Development Group Portions Copyright (c) 1994-6 Regents of the University of California）</p>

-

-<p>

-   允许为任何目的使用，拷贝，修改和分发这个软件和它的文档而不收取任何费用，

-   并且无须签署因此而产生的证明，前提是上面的版权声明和本段以及下面两段文字出现在所有拷贝中。

-

-</p>

-

-<p>

-   （Permission to use, copy, modify, and distribute this software and its           

-   documentation for any purpose, without fee, and without a written agreement is           

-   hereby granted, provided that the above copyright notice and this paragraph and           

-   the following two paragraphs appear in all copies.）

-</p>

-

-<p>

-   在任何情况下，加州大学都不承担因使用此软件及其文档而导致的对任何当事人的直接的，

-   间接的，特殊的，附加的或者相伴而生的损坏，包括利益损失的责任，即使加州大学已经建议了这些损失的可能性时也是如此。

-</p>

-

-<p>

-   （IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR           

-   DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST           

-   PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF           

-   THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH           

-   DAMAGE.）

-</p>

-

-

-<p>

-   加州大学明确放弃任何保证，包括但不局限于某一特定用途的商业和利益的隐含保证。

-   这里提供的这份软件是基于“当作是”的基础的，因而加州大学没有责任提供维护，支持，更新，增强或者修改的服务。

-</p>

-

-<p>

-   （THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT           

-   NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A           

-   PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND           

-   THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,           

-   SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.）<br/>          

-

-</p>

-

-<h3> <a name="1.4"></a>1.4)PostgreSQL 可以运行在哪些操作系统平台上？ </h3>

-

-<p>   一般说来，任何现在对 UNIX 兼容的操作系统之上都能运行PostgreSQL 。在安装指南里列出了发布时经过明确测试的平台。</p>

-

-

-<p>PostgreSQl也可以直接运行在基于微软Windows-NT的操作系统，如Win2000 SP4，WinXP 和 Win2003，已制作完成的安装包可从

-   <a href="http://pgfoundry.org/projects/pginstaller">http://pgfoundry.org/projects/pginstaller</a>下载，基于MSDOS的Windows操作系统

-   （Win95，Win98，WinMe）需要通过Cygwin模拟环境运行PostgreSQL。

-</p>

-

-<p>

-  同时也有一个为Novell Netware 6开发的版本可从 <a href="http://forge.novell.com" target="_top">http://forge.novell.com</a>获取，为OS/2(eComStation)开发的版本可从

-  <a href="http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&amp;button=Search&amp;key=postgreSQL&amp;stype=all&amp;sort=type&amp;dir=%2F" target="_top">http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&amp;button=Search&amp;key=postgreSQL&amp;stype=all&amp;sort=type&amp;dir=%2F</a> 下载。

-

-</p>

-

-<h3> <a name="1.5"></a>1.5) 我从哪里能得到PostgreSQL？ </h3>

-

-<p>

-  通过浏览器可从<a href="http://www.postgresql.org/ftp/">http://www.postgresql.org/ftp/</a>下载，也可通过FTP，从

-  <a href="ftp://ftp.PostgreSQL.org/pub/">ftp://ftp.PostgreSQL.org/pub/</a>站点下载。

-</p>

-

-<h3> <a name="1.6"></a>1.6) 最新版的PostgreSQL是什么？ </h3>

-

-

-<p>PostgreSQL 最新的版本是版本 8.2.1 。</p>

-

-<p>我们计划每年发布一个主要升级版本，每几个月发布一个小版本。</p>

-

-

-<h3> <a name="1.7"></a>1.7) 我从哪里能得到对PostgreSQL的支持？ </h3>

-

-<p>PostgreSQL社区通过邮件列表为其大多数用户提供帮助，订阅邮件列表的主站点是 <a href="http://www.postgresql.org/community/lists/" target="_top">http://www.postgresql.org/community/lists/</a>，一般情况下，先加入<i>General</i> 或 <i>Bug</i>邮件列表是一个较好的开始。

-</p>

-

-<p>

-   主要的IRC频道是在FreeNode(<i>irc.freenode.net</i>)的<i>#postgresql</i>，为了连上此频道，可以使用UNIX程序irc，其指令格式：

-   irc -c '#postgresql' "$USER" irc.freenode.net ，或者使用其他IRC客户端程序。在此网络中还存在一个PostgreSQL的西班牙频道(<i>#postgersql-es</i>)和法语频道

-   (<i>#postgresql-fr</i>)。同样地，在EFNET上也有一个PostgreSQL的交流频道。

-</p>

-

-<p>

-   可提供商业支持的公司列表可在<a href="http://techdocs.postgresql.org/companies.php" target="_top">http://techdocs.postgresql.org/companies.php</a>浏览。

-

-</p>

-

-

-

-<h3> <a name="1.8"></a>1.8) 我如何提交一个BUG报告？ </h3>

-

-<p>

-   可访问 <a href="http://www.postgresql.org/support/submitbug">http://www.postgresql.org/support/submitbug</a>，填写Bug上报表格即可，同样也可访问ftp站点<a href="ftp://ftp.PostgreSQL.org/pub/">ftp://ftp.PostgreSQL.org/pub/</a> 检查有无更新的PostgreSQL版本或补丁。

-</p>

-

-

-<p>

-通过使用Bug提交表格或是发往PostgreSQL邮件列表的Bug通常会有以下之一回复：

-</p>

-

-<ul>

-<li>所提交内容不是一个Bug及其不是Bug的原因。</li>

-<li>所提交内容是一个已知的Bug并且已经加入TODO待处理任务列表。</li>

-<li>所提交的Bug已在当前版本中被修正。</li>

-<li>所提交的Bug已修正但尚未将补丁加入现在的发布软件包。</li>

-<li>请求提交者提供更详细的信息：

-   <ul>

-   <li>操作系统</li>

-

-   <li>PostgreSQL版本</li>

-   <li>可重现Bug的测试案例</li>

-   <li>调试信息</li>

-   <li>调试跟踪输出</li>

-   </ul>

-</li>

-<li>所提交内容是一个新Bug，将执行以下工作：

-   <ul>

-

-   <li>创建一个新补丁并将其加入下一个主要版本或是小的改进版本中。</li>

-   <li>此Bug暂时不能修正，将被加至TODO待处理任务列表。</li>

-   </ul>

-</li>

-</ul>

-

-

-<h3> <a name="1.9"></a>1.9) 我如何了解已知的 BUG 或暂缺的功能？ </h3>

-<p>PostgreSQL 支持一个扩展的 SQL:2003 的子集。参阅我们的<a href="http://www.postgresql.org/docs/faqs.TODO.html">TODO</a> 列表，了解已知Bug列表、暂缺的功能和将来的开发计划。

-

-</p>

-

-<p>要求增加新功能的申请通常会收到以下之一的回复：</p>

-

-<ul>

-<li>该功能已加入TODO待处理任务列表。</li>

-<li>该功能不是必须的，因为：

-   <ul>

-   <li>它是现有的且符合SQL标准的某功能的重复。</li>

-   <li>该功能性会大大增加代码的复杂程序，而带来的好处是微不足道的。</li>

-   <li>该功能是不安全或是不可靠的。</li>

-

-   </ul>

-</li>

-<li>该功能将被加入TODO待处理任务列表。</li>

-</ul>

-

-<p>

-PostgreSQL不使用Bug跟踪系统，因为我们发现在邮件列表中直接回复以及保证TODO任务列表总是处于最新状态的方式工作效率会更高一些。事实上，Bug不会在我们的软件中存在很长时间，

-对影响很多用户的Bug也总是很快会被修正。唯一能找到所有改进、提高和修正的地方是CVS的日志信息，即使是在软件新版本的发布信息中也不会列出每一处的软件更新。

-</p>

-

-

-

-<h3> <a name="1.10"></a>1.10) 能够获取的最新文档有哪些？ </h3>

-

-

-<p>PostgreSQL包含大量的文档，主要有详细的参考手册，手册页和一些的测试例子。参见 /doc 目录（译注：应为 $PGHOME/doc）。

-   你还可以在线浏览PostgreSQL的手册，其网址是：<a href="http://www.PostgreSQL.org/docs">http://www.PostgreSQL.org/docs</a>。

-</p>

-

-<p>

-   有两本关于PostgreSQL的书在线提供，在

-   <a href="http://www.PostgreSQL.org/docs/awbook.html">http://www.PostgreSQL.org/docs/awbook.html</a>

-   和 <a href="http://www.commandprompt.com/ppbook/">http://www.commandprompt.com/ppbook/</a> 。

-   也有大量的PostgreSQL书籍可供购买，其中最为流行的一本是由Korry Douglas编写的。在 

-   <a href="http://techdocs.PostgreSQL.org/techdocs/bookreviews.php">http://techdocs.PostgreSQL.org/techdocs/bookreviews.php</a>上

-   上有大量有关PostgreSQL书籍的简介。

-   在 <a href="http://techdocs.PostgreSQL.org/">http://techdocs.PostgreSQL.org/</a>上收集了有关PostgreSQL的大量技术文章。

-

-</p>

-

-<p>

-   客户端的命令行程序<i>psql</i>有一些以 \d 开头的命令，可显示关于类型，操作符，函数，聚合等信息，使用 \? 可以显示所有可用的命令。

-</p>

-

-<p>

-   我们的 web 站点包含更多的文档。

-</p>

-

-

-

-<h3> <a name="1.11"></a>1.11) 我应该怎样学习 SQL ？ </h3>

-

-<p>

-   首先考虑上述提到的与PostgreSQL相关的书籍，另外一本是<i>Teach Yourself SQL in 21 Days, Second Edition</i>，其详细介绍的网址是 

-   <a href="http://members.tripod.com/er4ebus/sql/index.htm">http://members.tripod.com/er4ebus/sql/index.htm</a>，

-   我们的许多用户喜欢<i>The Practical SQL Handbook</i>， Bowman, Judith S. 编写，Addison-Wesley公司出版，其他的则喜欢

-   <i>The Complete Reference SQL</i>, Groff 编写，McGraw-Hill公司出版。

-</p>

-

-<p>在下列网址上也有很好的教程，他们是</p>

-<ul>

-<li><a href="http://www.intermedia.net/support/sql/sqltut.shtm">http://www.intermedia.net/support/sql/sqltut.shtm</a></li>

-<li><a href="http://sqlcourse.com/">http://sqlcourse.com.</a></li>

-<li><a href="http://www.w3schools.com/sql/default.asp">http://www.w3schools.com/sql/default.asp</a></li>

-<li><a href="http://mysite.verizon.net/Graeme_Birchall/id1.html">http://mysite.verizon.net/Graeme_Birchall/id1.html</a></li>

-</ul>

-

-

-

-<h3> <a name="1.12"></a>1.12)如何提交补丁或是加入开发队伍？ </h3>

-<p>

-   详见<a href="http://www.postgresql.org/docs/faqs.FAQ_DEV.html"> 开发人员常见问题 (Developer's FAQ) </a>。

-

-</p>

-

-

-<h3> <a name="1.13"></a>1.13)PostgreSQL和其他数据库系统比起来如何？ </h3>

-

-<p>

-评价软件有好几种方法：功能，性能，可靠性，支持和价格。

-</p>

-

-<dl>

-   <dt><b>功能</b></dt>

-   <dd>PostgreSQL 拥有大型商用数据库最多的功能，例如：事务，子查询，触发器，视图，外键参考完整性和复杂的锁定等。

-      我们还有一些它们没有的特性，如用户定义类型，继承，规则和多版本并行控制以减少锁的争用等。<br/>

-

-   </dd>

-

-   <dt><b>性能</b></dt>

-   <dd>PostgreSQL和其他商用和开源的数据库具有类似的性能。对某些处理它比较快，对其他一些处理它比较慢。

-      与其他数据库相比，我们的性能优劣通常在 +/- 10%之间。<br/>

-   </dd>

-

-   <dt><b>可靠性</b></dt>

-   <dd>

-

-      我们都知道数据库必须是可靠的，否则它就一点用都没有。我们努力做到发布经过认真测试的，缺陷最少的稳定代码。每个版本至少有一个月的 beta

-      测试时间，并且我们的发布历史显示我们可以提供稳定的，牢固的，可用于生产使用的版本。我们相信在这方面我们与其他的数据库软件是相当的。<br/>

-   </dd>

-

-   <dt><b>支持</b></dt>

-    <dd>

-      我们的邮件列表提供一个非常大的开发人员和用户的组以帮助解决所碰到的任何问题。我们不能保证总是能解决问题，相比之下，商用数据库软件也并不是总能够提供解决方法。

-      直接与开发人员，用户群，手册和源程序接触使PostgreSQL的支持比其他数据库还要好。还有一些商业性的全面技术支持，可以给提供给那些需要的人。（参阅1.7 小节）<br/>

-    </dd>

-

-

-    <dt><b>价格</b></dt>

-    <dd>

-      我们对任何用途都免费，包括商用和非商用目的。

-      你可以不加限制地向你的产品里加入我们的代码，除了那些我们在上面的版权声明里声明的 BSD版权之外的内容。

-    </dd>

-

-</dl>

-

-

-<h3><a name="1.14"></a>1.14) PostgreSQL可以处理最近各个国家夏时制的变化吗?</h3>

- 	 

-<p>PostgreSQL 8.0之前的版本是使用操作系统中的时区数据库来处理夏时制的信息，自8.0版及以后的版本PostgreSQL会自身含有最新的时区信息。</p>

-

-

-<hr/>

-

-

-<h2><a name="用户客户端问题"></a> 用户客户端问题 </h2>

-

-

-<h3> <a name="2.1"></a>2.1) 我们可以用什么语言和PostgreSQL打交道？ </h3>

-

-<p>PostgreSQL(缺省情况)只安装有C和内嵌式C的接口，其他的接口都是独立的项目，能够分别下载，这些接口项目独立的好处

-   是他们可以有各自的发布计划和各自独立的开发组。

-</p>

-<p>

-   一些编程语言如PHP都有访问PostgreSQL的接口，Perl、TCL、Python以及很多其他语言的接口在

-   <a href="http://gborg.postgresql.org" target="_top">http://gborg.postgresql.org</a>网站上的<i>Drivers/Interfaces</i>小节可找到，

-   并且通过Internet很容易搜索到。

-</p>

-

-

-

-

-<h3> <a name="2.2"></a>2.2) 有什么工具可以把PostgreSQL用于 Web 页面？ </h3>

-<p>

-   一个介绍以数据库为后台的挺不错的站点是：<a href="http://www.webreview.com">http://www.webreview.com</a>。

-</p>

-<p>

-   对于 Web 集成，PHP 是一个极好的接口。它在<a href="http://www.php.net/">http://www.php.net/</a>。

-

-</p>

-<p>

-   对于复杂的任务，很多人采用 Perl 接口和 使用CGI.pm的DBD::Pg 或 mod_perl 。

-</p>

-

-

-<h3> <a name="2.3"></a>2.3)PostgreSQL拥有图形用户界面吗？ </h3>

-<p>

-   商业用户或是开源开发人员能找到很多的有关PostgreSQL的GUI图形工具软件，在 <a href="http://www.postgresql.org/docs/techdocs.54">PostgreSQL社区文档</a>有一个详细的列表。

-</p>

-

-

-<hr/>

-

-

-

-<h2><a name="系统管理问题"></a> 系统管理问题 </h2>

-

-<h3> <a name="3.1"></a>3.1)我怎样能把PostgreSQL装在 /usr/local/pgsql 以外的地方？ </h3>

-<p>

-   在运行 configure 时加上 --prefix 选项。

-</p>

-

-

-

-<h3> <a name="3.2"></a>3.2) 我如何控制来自其他电脑的连接？ </h3>

-<p>

-   缺省情况下，PostgreSQL只允许来自本机且通过 unix 域套接字或TCP/IP方式的连接。

-   你只有在修改了配置文件<i>postgresql.conf</i>中的<i>listen_addresses</i>，且也在配置文件<i>$PGDATA/pg_hba.conf</i>中打开了

-   基于远程电脑（ host-based ）的身份认证，并重新启动PostgreSQL，否则其他电脑是不能与你的PostgreSQL服务器进行连接的。

-</p>

-

-

-<h3> <a name="3.3"></a>3.3) 我怎样调整数据库引擎以获得更好的性能？ </h3>

-

-

-<p>

-   有三个主要方面可以提升PostgreSQL的潜能。

-</p>

-

-<dl>

-   <dt><b>查询方式的变化</b></dt>

-   <dd>

-      这主要涉及修改查询方式以获取更好的性能:

-      <ul>

-      <li>创建索引，包括表达式和部分索引；</li>

-

-      <li>使用COPY语句代替多个Insert语句；</li>

-      <li>将多个SQL语句组成一个事务以减少提交事务的开销；</li>

-      <li>从一个索引中提取多条记录时使用CLUSTER；</li>

-      <li>从一个查询结果中取出部分记录时使用LIMIT；</li>

-      <li>使用预编译式查询（Prepared Query)；</li>

-      <li>使用ANALYZE以保持精确的优化统计；</li>

-

-      <li>定期使用 VACUUM 或 <i>pg_autovacuum</i></li>

-      <li>进行大量数据更改时先删除索引（然后重建索引）</li>

-      </ul>

-   </dd>

-

-   <dt><b>服务器的配置</b></dt>

-   <dd>

-

-      配置文件<i>postgres.conf</i>中的很多设置都会影响性能，所有参数的列表可见：

-      <a href="http://www.postgresql.org/docs/current/static/runtime.html">管理员指南/数据库服务器运行环境/数据库服务器运行配置</a>，

-      有关参数的解释可见：<a href="http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_conf_e.html" target="_top">http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_conf_e.html</a> 和 

-      <a href="http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html">http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html</a>。

-   </dd>

-

-   <dt><b>硬件的选择</b></dt>

-

-   <dd>

-      计算机硬件对性能的影响可浏览 

-      <a href="http://candle.pha.pa.us/main/writings/pgsql/hw_performance/index.html" target="_top">http://candle.pha.pa.us/main/writings/pgsql/hw_performance/index.html</a> 和 

-      <a href="http://www.powerpostgresql.com/PerfList/">http://www.powerpostgresql.com/PerfList/</a>。

-   </dd>

-

-</dl>

-

-

-<h3> <a name="3.4"></a>3.4)PostgreSQL里可以获得什么样的调试特性？ </h3>

-

-

-<p>PostgreSQL 有很多类似<code> log_* </code>的服务器配置变量可用于查询的打印和进程统计，而这些工作对调试和性能测试很有帮助。

-</p>

-

-

-

-<h3> <a name="3.5"></a>3.5) 为什么在试图连接时收到“Sorry, too many clients（已有太多用户连接）”消息？ </h3>

-<p>

-   这表示你已达到缺省100个并发后台进程数的限制，你需要通过修改<i>postgresql.conf</i>文件中的<i>max_connections</i>值来

-   增加postmaster的后台并发处理数，修改后需重新启动<i>postmaster</i>。

-

-</p>

-

-

-<h3> <a name="3.6"></a>3.6)PostgreSQL的升级过程有哪些内容 ？ </h3>

-<p>

- PostgreSQL 开发组对每次小版本的升级主要只做了一些Bug修正工作，因此从 7.4.8 升级到 7.4.9 不需要 dump 和 restore，仅需要停止数据库服务器，安装更新后的软件包，然后重启服务器即可。

-</p>

-<p>

-   所有PostgreSQL的用户应该在最接近（你所使用的主版本）的小改进版本发布尽快升级。尽管每次升级可能都有一点风险，PostgreSQL的小改进版仅仅是设计用来修正一些Bug的，代码改动较少，所以风险还是很小的。PostgreSQL社区认为一般情况下不升级的风险还是多于升级的。

-</p>

-<p>

-   主版本的升级（例如从 7.3 到 7.4）通常会修改系统表和数据表的内部格式。

-   这些改变一般比较复杂，因此我们不维持数据文件的向后兼容性。因此从老版本中进行数据导出（dump）/然后在新版本中进行数据导入（reload）对主版本的升级是必须的。

-

-</p>

-

-<h3> <a name="3.7"></a>3.7)(使用PostgreSQL)我需要使用什么计算机硬件 ？ </h3>

-<p>

-   由于计算机硬件大多数是兼容的，人们总是倾向于相信所有计算机硬件质量也是相同的。事实上不是，

-   ECC RAM（带奇偶校验的内存），SCSI （硬盘）和优质的主板比一些便宜货要更加可靠且具有更好的性能。PostgreSQL几乎可以运行在任何硬件上，

-   但如果可靠性和性能对你的系统很重要，你就需要全面的研究一下你的硬件配置了。在我们的邮件列表上也有关于

-   硬件配置和性价比的讨论。

-</p>

-

-

-<hr/>

-

-<h2><a name="操作问题"></a> 操作问题 </h2>

-

-

-

-<h3> <a name="4.1"></a>4.1) 如何只选择一个查询结果的头几行？或是随机的一行？ </h3>

-<p>

-      如果你只是要提取几行数据，并且你在执行查询中知道确切的行数，你可以使用LIMIT功能。

-      如果有一个索引与 <i> ORDER BY</i>中的条件匹配，PostgreSQL 可能就只处理要求的头几条记录，

-      （否则将对整个查询进行处理直到生成需要的行）。如果在执行查询功能时不知道确切的记录数，

-      可使用游标(cursor)和FETCH功能。

-</p>

-<p>

-      可使用以下方法提取一行随机记录的：

-</p>

-<pre>

-      SELECT  cols

-      FROM tab

-      ORDER BY random()

-      LIMIT 1 ;

-

-</pre>

-

-

-

-<h3> <a name="4.2"></a>4.2) 如何查看表、索引、数据库以及用户的定义？如何查看<i>psql</i>里用到的查询指令并显示它们？ </h3>

-<p>

-   在<i>psql</i>中使用 \dt 命令来显示数据表的定义，要了解<i>psql</i>中的完整命令列表可使用\? ，另外，你也可以阅读 <i>psql</i> 的源代码

-   文件<i>pgsql/src/bin/psql/describe.c</i>，它包括为生成<i>psql</i>反斜杠命令的输出的所有 SQL 命令。你还可以带 <i>-E</i> 选项启动 <i>psql</i>，

-   这样它将打印出你在<i>psql</i>中所给出的命令执行时的内部实际使用的SQL查询语句。PostgreSQL也提供了一个兼容SQL的INFORMATION SCHEMA接口，

-   你可以从这里获取关于数据库的信息。

-

-</p>

-<p>

-   在系统中也有一些以<i>pg_</i> 打头的系统表也描述了表的定义。

-</p>

-<p>

-   使用 <i>psql -l</i> 指令可以列出所有的数据库。

-</p>

-<p>

-   也可以浏览一下 <i>pgsql/src/tutorial/syscat.source</i>文件，它列举了很多可从数据库系统表中获取信息的SELECT语法。

-

-</p>

-

-

-<h3> <a name="4.3"></a>4.3) 如何更改一个字段的数据类型？ </h3>

-<p>

-   在8.0版本里更改一个字段的数据类型很容易，可使用 ALTER TABLE ALTER COLUMN TYPE 。

-</p>

-<p>

-   在以前的版本中，可以这样做：

-</p>

-<pre>

-   BEGIN;

-    ALTER TABLE tab ADD COLUMN new_col new_data_type;

-    UPDATE tab SET new_col = CAST(old_col AS new_data_type);

-    ALTER TABLE tab DROP COLUMN old_col;

-    COMMIT;

-

-</pre>

-<p>

-   你然后可以使用<i>VACUUM FULL tab </i>指令来使系统收回无效数据所占用的空间。

-</p>

-

-<h3> <a name="4.4"></a>4.4) 单条记录，单个表，单个数据库的最大限制是多少？ </h3>

-<p>

-   下面是一些限制：

-</p>

-<blockquote>

-   <table>

-

-   <tbody>

-      <tr><td>单个数据库最大尺寸？</td><td>无限制（已存在有 32TB 的数据库）</td></tr>

-      <tr><td>单个表的最大尺寸？</td><td>32 TB</td></tr>

-      <tr><td>一行记录的最大尺寸？</td><td>1.6 TB</td></tr>

-      <tr><td>一个字段的最大尺寸?</td><td>1 GB</td></tr>

-

-      <tr><td>一个表里最大行数？</td><td>无限制</td></tr>

-      <tr><td>一个表里最大列数？</td><td>250-1600 （与列类型有关）</td></tr>

-      <tr><td>一个表里的最大索引数量？</td><td>无限制</td></tr>

-   </tbody>

-</table>

-</blockquote>

-

-

-<p>

-   当然，实际上没有真正的无限制，还是要受可用磁盘空间、可用内存/交换区的制约。

-   事实上，当上述这些数值变得异常地大时，系统性能也会受很大影响。

-</p>

-

-<p>

-   单表的最大大小  32 TB 不需要操作系统对单个文件也需这么大的支持。大表用多个 1 GB 的文件存储，因此文件系统大小的限制是不重要的。

-</p>

-<p>

-   如果缺省的块大小增长到 32K ，最大的单表大小和最大列数还可以增加到四倍。

-</p>

-<p>

-   有一个限制就是不能对大小多于2000字节的列创建索引。幸运地是这样的索引很少用到。通过对多字节列的内容进行MD5哈稀运算结果进行函数索引可对列的唯一性得到保证，

-   并且全文检索允许对列中的单词进行搜索。

-</p>

-

-

-<h3> <a name="4.5"></a>4.5) 存储一个典型的文本文件里的数据需要多少磁盘空间？ </h3>

-<p>

-   一个 Postgres 数据库（存储一个文本文件）所占用的空间最多可能需要相当于这个文本文件自身大小5倍的磁盘空间。

-</p>

-<p>

-   例如，假设有一个 100,000 行的文件，每行有一个整数和一个文本描述。

-   假设文本串的平均长度为20字节。文本文件占用 2.8 MB。存放这些数据的PostgreSQL数据库文件大约是 6.4 MB:

-</p>

-<pre>

-     28 字节: 每行的头（大约值）

-     24 字节: 一个整数型字段和一个文本型字段

-   +  4 字节: 页面内指向元组的指针

-   ----------------------------------------

-     56 字节每行

-

-   PostgreSQL 数据页的大小是 8192 字节 (8 KB)，则：

-

-   8192 字节每页

-   -------------------   =  146 行/数据页（向下取整）

-     56 字节每行

-

-   100000 数据行

-   --------------------  =  685 数据页（向上取整）

-      146 行/数据页

-

-   685 数据页 * 8192 字节/页  = 5,611,520 字节（5.6 MB）

-</pre>

-

-

-<p>

-   索引不需要这么多的额外消耗，但也确实包括被索引的数据，因此它们也可能很大。

-</p>

-<p>

-   空值<i>NULL</i>存放在位图中，因此占用很少的空间。

-</p>

-

-<h3> <a name="4.6"></a>4.6) 为什么我的查询很慢？为什么这些查询没有利用索引？ </h3>

-<p>

-   并非每个查询都会自动使用索引。只有在表的大小超过一个最小值，并且查询只会选中表中较小比例的记录时才会采用索引。

-   这是因为索引扫描引起的随即磁盘存取可能比直接地读取表（顺序扫描）更慢。

-

-</p>

-<p>

-   为了判断是否使用索引，PostgreSQL必须获得有关表的统计值。这些统计值可以使用 VACUUM ANALYZE，或 ANALYZE 获得。

-   使用统计值，优化器知道表中有多少行，就能够更好地判断是否利用索引。

-   统计值对确定优化的连接顺序和连接方法也很有用。在表的内容发生变化时，应定期进行统计值的更新收集。

-</p>

-<p>

-   索引通常不用于 ORDER BY 或执行连接。对一个大表的一次顺序扫描再做一次排序通常比索引扫描要快。然而，如果将 LIMIT 和 ORDER BY 

-   结合在一起使用的话，通常将会使用索引，因为这时仅返回表中的一小部分记录。

-</p>

-<p>

-   如果你确信PostgreSQL的优化器使用顺序扫描是不正确的，你可以使用<code>SET enable_seqscan TO 'off'</code>指令来关闭顺序扫描，

-   然后再次运行查询，你就可以看出使用一个索引扫描是否确实要快一些。

-</p>

-

-<p>

-

-   当使用通配符操作，例如 <i>LIKE</i> 或 <i>~</i> 时，索引只能在特定的情况下使用：

-</p>

-<ul>

-   <li>字符串的开始部分必须是普通字符串，也就是说：

-      <ul>

-      <li> <i>LIKE</i> 模式不能以 <i>%</i> 打头。</li>

-

-      <li> <i>~</i> （正则表达式）模式必须以 <i>^</i> 打头。</li>

-      </ul>

-   </li>

-   <li>字符串不能以匹配多个字符的模式类打头，例如 [a-e]。</li>

-   <li>大小写无关的查找，如 ILIKE 和 ~* 等不使用索引，但可以用 <a href="#4.8">4.8</a> 节描述的表达式索引。</li>

-

-   <li>在做 initdb 时必须采用缺省的本地设置 C locale，因为系统不可能知道在非C locale情况时下一个最大字符是什么。

-      在这种情况下，你可以创建一个特殊的<code>text_pattern_ops</code>索引来用于<small>LIKE</small>的索引。

-   </li>

-</ul>

-<p>

-   在8.0之前的版本中，除非要查询的数据类型和索引的数据类型相匹配，否则索引经常是未被用到，特别是对int2,int8和数值型的索引。

-</p>

-

-<h3> <a name="4.7"></a>4.7) 我如何才能看到查询优化器是怎样评估处理我的查询？ </h3>

-

-

-<p>参考 <small>EXPLAIN</small> 手册页。</p>

-

-<h3> <a name="4.8"></a>4.8) 我怎样做正则表达式搜索和大小写无关的正则表达式查找？怎样利用索引进行大小写无关查找？ </h3>

-<p>

-   操作符 <i> ~ </i> 处理正则表达式匹配，而 <i>~*</i> 处理大小写无关的正则表达式匹配。大小写无关的 LIKE 变种成为 ILIKE。

-

-</p>

-<p>

-   大小写无关的等式比较通常写做：

-</p>

-<pre>

-    SELECT *

-    FROM tab

-    WHERE lower(col) = 'abc';

-</pre>

-

-<p>

-   这样将不会使用标准的索引。但是可以创建一个在这种情况下使用的表达式索引:

-</p>

-<pre>

-    CREATE INDEX tabindex ON tab (lower(col));

-

-</pre>

-<p>

-   如果上述索引在创建时加入UNIQUE约束，虽然索引字段自身内容可以存储大小写不限的内容，但如果有UNIQUE约束后，这些内容不能仅仅是大小写不同（否则会造成冲突）。为了保证不发生这种情况，可以使用CHECK约束条件或是触发器在录入时进行限制。

-</p>

-

-

-<h3> <a name="4.9"></a>4.9) 在一个查询里，我怎样检测一个字段是否为 <i>NULL</i> ？我如何才能准确排序而不论某字段是否含 <i>NULL</i> 值？ </h3>

-<p>

-

-   用 <small>IS NULL</small> 和 <small>IS NOT NULL</small> 测试这个字段，具体方法如下：

-</p>

-<pre>   SELECT *

-   FROM tab

-   WHERE col IS NULL;

-</pre>

-

-<p>为了能对含 <small>NULL</small>字段排序，可在 <small>ORDER BY</small> 条件中使用 <small>IS NULL</small>和

-   <small>IS NOT NULL</small> 修饰符，条件为真 <i>true</i> 将比条件为假<i>false</i> 排在前面，下面的例子就会将含

-   NULL 的记录排在结果的上面部分：

-

-</p>

-<pre>   SELECT *

-   FROM tab

-   ORDER BY (col IS NOT NULL)

-</pre>

-

-<h3> <a name="4.10"></a>4.10) 各种字符类型之间有什么不同？ </h3>

-<blockquote>

-   <table>

-   <tbody>

-      <tr><th>类型</th><th>内部名称</th><th>说明</th></tr>

-

-      <tr><td>VARCHAR(n)</td><td>varchar</td><td>指定了最大长度，变长字符串，不足定义长度的部分不补齐</td></tr>

-      <tr><td>CHAR(n)</td><td>bpchar</td><td>定长字符串，实际数据不足定义长度时，以空格补齐</td></tr>

-      <tr><td>TEXT</td><td>text</td><td>没有特别的上限限制（仅受行的最大长度限制）</td></tr>

-      <tr><td>BYTEA</td><td>bytea</td><td>变长字节序列（使用NULL字符也是允许的）</td></tr>

-

-      <tr><td>"char"</td><td>char</td><td>单个字符</td></tr>

-      </tbody>

-   </table>

-</blockquote>

-

-<p>

-   在系统表和在一些错误信息里你将看到内部名称。

-</p>

-<p>

-   上面所列的前四种类型是"varlena"（变长）类型（也就是说，开头的四个字节是长度，后面才是数据）。

-   于是实际占用的空间比声明的大小要多一些。

-   然而这些类型如定义很长时都可以被压缩存储，因此磁盘空间也可能比预想的要少。

-

-</p>

-<p>

-   <small>VARCHAR(n)</small> 在存储限制了最大长度的变长字符串是最好的。

-   <small>TEXT</small> 适用于存储最大可达 1G左右但未定义限制长度的字符串。

-</p>

-<p>

-   <small>CHAR(n)</small> 最适合于存储长度相同的字符串。 <small>CHAR(n)</small>会根据所给定的字段长度以空格补足（不足的字段内容），

-   而 <small>VARCHAR(n)</small> 只存储所给定的数据内容。

-   <small>BYTEA</small> 用于存储二进制数据，尤其是包含 NULL 字节的值。这些类型具有差不多的性能。

-

-</p>

-

-

-

-<h3> <a name="4.11.1"></a>4.11.1) 我怎样创建一个序列号或是自动递增的字段？ </h3>

-<p>PostgreSQL 支持 SERIAL 数据类型。（字段定义为SERIAL后）将自动创建一个序列生成器，例如：

-</p>

-<pre>

-   CREATE TABLE person ( 

-      id   SERIAL, 

-      name TEXT 

-   );

-</pre>

-<p>

-   会自动转换为以下SQL语句：

-</p>

-

-<pre>

-   CREATE SEQUENCE person_id_seq;

-   CREATE TABLE person ( 

-      id   INT4 NOT NULL DEFAULT nextval('person_id_seq'),

-      name TEXT

-   );

-</pre>

-<p>

-   参考 create_sequence 手册页获取关于序列生成器的更多信息。

-</p>

-

-

-<h3> <a name="4.11.2"></a>4.11.2) 我如何获得一个插入的序列号的值？ </h3>

-<p>

-   一种方法是在插入之前先用函数 nextval() 从序列对象里检索出下一个 SERIAL 值，然后再用此值精确地插入。使用

-   <a href="#4.11.1"> 4.11.1</a> 里的例表，可用伪码这样描述：

-

-</p>

-<pre>

-   new_id = execute("SELECT nextval('person_id_seq')");

-   execute("INSERT INTO person (id, name) VALUES (new_id, 'Blaise Pascal')");

-</pre>

-<p>

-   这样还能在其他查询中使用存放在 new_id 里的新值（例如，作为参照 person 表的外键）。

-   注意自动创建的 SEQUENCE 对象的名称将会是  &lt;<i>table</i>&gt;_&lt;<i>serialcolumn</i>&gt;_<i>seq</i>，

-   这里 table 和 serialcolumn 分别是你的表的名称和你的 SERIAL 字段的名称。

-</p>

-<p>

-   类似的，在 SERIAL 对象缺省插入后你可以用函数 currval() 检索刚赋值的 SERIAL 值，例如：

-

-</p>

-<pre>

-   execute("INSERT INTO person (name) VALUES ('Blaise Pascal')");

-   new_id = execute("SELECT currval('person_id_seq')");

-</pre>

-

-<h3> <a name="4.11.3"></a>4.11.3) 同时使用 <i>currval()</i> 会导致和其他用户的冲突情况吗？ </h3>

-<p>

-   不会。<i>currval()</i> 返回的是你本次会话进程所赋的值而不是所有用户的当前值。<br/>

-

-</p>

-

-<h3> <a name="4.11.4"></a>4.11.4) 为什么不在事务异常中止后重用序列号呢？为什么在序列号字段的取值中存在间断呢？ </h3>

-<p>

-   为了提高并发性，序列号在需要的时候赋予正在运行的事务，并且在事务结束之前不进行锁定，

-   这就会导致异常中止的事务后，序列号会出现间隔。

-</p>

-

-<h3> <a name="4.12"></a>4.12) 什么是 <small>OID</small> ？什么是 <small>CTID</small> ？ </h3>

-

-

-<p>PostgreSQL 里创建的每一行记录都会获得一个唯一的<small>OID</small>，除非在创建表时使用<small>WITHOUT OIDS</small>选项。

-   <small>OID</small>创建时会自动生成一个4字节的整数，所有 OID 在相应PostgreSQL服务器中均是唯一的。 然而，它在超过40亿时将溢出，

-   <small>OID</small>此后会出现重复。PostgreSQL 在它的内部系统表里使用 OID 在表之间建立联系。

-</p>

-<p>   

-   在用户的数据表中，最好是使用<small>SERIAl</small>来代替<small>OID</small>

-

-   因为<small>SERIAL</small>只要保证在单个表中的数值是唯一的就可以了，这样它溢出的可能性就非常小了，

-   <small>SERIAL8</small>可用来保存8字节的序列数值。

-</p>

-

-<p>

-   <small>CTID</small> 用于标识带着数据块（地址）和（块内）偏移的特定的物理行。

-   <small>CTID</small> 在记录被更改或重载后发生改变。索引数据使用它们指向物理行。

-</p>

-

-

-

-<h3> <a name="4.13"></a>4.13) 为什么我收到错误信息“<i>ERROR: Memory exhausted in AllocSetAlloc()</i>”？ </h3>

-<p>

-   这很可能是系统的虚拟内存用光了，或者内核对某些资源有较低的限制值。在启动 postmaster 之前试试下面的命令：

-</p>

-<pre>

-   ulimit -d 262144

-   limit datasize 256m

-</pre>

-<p>

-   取决于你用的 shell，上面命令只有一条能成功，但是它将把你的进程数据段限制设得比较高，

-   因而也许能让查询完成。这条命令应用于当前进程，以及所有在这条命令运行后创建的子进程。

-   如果你是在运行SQL客户端时因为后台返回了太多的数据而出现问题，请在运行客户端之前执行上述命令。

-

-</p>

-

-<h3> <a name="4.14"></a>4.14) 我如何才能知道所运行的PostgreSQL的版本？ </h3>

-<p>

-   从 psql 里，输入 <code>SELECT version();</code>指令。

-</p>

-

-<h3> <a name="4.15"></a>4.15) 我如何创建一个缺省值是当前时间的字段？ </h3>

-<p>

-   使用 CURRENT_TIMESTAMP：

-

-</p>

-<pre>

-   CREATE TABLE test (x int, modtime TIMESTAMP DEFAULT CURRENT_TIMESTAMP );

-</pre>

-

-

-<h3> <a name="4.16"></a>4.16) 我怎样进行 outer join （外连接）？ </h3>

-<p>PostgreSQL 采用标准的 SQL 语法支持外连接。这里是两个例子：</p>

-<pre>

-   SELECT *

-   FROM t1 LEFT OUTER JOIN t2 ON (t1.col = t2.col);

-</pre>

-<p>或是</p>

-

-<pre>

-   SELECT *

-   FROM t1 LEFT OUTER JOIN t2 USING (col);

-</pre>

-<p>

-   这两个等价的查询在 t1.col 和 t2.col 上做连接，并且返回 t1 中所有未连接的行（那些在 t2 中没有匹配的行）。

-   右[外]连接（RIGHT OUTER JOIN）将返回 t2 中未连接的行。

-   完全外连接（FULL OUTER JOIN）将返回 t1 和 t2 中未连接的行。

-   关键字 OUTER 在左[外]连接、右[外]连接和完全[外]连接中是可选的，普通连接被称为内连接（INNER JOIN）。

-</p>

-

-

-<h3> <a name="4.17"></a>4.17) 如何使用涉及多个数据库的查询？ </h3>

-<p>

-   没有办法查询当前数据库之外的数据库。

-   因为PostgreSQL要加载与数据库相关的系统目录（系统表），因此跨数据库的查询如何执行是不定的。

-</p>

-

-<p>

-   附加增值模块contrib/dblink允许采用函数调用实现跨库查询。当然用户也可以同时连接到不同的数据库执行查询然后在客户端合并结果。

-</p>

-

-<h3> <a name="4.18"></a>4.18) 如何让函数返回多行或多列数据？ </h3>

-<p>

-   在函数中返回数据记录集的功能是很容易使用的，详情参见：

-   <a href="http://techdocs.postgresql.org/guides/SetReturningFunctions">http://techdocs.postgresql.org/guides/SetReturningFunctions</a>

-</p>

-

-<h3> <a name="4.19"></a>4.19) 为什么我在使用PL/PgSQL函数存取临时表时会收到错误信息“relation with OID ##### does not exist”？ </h3>

-

-<p>

-   PL/PgSQL会缓存函数的脚本内容，由此带来的一个不好的副作用是若一个 PL/PgSQL

-    函数访问了一个临时表，然后该表被删除并重建了，则再次调用该函数将失败，

-   因为缓存的函数内容仍然指向旧的临时表。解决的方法是在 PL/PgSQL 中用<small>EXECUTE</small>

-    对临时表进行访问。这样会保证查询在执行前总会被重新解析。

-</p>

-

-<h3> <a name="4.20"></a>4.20) 目前有哪些数据复制方案可用？ </h3>

-<p>

-   “复制”只是一个术语，有好几种复制技术可用，每种都有优点和缺点：

-</p>

-<p>

-

-   主/从复制方式是允许一个主服务器接受读/写的申请，而多个从服务器只能接受读/<small>SELECT</small>查询的申请，

-   目前最流行且免费的主/从PostgreSQL复制方案是 

-   <a href="http://gborg.postgresql.org/project/slony1/projdisplay.php">Slony-I </a>。

-</p>

-<p>

-   多个主服务器的复制方式允许将读/写的申请发送给多台的计算机，这种方式由于需要在多台服务器之间同步数据变动

-   可能会带来较严重的性能损失，<a href="http://pgfoundry.org/projects/pgcluster/">Pgcluster</a>是目前这种方案

-   中最好的，而且还可以免费下载。

-</p>

-<p>

-   也有一些商业需付费和基于硬件的数据复制方案，支持上述各种复制模型。

-</p>

-

-

-<h3> <a name="4.21">4.21</a>) 为何查询结果显示的表名或列名与我的查询语句中的不同？为何大写状态不能保留？ </h3>

-

-<p>

-   最常见的原因是在创建表时对表名或是列名使用了双引号“”，当使用了双引号后，表名或列名（称为标识符）存储时是区分

-<a href="http://www.postgresql.org/docs/8.0/static/sql-syntax.html#SQL-SYNTAX-IDENTIFIERS">大小写的</a>，

-   这意谓着你在查询时表名或列名也应使用双引号，一些工具软件，像pgAdmin会在发出创建表的指令时自动地在每个标识符上加双引号。

-   因此，为了标识符的统一，你应该：

-</p>

-<ul>

-<li>在创建表时避免将标识符使用双引号引起来。</li>

-<li>在标识符中只使用小写字母。</li>

-

-<li>（为了与已存在的标识符相同）在查询中使用双引号将标识符引起来。</li>

-</ul>

-

-</body>

-

-</html>
\ No newline at end of file
diff --git a/doc/src/FAQ/FAQ_chinese_trad.html b/doc/src/FAQ/FAQ_chinese_trad.html
deleted file mode 100644
index 9a56180a08..0000000000
--- a/doc/src/FAQ/FAQ_chinese_trad.html
+++ /dev/null
@@ -1,1003 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html>

-<head>

-

-  <title>PostgreSQL 常见问题（FAQ）</title>

-</head>

-

-

-

-<body>

-

-<h1> PostgreSQL 常見問題（FAQ） </h1>

-

-

-<p> 最近更新：2007 年 2 月 8 日 星期二 22:43:13 EST <br/>

-      中文版最近更新：2007 年 2 月 12 日 星期一 12:00:04 CST 

-</p>

-<p>   當前維護人員：Bruce Momjian (<a href="mailto:[email protected]">[email protected]</a>)<br/>

-   正體中文版維護人員：郭朝益(ChaoYi, Kuo)（<a href="mailto:[email protected]">[email protected]</a>）</p>

-

-<p>

-   本文檔的最新版本可以在

-   <a href="http://www.postgresql.org/files/documentation/faqs/FAQ.html">http://www.postgresql.org/files/documentation/faqs/FAQ.html</a> 查看。

-</p>

-<p>

-   與作業系統平台相關的問題可在 <a href="http://www.postgresql.org/docs/faq/">http://www.postgresql.org/docs/faq/</a> 裡找到答案。<br/>

-</p>

-<hr/>

-

-<h2><a name="常見問題"> 常見問題 </a></h2>

-

-

-<p>

-<a href="#1.1">1.1</a>)PostgreSQL 是什麼？該怎麼發音？<br/>

-<a href="#1.2">1.2</a>)誰控制和管理PostgreSQL ？<br/>

-<a href="#1.3">1.3</a>)PostgreSQL的版權是什麼？<br/>

-<a href="#1.4">1.4</a>)PostgreSQL可以運行在哪些作業系統平台上？<br/>

-<a href="#1.5">1.5</a>)我從哪裡能得到PostgreSQL？<br/>

-

-<a href="#1.6">1.6</a>)最新版的 PostgreSQL 是什麼？<br/>

-<a href="#1.7">1.7</a>)我從哪裡能得到對 PostgreSQL 的支持？<br/>

-<a href="#1.8">1.8</a>)我如何提交一個 BUG 報告？<br/>

-<a href="#1.9">1.9</a>)我如何瞭解已知的 BUG 或暫缺的功能？<br/>

-<a href="#1.10">1.10</a>)能夠獲取的最新文檔有哪些？<br/>

-<a href="#1.11">1.11</a>)我應該怎樣學習 SQL ？<br/>

-

-<a href="#1.12">1.12</a>)如何提交補丁或是加入開發隊伍？<br/>

-<a href="#1.13">1.13</a>)PostgreSQL 和其他資料庫系統比起來如何？<br/>

-<a href="#1.14">1.14</a>)PostgreSQL 可以處理最近各個國家夏時制的變化嗎？<br/>

-</p>

-

-<h2><a name="用戶客戶端問題"> 用戶客戶端問題 </a></h2>

-<p>

-<a href="#2.1">2.1</a>)我們可以用什麼語言和 PostgreSQL 進行溝通？<br/>

-<a href="#2.2">2.2</a>)有什麼工具可以把 PostgreSQL 用於 Web 頁面？<br/>

-

-<a href="#2.3">2.3</a>)PostgreSQL 擁有圖形用戶界面(GUI)嗎？<br/>

-</p>

-

-<h2><a name="系統管理問題"> 系統管理問題 </a></h2>

-<p>

-<a href="#3.1">3.1</a>)我怎樣才能把 PostgreSQL 裝在 /usr/local/pgsql 以外的地方？<br/>

-<a href="#3.2">3.2</a>)我如何控制來自其他電腦的連接？<br/>

-<a href="#3.3">3.3</a>)我怎樣調整資料庫伺服器以獲得更好的性能？<br/>

-

-<a href="#3.4">3.4</a>)PostgreSQL 裡可以獲得什麼樣的調試特性？<br/>

-<a href="#3.5">3.5</a>)為什麼在試圖連接登錄時收到「Sorry, too many clients」 訊息？<br/>

-<a href="#3.6">3.6</a>)PostgreSQL 的升級過程有哪些內容？<br/>

-<a href="#3.7">3.7</a>)(使用 PostgreSQL )我需要使用什麼電腦硬體？<br/>

-</p>

-

-<h2><a name="操作問題"> 操作問題 </a></h2>

-

-<p>

-<a href="#4.1">4.1</a>) 如何只選擇一個查詢結果的頭幾行？或是隨機的一行？<br/>

-<a href="#4.2">4.2</a>) 如何查看表、索引、資料庫以及用戶的定義？如何查看<i> psql</i> 裡用到的查詢指令並顯示它們？<br/>

-<a href="#4.3">4.3</a>) 如何更改一個欄位的資料類型？<br/>

-<a href="#4.4">4.4</a>) 單筆記錄，單一表，一個資料庫的最大限制是多少？<br/>

-<a href="#4.5">4.5</a>) 存儲一個典型的文本文件裡的資料需要多少磁碟空間？<br/>

-

-<a href="#4.6">4.6</a>) 為什麼我的查詢很慢？為什麼這些查詢沒有利用索引？<br/>

-<a href="#4.7">4.7</a>) 我如何才能看到查詢優化器是怎樣評估處理我的查詢的？<br/>

-<a href="#4.8">4.8</a>) 我怎樣做正則表達式搜索和大小寫無關的正則表達式查找？怎樣利用索引進行大小寫無關查找？<br/>

-<a href="#4.9">4.9</a>) 在一個查詢裡，我怎樣檢測一個欄位是否為 NULL？我如何才能準確排序而不論某欄位是否含NULL值？<br/>

-<a href="#4.10">4.10</a>) 各種字符類型之間有什麼不同？<br/>

-<a href="#4.11.1">4.11.1</a>) 我怎樣創建一個序列號型或是自動遞增的欄位？<br/>

-

-<a href="#4.11.2">4.11.2</a>) 我如何獲得一個插入的序列號的值？<br/>

-<a href="#4.11.3">4.11.3</a>) 同時使用 currval() 會導致和其他用戶的衝突情況嗎？<br/>

-<a href="#4.11.4">4.11.4</a>) 為什麼不在事務異常中止後重用序列號呢？為什麼在序列號欄位的取值中存在間斷呢？<br/>

-<a href="#4.12">4.12</a>) 什麼是 OID？什麼是 CTID ？<br/>

-<a href="#4.13">4.13</a>) 為什麼我收到錯誤資訊「<i>ERROR: Memory exhausted in AllocSetAlloc()</i>」？<br/>

-

-<a href="#4.14">4.14</a>) 我如何才能知道所運行的 PostgreSQL 的版本？<br/>

-<a href="#4.15">4.15</a>) 我如何創建一個預設值是當前時間的欄位？<br/>

-<a href="#4.16">4.16</a>) 如何執行外連接（outer join）查詢？<br/>

-<a href="#4.17">4.17</a>) 如何執行涉及多個資料庫的查詢？<br/>

-<a href="#4.18">4.18</a>) 如何讓函數返回多行或多列資料？<br/>

-<a href="#4.19">4.19</a>) 為什麼我在使用 PL/PgSQL 函數存取臨時表時會收到錯誤資訊「relation with OID ##### does not exist」？<br/>

-

-<a href="#4.20">4.20</a>) 目前有哪些資料複寫(replication)方案可用？<br/>

-<a href="#4.21">4.21</a>) 為何查詢結果顯示的表名或欄名與我的查詢語句中的不同？為何大寫狀態不能保留？<br/>

-</p>

-

-<hr/>

-

-<h2><a name="常見問題"> 常見問題 </a></h2>

-

-<h3><a name="常見問題"> </a><a name="1.1">1.1) PostgreSQL 是什麼？該怎麼發音？ </a></h3>

-

-

-<p><a name="1.1">PostgreSQL 讀作 <i>Post-Gres-Q-L</i>，有時候也簡稱為<i>Postgres</i> 。想聽一下其發音的人員可從這裡下載聲音文件：

-   </a><a href="http://www.postgresql.org/files/postgresql.mp3">MP3 格式</a> 。

-</p>

-

-<p>PostgreSQL 是面向目標的關係資料庫系統，它具有傳統商業資料庫系統的所有功能，同時又含有將在下一代 DBMS 系統的使用的增強特性。PostgreSQL 是自由免費的，並且所有源代碼都可以獲得。

-</p>

-

-<p>PostgreSQL 的開發隊伍主要為志願者，他們遍佈世界各地並通過互聯網進行聯繫，這是一個社區開發項目，它不被任何公司控制。

-   如想加入開發隊伍，請參見開發人員常見問題（FAQ）

-   <a href="http://www.postgresql.org/files/documentation/faqs/FAQ_DEV.html">http://www.postgresql.org/files/documentation/faqs/FAQ_DEV.html</a>

-

-</p>

-

-<h3> <a name="1.2">1.2) 誰控制 PostgreSQL ？ </a></h3>

-<p>

-<a name="1.2">   如果你在尋找PostgreSQL的掌門人，或是什麼中央委員會，或是什麼所屬公司，你只能放棄了---因為一個也不存在，但我們的確有一個

-   核心委員會和CVS管理組，但這些工作組的設立主要是為了進行管理工作而不是對PostgreSQL進行獨佔式控制，PostgreSQL項目是由任何人均

-   可參加的開發人員社區和所有用戶控制的，你所需要做的就是訂閱郵件列表，參與討論即可（要參與PostgreSQL的開發詳見

-  </a><a href="http://www.postgresql.org/docs/faqs.FAQ_DEV.html"> 開發人員常問題 (Developer's FAQ) </a>獲取資訊）。

-</p>

-

-

-<h3> <a name="1.3">1.3) PostgreSQL 的版權是什麼? </a></h3>

-

-

-<p><a name="1.3">PostgreSQL的發布遵從經典的 BSD 版權。它允許用戶不限目的地使用 PostgreSQL，甚至你可以銷售

-PostgreSQL 而不含源代碼也可以，唯一的限制就是你不能因軟體自身問題而向我們追訴法律責任，另外就是要求所有的軟體拷貝中須包括以下版權聲明。

-下面就是我們所使用的BSD版權聲明內容：</a></p>

-

-<p><a name="1.3">PostgreSQL 資料庫管理系統</a></p>

-

-<p><a name="1.3">   部分版權（c）1996-2005，PostgreSQL 全球開發小組，部分版權（c）1994-1996 加州大學董事</a></p>

-

-<p><a name="1.3"> （Portions copyright (c) 1996-2005,PostgreSQL Global

-Development Group Portions Copyright (c) 1994-6 Regents of the

-University of California）</a></p>

-

-<p>

-<a name="1.3">   允許為任何目的使用，拷貝，修改和分發這個軟體和它的文檔而不收取任何費用，

-   並且無須簽署因此而產生的證明，前提是上面的版權聲明和本段以及下面兩段文字出現在所有拷貝中。

-

-</a></p>

-

-<p>

-<a name="1.3">   （Permission to use, copy, modify, and distribute this software and its           

-   documentation for any purpose, without fee, and without a written agreement is           

-   hereby granted, provided that the above copyright notice and this paragraph and           

-   the following two paragraphs appear in all copies.）

-</a></p>

-

-<p>

-<a name="1.3">   在任何情況下，加州大學都不承擔因使用此軟體及其文檔而導致的對任何當事人的直接的，

-   間接的，特殊的，附加的或者相伴而生的損壞，包括利益損失的責任，即使加州大學已經建議了這些損失的可能性時也是如此。

-</a></p>

-

-<p>

-<a name="1.3">   （IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR           

-   DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST           

-   PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF           

-   THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH           

-   DAMAGE.）

-</a></p>

-

-

-<p>

-<a name="1.3">   加州大學明確放棄任何保證，包括但不局限於某一特定用途的商業和利益的隱含保證。

-   這裡提供的這份軟體是基於「當作是」的基礎的，因而加州大學沒有責任提供維護，支持，更新，增強或者修改的服務。

-</a></p>

-

-<p>

-<a name="1.3">   （THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT           

-   NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A           

-   PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND           

-   THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,           

-   SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.）<br/>          

-

-</a></p>

-

-<h3><a name="1.3"> </a><a name="1.4">1.4) PostgreSQL 可以運行在哪些作業系統平台上？ </a></h3>

-

-<p><a name="1.4">   一般說來，任何現在對 UNIX 相容的作業系統之上都能運行 PostgreSQL 。在安裝指南裡列出了發佈時經過明確測試的平台。</a></p>

-

-

-<p><a name="1.4">PostgreSQL 也可以直接運行在基於微軟 Windows-NT 的作業系統，如 Win2000 SP4，WinXP 和 Win2003，已製作完成的安裝包可從

-   </a><a href="http://pgfoundry.org/projects/pginstaller">http://pgfoundry.org/projects/pginstaller</a>下載，基於MSDOS的Windows作業系統

-   （Win95，Win98，WinMe）需要通過Cygwin模擬環境運行PostgreSQL。

-</p>

-

-<p>

-  同時也有一個為 Novell Netware 6 開發的版本可從 <a href="http://forge.novell.com" target="_top">http://forge.novell.com</a> 獲取，為OS/2(eComStation)開發的版本可從

-  <a href="http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&amp;button=Search&amp;key=postgreSQL&amp;stype=all&amp;sort=type&amp;dir=%2F" target="_top">http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&amp;button=Search&amp;key=postgreSQL&amp;stype=all&amp;sort=type&amp;dir=%2F</a> 下載。

-

-</p>

-

-<h3> <a name="1.5">1.5) 我從哪裡能得到 PostgreSQL？ </a></h3>

-

-<p>

-<a name="1.5">  通過瀏覽器可從 </a><a href="http://www.postgresql.org/ftp/">http://www.postgresql.org/ftp/</a> 下載，也可通過FTP，從

-  <a href="ftp://ftp.PostgreSQL.org/pub/">ftp://ftp.PostgreSQL.org/pub/</a> 站點下載。

-</p>

-

-<h3> <a name="1.6">1.6) 最新版的 PostgreSQL 是什麼？ </a></h3>

-

-

-<p><a name="1.6">PostgreSQL 最新的版本是版本 8.2.3 。</a></p>

-

-<p><a name="1.6">我們計劃每年發佈一個主要升級版本，每幾個月發佈一個小版本。</a></p>

-

-

-<h3><a name="1.6"> </a><a name="1.7">1.7) 我從哪裡能得到對 PostgreSQL 的支持？ </a></h3>

-

-<p><a name="1.7">PostgreSQL社區通過郵件列表為其大多數用戶提供幫助，訂閱郵件列表的主站點是 </a><a href="http://www.postgresql.org/community/lists/" target="_top">http://www.postgresql.org/community/lists/</a>，一般情況下，先加入<i>General</i> 或 <i>Bug</i>郵件列表是一個較好的開始。

-</p>

-

-<p>

-   主要的IRC頻道是在FreeNode(<i>irc.freenode.net</i>)的<i>#postgresql</i>，為了連上此頻道，可以使用 UNIX 程序 irc，其指令格式：

-   irc -c '#postgresql' "$USER" irc.freenode.net ，或者使用其他IRC客戶端程序。在此網絡中還存在一個 PostgreSQL 的西班牙頻道(<i>#postgersql-es</i>)和法語頻道

-   (<i>#postgresql-fr</i>)。同樣地，在 EFNET 上也有一個 PostgreSQL 的交流頻道。

-</p>

-

-<p>

-   可提供商業支持的公司列表可在 <a href="http://techdocs.postgresql.org/companies.php" target="_top">http://techdocs.postgresql.org/companies.php</a> 瀏覽。

-

-</p>

-

-

-

-<h3> <a name="1.8">1.8) 我如何提交一個 BUG 報告？ </a></h3>

-

-<p>

-<a name="1.8">   可訪問 </a><a href="http://www.postgresql.org/support/submitbug">http://www.postgresql.org/support/submitbug</a>，填寫 Bug 上報表格即可，同樣也可訪問 ftp 站點 <a href="ftp://ftp.PostgreSQL.org/pub/">ftp://ftp.PostgreSQL.org/pub/</a> 檢查有無更新的PostgreSQL 版本或補丁。

-</p>

-

-

-<p>

-通過使用 Bug 提交表格或是發往 PostgreSQL 郵件列表的 Bug 通常會有以下之一回覆：

-</p>

-

-<ul>

-<li>所提交內容不是一個 Bug 及其不是 Bug 的原因。</li>

-<li>所提交內容是一個已知的 Bug 並且已經加入 TODO 待處理任務列表。</li>

-<li>所提交的 Bug 已在當前版本中被修正。</li>

-<li>所提交的 Bug 已修正但尚未將補丁加入現在的發布軟體包。</li>

-<li>請求提交者提供更詳細的資訊：

-   <ul>

-   <li>作業系統</li>

-

-   <li>PostgreSQL 版本</li>

-   <li>可重現 Bug 的測試案例</li>

-   <li>調試資訊</li>

-   <li>調試跟蹤輸出</li>

-   </ul>

-</li>

-<li>所提交內容是一個新 Bug，將執行以下工作：

-   <ul>

-

-   <li>創建一個新補丁並將其加入下一個主要版本或是小的改進版本中。</li>

-   <li>此 Bug 暫時不能修正，將被加至 TODO 待處理任務列表。</li>

-   </ul>

-</li>

-</ul>

-

-

-<h3> <a name="1.9">1.9) 我如何瞭解已知的 BUG 或暫缺的功能？ </a></h3>

-<p><a name="1.9">PostgreSQL 支持一個擴展的 SQL:2003 的子集。參閱我們的</a><a href="http://www.postgresql.org/docs/faqs.TODO.html"> TODO</a> 列表，瞭解已知 Bug 列表、暫缺的功能和將來的開發計劃。

-

-</p>

-

-<p>要求增加新功能的申請通常會收到以下之一的回覆：</p>

-

-<ul>

-<li>該功能已加入 TODO 待處理任務列表。</li>

-<li>該功能不是必須的，因為：

-   <ul>

-   <li>它是現有的且符合 SQL 標準的某功能的重複。</li>

-   <li>該功能性會大大增加代碼的複雜程序，而帶來的好處是微不足道的。</li>

-   <li>該功能是不安全或是不可靠的。</li>

-

-   </ul>

-</li>

-<li>該功能將被加入 TODO 待處理任務列表。</li>

-</ul>

-

-<p>

-PostgreSQL 不使用 Bug 跟蹤系統，因為我們發現在郵件列表中直接回覆以及保證 TODO 任務列表總是處於最新狀態的方式工作效率會更高一些。事實上，Bug不會在我們的軟體中存在很長時間，

-對影響很多用戶的Bug也總是很快會被修正。唯一能找到所有改進、提高和修正的地方是 CVS 的日誌資訊，即使是在軟體新版本的發布資訊中也不會列出每一處的軟體更新。

-</p>

-

-

-

-<h3> <a name="1.10">1.10) 能夠獲取的最新文檔有哪些？ </a></h3>

-

-

-<p><a name="1.10">PostgreSQL 包含大量的文檔，主要有詳細的參考手冊，手冊頁和一些的測試例子。參見 /doc 目錄（譯註：應為 $PGHOME/doc）。

-   你還可以在線瀏覽 PostgreSQL 的手冊，其網址是：</a><a href="http://www.PostgreSQL.org/docs">http://www.PostgreSQL.org/docs</a>。

-</p>

-

-<p>

-   有兩本關於PostgreSQL的書在線提供，在 

-   <a href="http://www.postgresql.org/docs/books/awbook.html">http://www.postgresql.org/docs/books/awbook.html</a>

-   和 <a href="http://www.commandprompt.com/ppbook/">http://www.commandprompt.com/ppbook/</a> 。

-   也有大量的 PostgreSQL 書籍可供購買，其中最為流行的一本是由 Korry Douglas 編寫的。在 

-   <a href="http://techdocs.PostgreSQL.org/techdocs/bookreviews.php">http://techdocs.PostgreSQL.org/techdocs/bookreviews.php</a>上

-   上有大量有關 PostgreSQL 書籍的簡介。

-   在 <a href="http://techdocs.PostgreSQL.org/">http://techdocs.PostgreSQL.org/</a> 上收集了有關 PostgreSQL 的大量技術文章。</p>

-

-<p>

-   客戶端的命令行程序<i>psql</i>有一些以 \d 開頭的命令，可顯示關於類型，操作符，函數，聚合等資訊，使用 \? 可以顯示所有可用的命令。

-</p>

-

-<p>

-   我們的 web 站點包含更多的文檔。

-</p>

-

-

-

-<h3> <a name="1.11">1.11) 我應該怎樣學習 SQL ？ </a></h3>

-

-<p>

-<a name="1.11">   首先考慮上述提到的與PostgreSQL相關的書籍，另外一本是 <i>Teach Yourself SQL in 21 Days, Second Edition</i>，其詳細介紹的網址是 

-  </a><a href="http://members.tripod.com/er4ebus/sql/index.htm">http://members.tripod.com/er4ebus/sql/index.htm</a>，

-   我們的許多用戶喜歡<i>The Practical SQL Handbook</i>， Bowman, Judith S. 編寫，Addison-Wesley公司出版，其他的則喜歡

-   <i>The Complete Reference SQL</i>, Groff 編寫，McGraw-Hill 公司出版。

-</p>

-

-<p>在下列網址上也有很好的教程，他們是</p>

-<ul>

-<li><a href="http://www.intermedia.net/support/sql/sqltut.shtm">http://www.intermedia.net/support/sql/sqltut.shtm</a></li>

-<li><a href="http://sqlcourse.com/">http://sqlcourse.com.</a></li>

-<li><a href="http://www.w3schools.com/sql/default.asp">http://www.w3schools.com/sql/default.asp</a></li>

-<li><a href="http://mysite.verizon.net/Graeme_Birchall/id1.html">http://mysite.verizon.net/Graeme_Birchall/id1.html</a></li>

-</ul>

-

-

-

-<h3> <a name="1.12">1.12)如何提交補丁或是加入開發隊伍？ </a></h3>

-<p>

-<a name="1.12">   詳見</a><a href="http://www.PostgreSQL.org/docs/awbook.html"> 開發人員常見問題 (Developer's FAQ) </a>。</p>

-

-

-<h3> <a name="1.13">1.13) PostgreSQL 和其他資料庫系統比起來如何？ </a></h3>

-

-<p>

-<a name="1.13">評價軟體有好幾種方法：功能，性能，可靠性，支持和價格。

-</a></p>

-

-<dl>

-<a name="1.13">   <dt><b>功能</b></dt>

-   <dd>PostgreSQL 擁有大型商用資料庫最多的功能，例如：事務，子查詢，觸發器，視圖，外鍵參考完整性和複雜的鎖定等。

-      我們還有一些它們沒有的特性，如用戶定義類型，繼承，規則和多版本並行控制以減少鎖的爭用等。<br/>

-

-   </dd>

-

-   <dt><b>性能</b></dt>

-   <dd>PostgreSQL和其他商用和開源的資料庫具有類似的性能。對某些處理它比較快，對其他一些處理它比較慢。

-      與其他資料庫相比，我們的性能優劣通常在 +/- 10%之間。<br/>

-   </dd>

-

-   <dt><b>可靠性</b></dt>

-   <dd>

-

-      我們都知道資料庫必須是可靠的，否則它就一點用都沒有。我們努力做到發佈經過認真測試的，缺陷最少的穩定代碼。每個版本至少有一個月的 beta

-      測試時間，並且我們的發布歷史顯示我們可以提供穩定的，牢固的，可用於生產使用的版本。我們相信在這方面我們與其他的資料庫軟體是相當的。<br/>

-   </dd>

-

-   <dt><b>支持</b></dt>

-    <dd>

-      我們的郵件列表提供一個非常大的開發人員和用戶的組以幫助解決所碰到的任何問題。我們不能保證總是能解決問題，相比之下，商用資料庫軟體也並不是總能夠提供解決方法。

-      直接與開發人員，用戶群，手冊和源程序接觸使PostgreSQL的支持比其他資料庫還要好。還有一些商業性的全面技術支持，可以給提供給那些需要的人。（參閱1.7 小節）<br/>

-    </dd>

-

-

-    <dt><b>價格</b></dt>

-    <dd>

-      我們對任何用途都免費，包括商用和非商用目的。

-      你可以不加限制地向你的產品裡加入我們的代碼，除了那些我們在上面的版權聲明裡聲明的 BSD版權之外的內容。

-    </dd>

-

-</a></dl>

-

-

-<h3><a name="1.14">1.14) PostgreSQL 可以處理最近各個國家夏時制的變化嗎?</a></h3>

-<a name="1.14"> 	 

-</a>

-<p><a name="1.14">PostgreSQL 8.0之前的版本是使用作業系統中的時區資料庫來處理夏時制的資訊，自 8.0 版及以後的版本 PostgreSQL 會自身含有最新的時區資訊。</a></p>

-

-

-<hr/>

-

-

-<h2><a name="用戶客戶端問題"> 用戶客戶端問題 </a></h2>

-

-

-<h3><a name="用戶客戶端問題"> </a><a name="2.1">2.1) 我們可以用什麼語言和 PostgreSQL 進行溝通？ </a></h3>

-

-<p><a name="2.1">PostgreSQL (預設情況)只安裝有 C 和內嵌式 C 的接口，其他的接口都是獨立的項目，能夠分別下載，這些接口項目獨立的好處

-   是他們可以有各自的發布計劃和各自獨立的開發組。

-</a></p>

-<p>

-<a name="2.1">   一些編程語言如 PHP 都有訪問 PostgreSQL 的接口，Perl、TCL、Python 以及很多其他語言的接口在

-  </a><a href="http://gborg.postgresql.org" target="_top">http://gborg.postgresql.org</a> 網站上的<i> Drivers/Interfaces</i> 小節可找到，

-   並且通過 Internet 很容易搜索到。

-</p>

-

-

-

-

-<h3> <a name="2.2">2.2) 有什麼工具可以把 PostgreSQL 用於 Web 頁面？ </a></h3>

-<p>

-<a name="2.2">   一個介紹以資料庫為後台的挺不錯的站點是：</a><a href="http://www.webreview.com">http://www.webreview.com</a>。

-</p>

-<p>

-   對於 Web 集成，PHP 是一個極好的接口。它在 <a href="http://www.php.net/">http://www.php.net/</a>。

-

-</p>

-<p>

-   對於複雜的任務，很多人採用 Perl 接口和 使用 CGI.pm 的 DBD::Pg 或 mod_perl 。

-</p>

-

-

-<h3> <a name="2.3">2.3)PostgreSQL 擁有圖形用戶界面嗎？ </a></h3>

-<p>

-<a name="2.3">   商業用戶或是開源開發人員能找到很多的有關 PostgreSQL的GUI 圖形工具軟體，在 </a><a href="http://www.postgresql.org/docs/techdocs.54">PostgreSQL社區文檔</a> 有一個詳細的列表。

-</p>

-

-

-<hr/>

-

-

-

-<h2><a name="系統管理問題"> 系統管理問題 </a></h2>

-

-<h3><a name="系統管理問題"> </a><a name="3.1">3.1)我怎樣能把 PostgreSQL 裝在 /usr/local/pgsql 以外的地方？ </a></h3>

-<p>

-<a name="3.1">   在運行 configure 時加上 --prefix 選項。

-</a></p>

-

-

-

-<h3><a name="3.1"> </a><a name="3.2">3.2) 我如何控制來自其他電腦的連接？ </a></h3>

-<p>

-<a name="3.2">   預設情況下，PostgreSQL 只允許來自本機且通過 unix 域套接字或 TCP/IP 方式的連接。

-   你只有在修改了配置文件 <i>postgresql.conf</i> 中的 <i>listen_addresses</i>，且也在配置文件 <i>$PGDATA/pg_hba.conf</i> 中打開了

-   基於遠程電腦（ host-based ）的身份認證，並重新啟動 PostgreSQL，否則其他電腦是不能與你的 PostgreSQL 伺服器進行連接的。

-</a></p>

-

-

-<h3><a name="3.2"> </a><a name="3.3">3.3) 我怎樣調整資料庫引擎以獲得更好的性能？ </a></h3>

-

-

-<p>

-<a name="3.3">   有三個主要方面可以提升 PostgreSQL 的潛能。

-</a></p>

-

-<dl>

-<a name="3.3">   <dt><b>查詢方式的變化</b></dt>

-   <dd>

-      這主要涉及修改查詢方式以獲取更好的性能:

-      <ul>

-      <li>創建索引，包括表達式和部分索引；</li>

-

-      <li>使用 COPY 語句代替多個 Insert 語句；</li>

-      <li>將多個SQL語句組成一個事務以減少提交事務的開銷；</li>

-      <li>從一個索引中提取多條記錄時使用 CLUSTER；</li>

-      <li>從一個查詢結果中取出部分記錄時使用 LIMIT；</li>

-      <li>使用預編譯式查詢（Prepared Query)；</li>

-      <li>使用 ANALYZE 以保持精確的優化統計；</li>

-

-      <li>定期使用 VACUUM 或 <i>pg_autovacuum</i></li>

-      <li>進行大量資料更改時先刪除索引（然後重建索引）</li>

-      </ul>

-   </dd>

-

-   <dt><b>伺服器的配置</b></dt>

-   <dd>

-

-      配置文件 <i>postgres.conf</i> 中的很多設置都會影響性能，所有參數的列表可見：

-  </dd>

-</a><a href="http://www.postgresql.org/docs/current/static/runtime.html">管理員指南/資料庫伺服器運行環境/資料庫伺服器運行配置</a>，

-      有關參數的解釋可見：<a href="http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_conf_e.html" target="_top">http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_conf_e.html</a> 和 

-      <a href="http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html">http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html</a>。

-   

-

-   <dt><b>硬體的選擇</b></dt>

-

-   <dd>

-      電腦硬體對性能的影響可瀏覽 

-      <a href="http://candle.pha.pa.us/main/writings/pgsql/hw_performance/index.html" target="_top">http://candle.pha.pa.us/main/writings/pgsql/hw_performance/index.html</a> 和 

-      <a href="http://www.powerpostgresql.com/PerfList/">http://www.powerpostgresql.com/PerfList/</a>。

-   </dd>

-

-</dl>

-

-

-<h3> <a name="3.4">3.4)PostgreSQL 裡可以獲得什麼樣的調試特性？ </a></h3>

-

-

-<p><a name="3.4">PostgreSQL 有很多類似<code> log_* </code>的伺服器配置變量可用於查詢的列印和進程統計，而這些工作對調試和性能測試很有幫助。

-</a></p>

-

-

-

-<h3><a name="3.4"> </a><a name="3.5">3.5) 為什麼在試圖連接時收到「Sorry, too many clients（已有太多用戶連接）」消息？ </a></h3>

-<p>

-<a name="3.5">   這表示你已達到預設 100 個並發(同作)後台進程數的限制，你需要通過修改 <i>postgresql.conf</i> 文件中的 <i>max_connections</i> 值來

-   增加 postmaster 的後台併發處理數，修改後需重新啟動 <i>postmaster</i>。

-

-</a></p>

-

-

-<h3><a name="3.5"> </a><a name="3.6">3.6)PostgreSQL 的升級過程有哪些內容 ？ </a></h3>

-<p>

-<a name="3.6"> PostgreSQL 開發組對每次小版本的升級主要只做了一些 Bug 修正工作，因此從 7.4.8 升級到 7.4.9 不需要 dump 和 restore，僅需要停止資料庫伺服器，安裝更新後的軟體包，然後重啟伺服器即可。

-</a></p>

-<p>

-<a name="3.6">

-所有PostgreSQL的用戶應該在最接近（你所使用的主版本）的小改進版本發佈盡快升級。儘管每次升級可能都有一點風險，PostgreSQL的小改

-進版僅僅是設計用來修正一些 Bug 的，程式碼改動較少，所以風險還是很小的。PostgreSQL社區認為一般情況下不升級的風險還是多於升級的。

-</a></p>

-<p>

-<a name="3.6">   主版本的升級（例如從 7.3 到 7.4）通常會修改系統表和資料表的內部格式。

-   這些改變一般比較複雜，因此我們不維持資料文件的向後兼容性。因此從老版本中進行資料導出（dump）/然後在新版本中進行資料導入（reload）對主版本的升級是必須的。

-

-</a></p>

-

-<h3><a name="3.6"> </a><a name="3.7">3.7)(使用 PostgreSQL )我需要使用什麼電腦硬體 ？ </a></h3>

-<p>

-<a name="3.7">   由於電腦硬體大多數是相容的，人們總是傾向於相信所有電腦硬體質量也是相同的。事實上不是，

-   ECC RAM（帶奇偶校驗的記憶體），SCSI （硬碟）和優質的主機板比一些便宜貨要更加可靠且具有更好的性能。 PostgreSQL 幾乎可以運行在任何硬體上，

-   但如果可靠性和性能對你的系統很重要，你就需要全面的研究一下你的硬體組態了。在我們的郵件列表上也有關於

-   硬體配置和性價比的討論。

-</a></p>

-

-

-<hr/>

-

-<h2><a name="操作問題"> 操作問題 </a></h2>

-

-

-

-<h3><a name="操作問題"> </a><a name="4.1">4.1) 如何只選擇一個查詢結果的頭幾行？或是隨機的一行？ </a></h3>

-<p>

-<a name="4.1">      如果你只是要提取幾行資料，並且你在執行查詢中知道確切的行數，你可以使用 LIMIT 功能。

-      如果有一個索引與 <i> ORDER BY</i> 中的條件匹配，PostgreSQL 可能就只處理要求的頭幾條記錄，

-      （否則將對整個查詢進行處理直到生成需要的行）。如果在執行查詢功能時不知道確切的記錄數，

-      可使用游標(cursor)和FETCH功能。

-</a></p>

-<p>

-<a name="4.1">      可使用以下方法提取一行隨機記錄的：

-</a></p>

-<pre><a name="4.1">       SELECT  cols

-      FROM tab

-      ORDER BY random()

-      LIMIT 1 ;

-

-</a></pre>

-

-

-

-<h3><a name="4.1"> </a><a name="4.2">4.2) 如何查看表、索引、資料庫以及用戶的定義？如何查看<i>psql</i>裡用到的查詢指令並顯示它們？ </a></h3>

-<p>

-<a name="4.2">   在<i>psql</i>中使用 \dt 命令來顯示資料表的定義，要瞭解 <i>psql</i> 中的完整命令列表可使用 \? ，另外，你也可以閱讀 <i>psql</i> 的源代碼

-   文件<i> pgsql/src/bin/psql/describe.c</i>，它包括為生成 <i>psql</i> 反斜槓命令的輸出的所有 SQL 命令。你還可以帶 <i>-E</i> 選項啟動 <i>psql</i>，

-   這樣它將列印出你在 <i>psql</i> 中所給出的命令執行時的內部實際使用的 SQL 查詢語句。PostgreSQL也提供了一個兼容 SQL的 INFORMATION SCHEMA 接口，

-   你可以從這裡獲取關於資料庫的資訊。

-

-</a></p>

-<p>

-<a name="4.2">   在系統中也有一些以 <i>pg_</i> 打頭的系統表也描述了表的定義。

-</a></p>

-<p>

-<a name="4.2">   使用 <i>psql -l</i> 指令可以列出所有的資料庫。

-</a></p>

-<p>

-<a name="4.2">   也可以瀏覽一下 <i>pgsql/src/tutorial/syscat.source </i>文件，它列舉了很多可從資料庫系統表中獲取資訊的SELECT語法。

-

-</a></p>

-

-

-<h3><a name="4.2"> </a><a name="4.3">4.3) 如何更改一個欄位的資料類型？ </a></h3>

-<p>

-<a name="4.3">   在8.0版本裡更改一個欄位的資料類型很容易，可使用 ALTER TABLE ALTER COLUMN TYPE 。

-</a></p>

-<p>

-<a name="4.3">   在以前的版本中，可以這樣做：

-</a></p>

-<pre><a name="4.3">    BEGIN;

-    ALTER TABLE tab ADD COLUMN new_col new_data_type;

-    UPDATE tab SET new_col = CAST(old_col AS new_data_type);

-    ALTER TABLE tab DROP COLUMN old_col;

-    COMMIT;

-

-</a></pre>

-<p>

-<a name="4.3">   你然後可以使用<i> VACUUM FULL tab </i>指令來使系統收回無效資料所佔用的空間。

-</a></p>

-

-<h3><a name="4.3"> </a><a name="4.4">4.4) 單條記錄，單個表，單個資料庫的最大限制是多少？ </a></h3>

-<p>

-<a name="4.4">   下面是一些限制：

-</a></p>

-<blockquote>

-<a name="4.4">   </a><table>

-

-   <tbody>

-      <tr><td>單個資料庫最大尺寸？</td><td>無限制（已存在有 32TB 的資料庫）</td></tr>

-      <tr><td>單個表的最大尺寸？</td><td>32 TB</td></tr>

-      <tr><td>一行記錄的最大尺寸？</td><td>1.6 TB</td></tr>

-      <tr><td>一個欄位的最大尺寸?</td><td>1 GB</td></tr>

-

-      <tr>

-        <td>一個表裡最大列數？</td>

-        <td>無限制</td></tr>

-      <tr>

-        <td>一個表裡最大欄位數？</td>

-        <td>250-1600 （與列類型有關）</td></tr>

-      <tr><td>一個表裡的最大索引數量？</td><td>無限制</td></tr>

-   </tbody>

-</table>

-</blockquote>

-

-

-<p>

-<a name="4.4">   當然，實際上沒有真正的無限制，還是要受可用磁盤空間、可用記憶體/交換區的制約。

-   事實上，當上述這些數值變得異常地大時，系統性能也會受很大影響。

-</a></p>

-

-<p>

-<a name="4.4">   單表的最大大小  32 TB 不需要作業系統對單個文件也需這麼大的支持。大表用多個 1 GB 的文件存儲，因此文件系統大小的限制是不重要的。

-</a></p>

-<p>

-<a name="4.4">   如果預設的塊大小增長到 32K ，最大的單表大小和最大列數還可以增加到四倍。

-</a></p>

-<p>

-<a name="4.4">   有一個限制就是不能對大小多於2000字節的列創建索引。幸運地是這樣的索引很少用到。通過對多字節列的內容進行MD5哈稀運算結果進行函數索引可對列的唯一性得到保證，

-   並且全文檢索允許對列中的單詞進行搜索。

-</a></p>

-

-

-<h3><a name="4.4"> </a><a name="4.5">4.5) 存儲一個典型的文本文件裡的資料需要多少磁盤空間？ </a></h3>

-<p>

-<a name="4.5">   一個 Postgres 資料庫（存儲一個文本文件）所佔用的空間最多可能需要相當於這個文本文件自身大小5倍的磁盤空間。

-</a></p>

-<p>

-<a name="4.5">   例如，假設有一個 100,000 行的文件，每行有一個整數和一個文本描述。

-   假設文本串的平均長度為20位元組(Byte)。文本文件佔用 2.8 MB。存放這些資料的PostgreSQL資料庫文件大約是 5.2 MB:

-</a></p>

-<pre><a name="4.5">     24 字元組: 每行的頭（大約值）

-     24 字元組節: 一個整數型欄位和一個文本型欄位

-   +  4 字元組節: 頁面內指向元組的指針

-   ----------------------------------------

-     52 字元組每行

-

-   PostgreSQL 資料頁的大小是 8192 位元組 (8 KB)，則：

-

-   8192 字元組每頁

-   -------------------   =  158 行/資料頁（向下取整）

-     52 字元組每行

-

-   100000 資料行

-   --------------------  =  633 資料頁（向上取整）

-      146 行/資料頁

-

-   633 資料頁 * 8192 字節/頁  = 5,185,536 字節（5.2 MB）

-</a></pre>

-

-

-<p>

-<a name="4.5">   索引不需要這麼多的額外消耗，但也確實包括被索引的資料，因此它們也可能很大。

-</a></p>

-<p>

-<a name="4.5">   空值<i> NULL </i>存放在位圖中，因此佔用很少的空間。

-</a></p>

-

-<h3><a name="4.5"> </a><a name="4.6">4.6) 為什麼我的查詢很慢？為什麼這些查詢沒有利用索引？ </a></h3>

-<p>

-<a name="4.6">   並非每個查詢都會自動使用索引。只有在表的大小超過一個最小值，並且查詢只會選中表中較小比例的記錄時才會採用索引。

-   這是因為索引掃瞄引起的隨即磁盤存取可能比直接地讀取表（順序掃瞄）更慢。

-

-</a></p>

-<p>

-<a name="4.6">   為了判斷是否使用索引，PostgreSQL 必須獲得有關表的統計值。這些統計值可以使用 VACUUM ANALYZE，或 ANALYZE 獲得。

-   使用統計值，優化器知道表中有多少行，就能夠更好地判斷是否利用索引。

-   統計值對確定優化的連接順序和連接方法也很有用。在表的內容發生變化時，應定期進行統計值的更新收集。

-</a></p>

-<p>

-<a name="4.6">   索引通常不用於 ORDER BY 或執行連接。對一個大表的一次順序掃瞄再做一次排序通常比索引掃瞄要快。然而，如果將 LIMIT 和 ORDER BY 

-   結合在一起使用的話，通常將會使用索引，因為這時僅返回表中的一小部分記錄。

-</a></p>

-<p>

-<a name="4.6">   如果你確信PostgreSQL的優化器使用順序掃瞄是不正確的，你可以使用<code>SET enable_seqscan TO 'off'</code>指令來關閉順序掃瞄，

-   然後再次運行查詢，你就可以看出使用一個索引掃瞄是否確實要快一些。

-</a></p>

-

-<p>

-

-<a name="4.6">   當使用通配符操作，例如 <i>LIKE</i> 或 <i>~</i> 時，索引只能在特定的情況下使用：

-</a></p>

-<ul>

-<a name="4.6">   </a><li><a name="4.6">字符串的開始部分必須是普通字符串，也就是說：

-      </a><ul>

-<a name="4.6">      </a><li><a name="4.6"> <i>LIKE</i> 模式不能以 <i>%</i> 打頭。</a></li>

-

-<a name="4.6">      </a><li><a name="4.6"> <i>~</i> （正則表達式）模式必須以 <i>^</i> 打頭。</a></li>

-<a name="4.6">      </a></ul>

-<a name="4.6">   </a></li>

-<a name="4.6">   </a><li><a name="4.6">字符串不能以匹配多個字符的模式類打頭，例如 [a-e]。</a></li>

-<a name="4.6">   </a><li><a name="4.6">大小寫無關的查找，如 ILIKE 和 ~* 等不使用索引，但可以用 </a><a href="#4.8">4.8</a> 節描述的表達式索引。</li>

-

-   <li>在做 initdb 時必須採用預設的本地設置 C locale，因為系統不可能知道在非 C locale 情況時下一個最大字符是什麼。

-      在這種情況下，你可以創建一個特殊的 <code>text_pattern_ops</code> 索引來用於 <small>LIKE</small> 的索引。

-   </li>

-</ul>

-<p>

-   在 8.0 之前的版本中，除非要查詢的資料類型和索引的資料類型相匹配，否則索引經常是未被用到，特別是對 int2, int8 和數值型的索引。

-</p>

-

-<h3> <a name="4.7">4.7) 我如何才能看到查詢優化器是怎樣評估處理我的查詢？ </a></h3>

-

-

-<p><a name="4.7">參考 <small>EXPLAIN</small> 手冊頁。</a></p>

-

-<h3><a name="4.7"> </a><a name="4.8">4.8) 我怎樣做正則表達式搜索和大小寫無關的正則表達式查找？怎樣利用索引進行大小寫無關查找？ </a></h3>

-<p>

-<a name="4.8">   操作符 <i> ~ </i> 處理正則表達式匹配，而 <i>~*</i> 處理大小寫無關的正則表達式匹配。大小寫無關的 LIKE 變種成為 ILIKE。

-

-</a></p>

-<p>

-<a name="4.8">   大小寫無關的等式比較通常寫做：

-</a></p>

-<pre><a name="4.8">    SELECT *

-    FROM tab

-    WHERE lower(col) = 'abc';

-</a></pre>

-

-<p>

-<a name="4.8">   這樣將不會使用標準的索引。但是可以創建一個在這種情況下使用的表達式索引:

-</a></p>

-<pre><a name="4.8">    CREATE INDEX tabindex ON tab (lower(col));

-

-</a></pre>

-<p>

-<a name="4.8">   如果上述索引在創建時加入 UNIQUE 約束，雖然索引欄位自身內容可以存儲大小寫不限的內容，但如果有 UNIQUE 約束後，這些內容不能僅僅是大小寫不同（否則會造成衝突）。為了保證不發生這種情況，可以使用 CHECK 約束條件或是觸發器在錄入時進行限制。

-</a></p>

-

-

-<h3><a name="4.8"> </a><a name="4.9">4.9) 在一個查詢裡，我怎樣檢測一個欄位是否為 <i>NULL</i> ？我如何才能準確排序而不論某欄位是否含 <i>NULL</i> 值？ </a></h3>

-<p>

-

-<a name="4.9">   用 <small>IS NULL</small> 和 <small>IS NOT NULL</small> 測試這個欄位，具體方法如下：

-</a></p>

-<pre><a name="4.9">   SELECT *

-   FROM tab

-   WHERE col IS NULL;

-</a></pre>

-

-<p><a name="4.9">為了能對含 <small>NULL </small>欄位排序，可在 <small>ORDER BY</small> 條件中使用 <small>IS NULL</small> 和

-   <small>IS NOT NULL</small> 修飾符，條件為真 <i>true</i> 將比條件為假 <i>false</i> 排在前面，下面的例子就會將含

-   NULL 的記錄排在結果的上面部分：

-

-</a></p>

-<pre><a name="4.9">   SELECT *

-   FROM tab

-   ORDER BY (col IS NOT NULL)

-</a></pre>

-

-<h3><a name="4.9"> </a><a name="4.10">4.10) 各種字符類型之間有什麼不同？ </a></h3>

-<blockquote>

-<a name="4.10">   </a><table width="614">

-   <tbody>

-      <tr><th width="104">類型</th>

-      <th width="77">內部名稱</th>

-      <th width="417">說明</th>

-      </tr>

-

-      <tr><td>VARCHAR(n)</td><td>varchar</td><td>指定了最大長度，變長字符串，不足定義長度的部分不補齊</td></tr>

-      <tr><td>CHAR(n)</td><td>bpchar</td><td>定長字符串，實際資料不足定義長度時，以空格補齊</td></tr>

-      <tr><td>TEXT</td><td>text</td><td>沒有特別的上限限制（僅受行的最大長度限制）</td></tr>

-      <tr><td>BYTEA</td><td>bytea</td><td>變長字節序列（使用NULL字符也是允許的）</td></tr>

-

-      <tr><td>"char"</td><td>char</td><td>單個字符</td></tr>

-    </tbody>

-   </table>

-</blockquote>

-

-<p>

-<a name="4.10">   在系統表和在一些錯誤資訊裡你將看到內部名稱。

-</a></p>

-<p>

-<a name="4.10">   上面所列的前四種類型是 "varlena"（變長）類型（也就是說，開頭的四個字節是長度，後面才是資料）。

-   於是實際佔用的空間比聲明的大小要多一些。

-   然而這些類型如定義很長時都可以被壓縮存儲，因此磁盤空間也可能比預想的要少。

-

-</a></p>

-<p>

-<a name="4.10">   <small>VARCHAR(n)</small> 在存儲限制了最大長度的變長字符串是最好的。

-   <small>TEXT</small> 適用於存儲最大可達 1G 左右但未定義限制長度的字符串。

-</a></p>

-<p>

-<a name="4.10">   <small>CHAR(n)</small> 最適合於存儲長度相同的字符串。 <small>CHAR(n)</small>會根據所給定的欄位長度以空格補足（不足的欄位內容），

-   而 <small>VARCHAR(n)</small> 只存儲所給定的資料內容。

-   <small>BYTEA</small> 用於存儲二進制資料，尤其是包含 NULL 字節的值。這些類型具有差不多的性能。

-

-</a></p>

-

-

-

-<h3><a name="4.10"> </a><a name="4.11.1">4.11.1) 我怎樣創建一個序列號或是自動遞增的欄位？ </a></h3>

-<p><a name="4.11.1">PostgreSQL 支持 SERIAL 資料類型。（欄位定義為SERIAL後）將自動創建一個序列生成器，例如：

-</a></p>

-<pre><a name="4.11.1">   CREATE TABLE person ( 

-      id   SERIAL, 

-      name TEXT 

-   );

-</a></pre>

-<p>

-<a name="4.11.1">   會自動轉換為以下SQL語句：

-</a></p>

-

-<pre><a name="4.11.1">   CREATE SEQUENCE person_id_seq;

-   CREATE TABLE person ( 

-      id   INT4 NOT NULL DEFAULT nextval('person_id_seq'),

-      name TEXT

-   );

-</a></pre>

-<p>

-<a name="4.11.1">   參考 create_sequence 手冊頁獲取關於序列生成器的更多資訊。

-</a></p>

-

-

-<h3><a name="4.11.1"> </a><a name="4.11.2">4.11.2) 我如何獲得一個插入的序列號的值？ </a></h3>

-<p>

-<a name="4.11.2">   一種方法是在插入之前先用函數 nextval() 從序列對象裡檢索出下一個 SERIAL 值，然後再用此值精確地插入。使用

-  </a><a href="#4.11.1"> 4.11.1</a> 裡的例表，可用偽碼這樣描述：

-

-</p>

-<pre>   new_id = execute("SELECT nextval('person_id_seq')");

-   execute("INSERT INTO person (id, name) VALUES (new_id, 'Blaise Pascal')");

-</pre>

-<p>

-   這樣還能在其他查詢中使用存放在 new_id 裡的新值（例如，作為參照 person 表的外鍵）。

-   注意自動創建的 SEQUENCE 對象的名稱將會是  &lt;<i>table</i>&gt;_&lt;<i>serialcolumn</i>&gt;_<i>seq</i>，

-   這裡 table 和 serialcolumn 分別是你的表的名稱和你的 SERIAL 欄位的名稱。

-</p>

-<p>

-   類似的，在 SERIAL 對象預設插入後你可以用函數 currval() 檢索剛賦值的 SERIAL 值，例如：

-

-</p>

-<pre>   execute("INSERT INTO person (name) VALUES ('Blaise Pascal')");

-   new_id = execute("SELECT currval('person_id_seq')");

-</pre>

-

-<h3> <a name="4.11.3">4.11.3) 同時使用 <i>currval()</i> 會導致和其他用戶的衝突情況嗎？ </a></h3>

-<p>

-<a name="4.11.3">   不會。<i>currval()</i> 返回的是你本次會話進程所賦的值而不是所有用戶的當前值。<br/>

-

-</a></p>

-

-<h3><a name="4.11.3"> </a><a name="4.11.4">4.11.4) 為什麼不在事務異常中止後重用序列號呢？為什麼在序列號欄位的取值中存在間斷呢？ </a></h3>

-<p>

-<a name="4.11.4">   為了提高併發性，序列號在需要的時候賦予正在運行的事務，並且在事務結束之前不進行鎖定，

-   這就會導致異常中止的事務後，序列號會出現間隔。

-</a></p>

-

-<h3><a name="4.11.4"> </a><a name="4.12">4.12) 什麼是 <small>OID</small> ？什麼是 <small>CTID</small> ？ </a></h3>

-

-

-<p><a name="4.12">PostgreSQL 裡創建的每一行記錄都會獲得一個唯一的 <small>OID</small>，除非在創建表時使用 <small>WITHOUT OIDS</small> 選項。

-   <small>OID </small>創建時會自動生成一個 4位元組的整數，所有 OID 在相應 PostgreSQL 伺服器中均是唯一的。 然而，它在超過 40億時將溢出，

-   <small>OID</small> 此後會出現重複。PostgreSQL 在它的內部系統表裡使用 OID 在表之間建立聯繫。

-</a></p>

-<p><a name="4.12">   

-   在用戶的資料表中，最好是使用 <small>SERIAl</small> 來代替 <small>OID</small>

-

-   因為<small> SERIAL</small> 只要保證在單個表中的數值是唯一的就可以了，這樣它溢出的可能性就非常小了，

-   <small>SERIAL8</small> 可用來保存8字元組的序列數值。

-</a></p>

-

-<p>

-<a name="4.12">   <small>CTID</small> 用於標識帶著資料塊（地址）和（塊內）偏移的特定的物理行。

-   <small>CTID</small> 在記錄被更改或重載後發生改變。索引資料使用它們指向物理行。

-</a></p>

-

-

-

-<h3><a name="4.12"> </a><a name="4.13">4.13) 為什麼我收到錯誤資訊「<i>ERROR: Memory exhausted in AllocSetAlloc()</i>」？ </a></h3>

-<p>

-<a name="4.13">   這很可能是系統的虛擬內存用光了，或者內核對某些資源有較低的限制值。在啟動 postmaster 之前試試下面的命令：

-</a></p>

-<pre><a name="4.13">   ulimit -d 262144

-   limit datasize 256m

-</a></pre>

-<p>

-<a name="4.13">   取決於你用的 shell，上面命令只有一條能成功，但是它將把你的進程資料段限制設得比較高，

-   因而也許能讓查詢完成。這條命令應用於當前進程，以及所有在這條命令運行後創建的子進程。

-   如果你是在運行SQL客戶端時因為後台返回了太多的資料而出現問題，請在運行客戶端之前執行上述命令。

-

-</a></p>

-

-<h3><a name="4.13"> </a><a name="4.14">4.14) 我如何才能知道所運行的PostgreSQL的版本？ </a></h3>

-<p>

-<a name="4.14">   從 psql 裡，輸入 <code>SELECT version();</code>指令。

-</a></p>

-

-<h3><a name="4.14"> </a><a name="4.15">4.15) 我如何創建一個預設值是當前時間的欄位？ </a></h3>

-<p>

-<a name="4.15">   使用 CURRENT_TIMESTAMP：

-

-</a></p>

-<pre><a name="4.15">   CREATE TABLE test (x int, modtime TIMESTAMP DEFAULT CURRENT_TIMESTAMP );

-</a></pre>

-

-

-<h3><a name="4.15"> </a><a name="4.16">4.16) 我怎樣進行 outer join （外連接）？ </a></h3>

-<p><a name="4.16">PostgreSQL 採用標準的 SQL 語法支持外連接。這裡是兩個例子：</a></p>

-<pre><a name="4.16">   SELECT *

-   FROM t1 LEFT OUTER JOIN t2 ON (t1.col = t2.col);

-</a></pre>

-<p><a name="4.16">或是</a></p>

-

-<pre><a name="4.16">   SELECT *

-   FROM t1 LEFT OUTER JOIN t2 USING (col);

-</a></pre>

-<p>

-<a name="4.16">   這兩個等價的查詢在 t1.col 和 t2.col 上做連接，並且返回 t1 中所有未連接的行（那些在 t2 中沒有匹配的行）。

-   右[外]連接（RIGHT OUTER JOIN）將返回 t2 中未連接的行。

-   完全外連接（FULL OUTER JOIN）將返回 t1 和 t2 中未連接的行。

-   關鍵字 OUTER 在左[外]連接、右[外]連接和完全[外]連接中是可選的，普通連接被稱為內連接（INNER JOIN）。

-</a></p>

-

-

-<h3><a name="4.16"> </a><a name="4.17">4.17) 如何使用涉及多個資料庫的查詢？ </a></h3>

-<p>

-<a name="4.17">   沒有辦法查詢當前資料庫之外的資料庫。

-   因為PostgreSQL要加載與資料庫相關的系統目錄（系統表），因此跨資料庫的查詢如何執行是不定的。

-</a></p>

-

-<p>

-<a name="4.17">   附加增值模塊 contrib/dblink 允許採用函數調用實現跨庫查詢。當然用戶也可以同時連接到不同的資料庫執行查詢然後在客戶端合併結果。

-</a></p>

-

-<h3><a name="4.17"> </a><a name="4.18">4.18) 如何讓函數返回多行或多列資料？ </a></h3>

-<p>

-<a name="4.18">   在函數中返回資料記錄集的功能是很容易使用的，詳情參見：

-  </a><a href="http://techdocs.postgresql.org/guides/SetReturningFunctions">http://techdocs.postgresql.org/guides/SetReturningFunctions</a>

-</p>

-

-<h3> <a name="4.19">4.19) 為什麼我在使用 PL/PgSQL 函數存取臨時表時會收到錯誤資訊「relation with OID ##### does not exist」？ </a></h3>

-

-<p>

-<a name="4.19">   PL/PgSQL 會緩存函數的腳本內容，由此帶來的一個不好的副作用是若一個 PL/PgSQL

-    函數訪問了一個臨時表，然後該表被刪除並重建了，則再次調用該函數將失敗，

-   因為緩存的函數內容仍然指向舊的臨時表。解決的方法是在 PL/PgSQL 中用<small>EXECUTE</small>

-    對臨時表進行訪問。這樣會保證查詢在執行前總會被重新解析。

-</a></p>

-

-<h3><a name="4.19"> </a><a name="4.20">4.20) 目前有哪些資料複寫(replication)方案可用？ </a></h3>

-<p>

-<a name="4.20">   「複寫」只是一個術語，有好幾種複寫技術可用，每種都有優點和缺點：

-</a></p>

-<p>

-

-<a name="4.20">   主/從式複寫方式是允許一個主伺服器接受讀/寫的申請，而多個從伺服器只能接受讀/<small>SELECT</small>查詢的申請，

-   目前最流行且免費的主/從PostgreSQL複寫方案是 

-  </a><a href="http://gborg.postgresql.org/project/slony1/projdisplay.php">Slony-I </a>。

-</p>

-<p>

-   多個主伺服器的複寫方式允許將讀/寫的申請發送給多台的主機，這種方式由於需要在多台伺服器之間同步資料變動

-   可能會帶來較嚴重的性能損失，<a href="http://pgfoundry.org/projects/pgcluster/">Pgcluster</a> 是目前這種方案中最好的，並且還可以免費下載。

-</p>

-<p>

-   也有一些商業需付費和基於硬體的資料複寫方案，支持上述各種複寫模型。

-</p>

-

-

-<h3> <a name="4.21">4.21</a>) 為何查詢結果顯示的表名或欄名與我的查詢語句中的不同？為何大寫狀態不能保留？ </h3>

-

-<p>

-   最常見的原因是在創建表時對表名或是欄名使用了雙引號( ' ' )，當使用了雙引號後，表名或欄名（稱為標識符）存儲時是區分

-<a href="http://www.postgresql.org/docs/8.0/static/sql-syntax.html#SQL-SYNTAX-IDENTIFIERS">大小寫的</a>，

-   這意謂著你在查詢時表名或欄名也應使用雙引號，一些工具軟體，像 pgAdmin 會在發出創建表的指令時自動地在每個標識符上加雙引號。

-   因此，為了標識符的統一，你應該：</p>

-<ul>

-<li>在創建表時避免將標識符使用雙引號引起來。</li>

-<li>在標識符中只使用小寫字母。</li>

-

-<li>（為了與已存在的標識符相同）在查詢中使用雙引號將標識符引起來。</li>

-</ul>

-

-</body>

-

-</html>
\ No newline at end of file
diff --git a/doc/src/FAQ/FAQ_czech.html b/doc/src/FAQ/FAQ_czech.html
deleted file mode 100644
index 39c26974e5..0000000000
--- a/doc/src/FAQ/FAQ_czech.html
+++ /dev/null
@@ -1,645 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>PostgreSQL FAQ</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-language" content="cs">
-<meta name="description" lang="en" content="Czech translation of FAQ for PostgreSQL">
-<meta name="description" lang="cs" content="Český překlad FAQ PostgreSQL">
-</head>
-<body bgcolor="#ffffff" text="#000000" link="#ff0000" vlink="#a00000" alink="#0000ff">
-<h1>Frequently Asked Questions</h1>
-<p><i>Často kladené dotazy (FAQ) PostgreSQL</i>
-</p>
-<p>Poslední aktualizace: 29. října 2007 (aktualizováno pro PostgreSQL 8.3)
-</p>
-<p>Současný správce: Bruce Momjian ([email protected])
-</p>
-<p>Přeložil: Pavel Stěhule ([email protected])
-</p>
-<p>Nejaktuálnější verzi tohoto dokumentu naleznete na adrese
-<a href="http://www.postgresql.org/files/documentation/faqs/FAQ.html" title="http://www.postgresql.org/files/documentation/faqs/FAQ.html">http://www.postgresql.org/files/documentation/faqs/FAQ.html</a> 
-</p>
-<p>Odpovědi na otázky vázané na konkrétní platformy naleznete na
-adrese <a href="http://www.postgresql.org/docs/faq/" title="http://www.postgresql.org/docs/faq/">http://www.postgresql.org/docs/faq/</a>.
-</p>
-<hr>
-<h2 align="center">Obecné otázky</h2>
-<a href="#item1.1">1.1</a>) Co je to PostgreSQL? Jaká je správná výslovnost slova PostgreSQL?<br>
-<a href="#item1.2">1.2</a>) Kdo řídí vývoj PostgreSQL?<br>
-<a href="#item1.3">1.3</a>) Pod jakou licencí je PostgreSQL?<br>
-<a href="#item1.4">1.4</a>) Na kterých platformách lze provozovat PostgreSQL?<br>
-<a href="#item1.5">1.5</a>) Kde mohu získat PostgreSQL?<br>
-<a href="#item1.6">1.6</a>) Jaká je poslední verze?<br>
-<a href="#item1.7">1.7</a>) Kde mohu získat podporu?<br>
-<a href="#item1.8">1.8</a>) Jak a kam hlásit chyby?<br>
-<a href="#item1.9">1.9</a>) Kde najdu informace o známých chybách nebo nepodporovaných vlastnostech?<br>
-<a href="#item1.10">1.10</a>) Jaká je dostupná dokumentace?<br>
-<a href="#item1.11">1.11</a>) Jak se mohu naučit SQL?<br>
-<a href="#item1.12">1.12</a>) Jak se mohu připojit k týmu vývojářů?<br>
-<a href="#item1.13">1.13</a>) Jak je na tom PostgreSQL v porovnání s jinými databázemi?<br>
-<a href="#item1.14">1.14</a>) Je PostgreSQL připraven na aktuální zavádění letního času v některých zemích?<br>
-<h2 align="center">Dotazy na klientská rozhraní</h2>
-<a href="#item2.1">2.1</a>) Která rozhraní jsou použitelná pro PostgreSQL?<br>
-<a href="#item2.2">2.2</a>) Jaké nástroje lze použít pro PostgreSQL a web?<br>
-<a href="#item2.3">2.3</a>) Existuje grafické rozhraní pro PostgreSQL?<br>
-<h2 align="center">Administrativní dotazy</h2>
-<a href="#item3.1">3.1</a>) Jak nainstalovat PostgreSQL jinam než do /usr/local/pgsql?<br>
-<a href="#item3.2">3.2</a>) Jak nastavit pravidla pro přístup z jiných stanic?<br>
-<a href="#item3.3">3.3</a>) Jak vyladit databázi na vyšší výkon?<br>
-<a href="#item3.4">3.4</a>) Jaké mám ladící prostředky?<br>
-<a href="#item3.5">3.5</a>) Co znamená "Sorry, too many clients", když se zkouším připojit?<br>
-<a href="#item3.6">3.6</a>) Proč je nutný dump a obnovení (load) databáze při upgradu PostgreSQL?<br>
-<a href="#item3.7">3.7</a>) Jaký hardware bych měl používat?<br>
-<h2 align="center">Provozní dotazy</h2>
-<a href="#item4.1">4.1</a>) Jak získat pouze první řádek dotazu? Náhodný řádek?<br>
-<a href="#item4.2">4.2</a>) Jak získám seznam tabulek, indexů, databází, a definovaných uživatelů. Mohu vidět dotazy, které používá psql pro zobrazení těchto informací?<br>
-<a href="#item4.3">4.3</a>) Jak změnit datový typ sloupce?<br>
-<a href="#item4.4">4.4</a>) Jaká je maximální velikost řádku, tabulky a databáze?<br>
-<a href="#item4.5">4.5</a>) Kolik diskového prostoru je potřeba k uložení dat z normálního textového souboru?<br>
-<a href="#item4.6">4.6</a>) Můj dotaz je pomalý a nepoužívá vytvořené indexy. Proč?<br>
-<a href="#item4.7">4.7</a>) Jak zjistím, jak se vyhodnocuje můj dotaz?<br>
-<a href="#item4.8">4.8</a>) Jak použít case-(in)sensitive regulární výraz? Jak použít index pro case insensitive hledání?<br>
-<a href="#item4.9">4.9</a>) Jak v dotazu detekovat, že položka je NULL? Jak bezpečně spojit dva řetězce, pokud mohou obsahovat NULL? Lze třídit podle toho, jestli je položka NULL nebo ne?<br>
-<a href="#item4.10">4.10</a>) Jaké jsou rozdíly mezi různými znakovými typy?<br>
-<a href="#item4.11.1">4.11.1</a>) Jak vytvořit serial/auto-increment položku?<br>
-<a href="#item4.11.2">4.11.2</a>) Jak získat hodnotu SERIAL po vložení řádku?<br>
-<a href="#item4.11.3">4.11.3</a>) Nezpůsobí currval() a nextval() problémy ve více uživatelském prostředí?<br>
-<a href="#item4.11.4">4.11.4</a>) Proč není vygenerované číslo použito při přerušení transakce?Proč vznikají díry v číslování prostřednictvím sekvence nebo typu SERIAL?<br>
-<a href="#item4.12">4.12</a>) Co to je OID? Co je to CTID?<br>
-<a href="#item4.13">4.13</a>) Co znamená chybové hlášení "ERROR: Memory exhausted in AllocSetAlloc()"?<br>
-<a href="#item4.14">4.14</a>) Jak zjistím, kterou verzi PostgreSQL používám?<br>
-<a href="#item4.15">4.15</a>) Jak vytvořit sloupec, který bude implicitně obsahovat aktuální čas?<br>
-<a href="#item4.16">4.16</a>) Jak provést vnější spojení (outer join)?<br>
-<a href="#item4.17">4.17</a>) Jak provést dotaz napříč několika databázemi?<br>
-<a href="#item4.18">4.18</a>) Může funkce vrátit více řádků nebo sloupců?<br>
-<a href="#item4.19">4.19</a>) Co je příčinou chyby "relation with OID xxxxx does not exist"?<br>
-<a href="#item4.20">4.20</a>) Jaké jsou možnosti replikace databází?<br>
-<a href="#item4.21">4.21</a>) Proč v dotazu nejsou rozpoznány názvy mých tabulek nebo funkcí? Proč jsou velká písmena v názvech automaticky převedena na malá písmena?<br>
-<hr>
-<h2 align="center">Obecné otázky</h2>
-<h3><a name="item1.1">1.1</a>) Co je to PostgreSQL? Jaká je správná výslovnost slova PostgreSQL?</h3>
-<p>Výslovnost PostgreSQL je <i>Post-Gres-Q-L</i>
-, nebo zjednodušeně <i>Postgres</i>
-. V řadě jazyků je slovo PostgreSQL obtížně vyslovitelný, proto se v hovoru často používá zjednodušená forma názvu. Pro ty, kteří by si rádi poslechli výslovnost, je k dispozici audiozáznam v <a href="http://www.postgresql.org/files/postgresql.mp3" title="http://www.postgresql.org/files/postgresql.mp3">MP3 formátu</a>.
-</p>
-<p>PostgreSQL je relační databáze s některými objektovými rysy, která má možnosti tradičních
-komerčních databázových systémů s několika rozšířeními, které lze najít v DBMS
-systémech příští generace. Používání PostgreSQL není omezené a veškeré zdrojové kódy jsou
-volně dostupné.
-</p>
-<p>Za vývojem PostgreSQL je mezinárodní skupina nezávislých vývojářů navzájem komunikujících
-prostřednictvím internetu. Tento projekt není řízen žádnou obchodní organizací. Pokud se chcete 
-přidat k projektu, přečtěte si vývojářské FAQ na adrese <a href="http://www.postgresql.org/files/documentation/faqs/FAQ_DEV.html" title="http://www.postgresql.org/files/documentation/faqs/FAQ_DEV.html">http://www.postgresql.org/files/documentation/faqs/FAQ_DEV.html</a> .
-</p>
-<h3><a name="item1.2">1.2</a>) Kdo řídí vývoj PostgreSQL?</h3>
-<p>Pokud budete hledat organizaci řídící vývoj PostgreSQL, budete zklamáni. Nic takového
-neexistuje. Existují pouze "core" a CVS skupiny uživatelů, ale ty existují více z administrátorských
-důvodů než z organizačních. Projekt je směrován komunitou vývojářů a uživatelů, ke které se 
-kdokoliv může připojit. Jediné co potřebuje, je přihlásit se do elektronické konference. Více ve 
-<a href="http://www.postgresql.org/docs/faqs.FAQ_DEV.html" title="http://www.postgresql.org/docs/faqs.FAQ_DEV.html">vývojářském FAQ</a>.
-</p>
-<h3><a name="item1.3">1.3</a>) Pod jakou licencí je PostgreSQL?</h3>
-<p>PostgreSQL je předmětem následujících autorských práv:
-</p>
-<p>Dílčí Copyright (c) 1996-2009, PostgreSQL Global Development Group<br>
-Dílčí Copyright (c) 1994-6, Regents of the University of California
-</p>
-<p>Uděluje se oprávnění k užití, rozmnožování, provádění úprav a
-rozšiřování tohoto softwaru a dokumentace k němu, pro jakékoli účely,
-bez licenčního poplatku a bez písemné licenční smlouvy, za podmínky,
-že na všech jeho kopiích je uvedeno oznámení o výše uvedených právech,
-jakož i obsah tohoto a dvou následujících odstavců.
-</p>
-<p>THE UNIVERSITY OF CALIFORNIA ("KALIFORNSKÁ UNIVERZITA") NENÍ V ŽÁDNÉM
-PŘÍPADĚ ODPOVĚDNA ŽÁDNÉ TŘETÍ OSOBĚ ZA PŘÍMOU, NEPŘÍMOU, ZVLÁŠTNÍ,
-NAHODILOU NEBO VÝSLEDNOU ŠKODU, VČETNĚ UŠLÉHO ZISKU, ZPŮSOBENOU UŽITÍM
-TOHOTO SOFTWARU A DOKUMENTACE K NĚMU, A TO I V PŘÍPADĚ, ŽE THE
-UNIVERSITY OF CALIFORNIA BYLA INFORMOVÁNA O MOŽNOSTI VZNIKU TAKOVÉ
-ŠKODY.
-</p>
-<p>THE UNIVERSITY OF CALIFORNIA ZEJMÉNA NEPOSKYTUJE JAKÉKOLI ZÁRUKY, A TO
-NEJEN ZÁRUKY OBCHODOVATELNOSTI A VHODNOSTI TOHOTO VÝROBKU KE
-SPECIFICKÝM ÚČELŮM. NÍŽE UVEDENÝ SOFTWARE JE POSKYTNUT "JAK STOJÍ A
-LEŽÍ" A THE UNIVERSITY OF CALIFORNIA NENÍ POVINNA ZAJISTIT JEHO
-ÚDRŽBU, PODPORU, AKTUALIZACI, VYLEPŠENÍ NEBO MODIFIKACI.
-</p>
-<p>Výše uvedené je BSD licence, běžná licence otevřeného zdroje. Není zde
-žádné omezení ohledně užití kódu zdroje. Jsme s tím spokojeni a nemáme
-v úmyslu na této skutečnosti cokoli měnit.
-</p>
-<h3><a name="item1.4">1.4</a>) Na kterých platformách lze provozovat PostgreSQL?</h3>
-<p>Stručně řečeno, PostgreSQL běží na všech moderních unixových systémech. Seznam těch, u kterých proběhlo testování, naleznete v instalačních instrukcích.
-</p>
-<p>PostreSQL také běží nativně na všech Microsof Windows systémech odvozených z Microsoft Windows NT jako jsou Windows  2000SP4, WindowsXP a Windows2003. Instalační balíček naleznete na adrese <a href="http://pgfoundry.org/projects/pginstaller" title="http://pgfoundry.org/projects/pginstaller">http://pgfoundry.org/projects/pginstaller</a>. Na starších systémech s ještě MS-DOS jádrem lze spustit PostgreSQL s emulačním programem Cygwin.
-</p>
-<p>Dále existuje port pro Novell Netware 6 port na adrese <a href="http://forge.novell.com" title="http://forge.novell.com">http://forge.novell.com</a>, a pro OS/2 verze (eComStation) na adrese <a href="http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&button=Search&key=postgreSQL&stype=all&sort=type&dir=%2F" title="http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&button=Search&key=postgreSQL&stype=all&sort=type&dir=%2F">http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&button=Search&key=postgreSQL&stype=all&sort=type&dir=%2F</a> .
-</p>
-<h3><a name="item1.5">1.5</a>) Kde mohu získat PostgreSQL?</h3>
-<p>Pomocí webového klienta z adresy <a href="http://www.postgresql.org/ftp/" title="http://www.postgresql.org/ftp/">http://www.postgresql.org/ftp/</a> nebo klienta ftp z adresy <a href="ftp://ftp.postgresql.org/pub/" title="ftp://ftp.postgresql.org/pub/">ftp://ftp.postgresql.org/pub/</a>.
-</p>
-<h3><a name="item1.6">1.6</a>) Jaká je poslední verze?</h3>
-<p>Nejnovější verzí PostgreSQL je verze 8.2.5
-</p>
-<p>V plánu je uvolňovat každoročně jednu velkou verzi a každých několik měsíců malé verze.
-</p>
-<h3><a name="item1.7">1.7</a>) Kde mohu získat podporu?</h3>
-<p>Nejčastější forma podpory uživatelům PostgreSQL komunitou je prostřednictvím e-mailů. Na našem webovém serveru naleznete <a href="http://www.postgresql.org/community/lists/" title="http://www.postgresql.org/community/lists/">odkaz</a> na stránky,kde se můžete přihlásit do elektronické konference. Pro začátek jsou doporučené konference general nebo bugs.
-</p>
-<p>Další cestou je IRC kanál #postgresql na Freenode (irc.freenode.net). K připojení použijte Unixový příkaz irc -x '#postgresql' "$USER" irc.freenode.net nebo jakékoholiv jiného IRC klienta. V této síti existuje ještě španělská (#postgresql-es) a francouzská (#postgresqlfr) verze. Další PostgreSQL kanál naleznete na EFNet.
-</p>
-<p>Seznam společností poskytující komerční podporu naleznete na adrese <a href="http://techdocs.postgresql.org/companies.php" title="http://techdocs.postgresql.org/companies.php">http://techdocs.postgresql.org/companies.php</a>.
-</p>
-<h3><a name="item1.8">1.8</a>) Jak a kam hlásit chyby?</h3>
-<p>Vyplňte formulář na adrese <a href="http://www.postgresql.org/support/submitbug" title="http://www.postgresql.org/support/submitbug">http://www.postgresql.org/support/submitbug</a>. Na našem ftp serveru <a href="ftp://ftp.postgresql.org/pub/" title="ftp://ftp.postgresql.org/pub/">ftp://ftp.postgresql.org/pub/</a> si ověřte, že používáte aktuální verzi PostreSQL.
-</p>
-<p>Chyby reportované prostřednictvím chybového formuláře nebo zasláním mailu do PostgreSQL konference obvykle generuje následující odezvu:
-</p>
-<ul><li> Nejedná se o chybu, a proč
-</li>
-<li> Jedná se o známou chybu, která je již v seznamu úkolů <a href="http://www.postgresql.org/docs/faqs.TODO.html" title="http://www.postgresql.org/docs/faqs.TODO.html">TODO</a>
-</li>
-<li> Tato chyba byla opravena v aktuální verzi
-</li>
-<li> Tato chyba byla již opravena ve verzi, která zatím nebyla oficiálně uvolněna
-</li>
-<li> Požadavek na další doplňující informace:
-<ul><li> Operační systém
-</li>
-<li> Verze PostgreSQL
-</li>
-<li> Test reprodukující chybu
-</li>
-<li> Ladící informace
-</li>
-<li> Backtrace výstup debuggeru
-</li>
-</ul>
-</li>
-<li> Jedná se o zatím nezjištěnou chybu, pak můžete čekat
-<ul><li> Záplatu odstraňující chybu, která bude vložena do další velké nebo malé verze
-</li>
-<li> Informaci, že se jedná o chybu, kterou nelze okamžitě řešit a je proto přidána do <a href="http://www.postgresql.org/docs/faqs.TODO.html" title="http://www.postgresql.org/docs/faqs.TODO.html">TODO</a>
-</li>
-</ul>
-</li>
-</ul>
-<h3><a name="item1.9">1.9</a>) Kde najdu informace o známých chybách nebo nepodporovaných vlastnostech?</h3>
-<p>PostgreSQL podporuje rozšířenou podmnožinu SQL:2003. V našem <a href="http://www.postgresql.org/docs/faqs.TODO.html" title="http://www.postgresql.org/docs/faqs.TODO.html">TODO</a> naleznete seznam známých chyb, chybějících vlastností, a plány do budoucna.
-</p>
-<p>Odezva na požadavek na novou vlastnost PostgreSQL je obvykle:
-</p>
-<ul><li> Požadavek je již v <a href="http://www.postgresql.org/docs/faqs.TODO.html" title="http://www.postgresql.org/docs/faqs.TODO.html">TODO</a>
-</li>
-<li> Požadovaná funkce není chtěná protože
-<ul><li> Duplikuje již existující funkci, která respektuje SQL standard
-</li>
-<li> Implementací funkce by se příliš zkomplikoval kód bez relevantního přínosu
-</li>
-<li> Funkce by mohla být nebezpečná nebo nespolehlivá
-</li>
-</ul>
-</li>
-<li> Požadavek je přidán do <a href="http://www.postgresql.org/docs/faqs.TODO.html" title="http://www.postgresql.org/docs/faqs.TODO.html">TODO</a>
-</li>
-</ul>
-<p>PostgreSQL nepožívá systém pro sledování chyb, protože jsme zjistili, že je efektivnější přímo reagovat na maily a udržovat aktuální <a href="http://www.postgresql.org/docs/faqs.TODO.html" title="http://www.postgresql.org/docs/faqs.TODO.html">TODO</a>. V praxi je snaha o co nejrychlejší řešení chyb, a chyby, které by se mohly projevit u mnoha uživatelů jsou opravovány velice rychle. Jediné místo, kde lze dohledat všechny změny, rozšíření a opravy v PostgreSQL je CVS log. Poznámky k verzi "Release notes" nezachycují všechny změny, k němž došlo.
-</p>
-<h3><a name="item1.10">1.10</a>) Jaká je dostupná dokumentace?</h3>
-<p>PostgreSQL obsahuje vynikající dokumentaci zahrnující manuál, manuálové stránky a testovací příklady. Podívejte se do adresáře /doc. Manuál je přístupný online na <a href="http://www.postgresql.org/docs" title="http://www.postgresql.org/docs">http://www.postgresql.org/docs</a>.
-</p>
-<p>K dispozici jsou zdarma dvě online knihy na adresách <a href="http://www.postgresql.org/docs/books/awbook.html" title="http://www.postgresql.org/docs/books/awbook.html">http://www.postgresql.org/docs/books/awbook.html</a> a <a href="http://www.commandprompt.com/ppbook/" title="http://www.commandprompt.com/ppbook/">http://www.commandprompt.com/ppbook/</a>. Další literaturu lze zakoupit. Nejpopulárnější je od Kerryho Douglase. Seznam dostupné literatury je na <a href="http://techdocs.postgresql.org/techdocs/bookreviews.php" title="http://techdocs.postgresql.org/techdocs/bookreviews.php">http://techdocs.postgresql.org/techdocs/bookreviews.php</a>. Ještě je kolekce technicky orientovaných článků tematicky spojených s PostgreSQL na adrese <a href="http://techdocs.postgresql.org/" title="http://techdocs.postgresql.org/">http://techdocs.postgresql.org/</a>.
-</p>
-<p>Řádkový klient psql má \d příkazy pro zobrazení informací o typech, operátorech, funkcích, agregačních funkcí, atd. Použijte \? pro zobrazení dostupných příkazů.
-</p>
-<p>Další dokumentaci najdete na našem webu.
-</p>
-<h3><a name="item1.11">1.11</a>) Jak se mohu naučit SQL?</h3>
-<p>Podívejte se do výše uvedené dokumentace. Další online knihou je "Teach Yourself SQL in 21 Days, Second Edition" na adrese <a href="http://members.tripod.com/er4ebus/sql/index.htm" title="http://members.tripod.com/er4ebus/sql/index.htm">http://members.tripod.com/er4ebus/sql/index.htm</a>. Mnoho našich uživatelů doporučuje knihu The Practical SQL Handbook, Bowman, Judith S., et al., Addison-Wesley. Další The Complete Reference SQL, Groff et al., McGraw-Hill.
-</p>
-<p>Další online tutoriály jsou dostupné na adresách:
-</p>
-<ul><li> <a href="http://www.intermedia.net/support/sql/sqltut.shtm" title="http://www.intermedia.net/support/sql/sqltut.shtm">http://www.intermedia.net/support/sql/sqltut.shtm</a>
-</li>
-<li> <a href="http://sqlcourse.com" title="http://sqlcourse.com">http://sqlcourse.com</a>
-</li>
-<li> <a href="http://www.w3schools.com/sql/default.asp" title="http://www.w3schools.com/sql/default.asp">http://www.w3schools.com/sql/default.asp</a>
-</li>
-<li> <a href="http://mysite.verizon.net/Graeme_Birchall/id1.html" title="http://mysite.verizon.net/Graeme_Birchall/id1.html">http://mysite.verizon.net/Graeme_Birchall/id1.html</a>
-</li>
-</ul>
-<h3><a name="item1.12">1.12</a>) Jak se mohu připojit k týmu vývojářů?</h3>
-<p>Prostudujte si <a href="http://www.postgresql.org/docs/faqs.FAQ_DEV.html" title="http://www.postgresql.org/docs/faqs.FAQ_DEV.html">Developer's FAQ</a>.
-</p>
-<h3><a name="item1.13">1.13</a>) Jak je na tom PostgreSQL v porovnání s jinými databázemi?</h3>
-<p>Software můžeme porovnávat z několika různých pohledů: vlastnosti, výkon, spolehlivost, podpora a cena.
-</p>
-<script></script>
-<h4> Vlastnosti </h4>
-<p>PostgreSQL nabízí většinu funkcí funkcionality velkých komerčních DBMS systémů jako jsou: transakce, vnořené dotazy, spouště, referenční integrita a sofistikovaný systém zamykání. Poskytujeme určité funkce, které ostatní systémy běžně nepodporují. Např. uživatelem definované typy, dědičnost, pravidla (rules), a MVCC architekturu.
-</p>
-<h4> Výkon </h4>
-<p>Výkon PostgreSQL je srovnatelný s ostatními komerčními nebo Open Source databázemi. V některých případech je rychlejší, jindy pomalejší. Náš výkon je obvykle +/-10% vůči ostatním databázím. 
-</p>
-<h4> Spolehlivost </h4>
-<p>Uvědomujeme si, že databáze musí být stoprocentně spolehlivá, jinak je nepoužitelná. Snažíme se, aby každá verze byla dobře otestována a obsahovala minimum chyb. Každá verze je minimálně několik měsíců v beta testovacím režimu. Do produkčního režimu se dostane, až když nedochází k dalším změnám nebo opravám. Věříme, že jsem více než srovnatelní s ostatními databázemi v této oblasti.
-</p>
-<h4> Podpora </h4>
-<p>Na našich internetových konferencích se setkává velká skupina vývojářů a uživatelů při řešení vyskytujících se problémů. 
-Naše internetové konference umožňují kontakt velké skupiny vývojářů a uživatelů. Nemůžeme garantovat opravu chyby, ale komerční DBMSs také vždy negarantují řešení problémů. Věříme ale, že díky přímému kontaktu na vývojáře, naši uživatelskou komunitu, manuálům, a dostupným zdrojovým kódům máme lepší podporu než ostatní DBMSs. Pro ty, kteří preferují komerční "per-incident" podporu, existuje společností, kteří ji nabízejí (FAQ sekce 1.7.)
-</p>
-<h4> Cena </h4>
-<p>PostgreSQL lze používat bezplatně (a to i pro komerční použití). Také můžete neomezeně používat náš kód ve svých produktech s výjimkami specifikovanými v naší licenci (přebíráme BSD licenci).
-</p>
-<h3><a name="item1.14">1.14</a>) Je PostgreSQL připraven na aktuální zavádění letního času v některých zemích?</h3>
-<p>Počínaje verzí 8.0.[4+] podporuje PostgreSQL letní čas také pro USA. Podpora letního času (daylight saving time) pro Kanadu a Západní Austrálii je obsažena ve verzích 8.0.[10+] a 8.1.[6+] a všech následujících verzích. Starší verze používaly systémovou databázi časových zón obsahující, kromě jiného, informaci o tom, zda se pro danou časovou zónu rozlišuje mezi letním a zimním časem.
-</p>
-<hr>
-<h2 align="center">Dotazy na klientská rozhraní</h2>
-<h3><a name="item2.1">2.1</a>) Která rozhraní jsou použitelná pro PostgreSQL?</h3>
-<p>PostgreSQL se distribuuje pouze s rozhraním pro jazyk C a embedded C. Všechna další rozhraní představují nezávislé projekty, které je třeba stáhnout z internetu samostatně. Osamostatnění těchto projektů umožňuje nezávislost vývojových týmů a možnost vydávat nové verze bez ohledu na vydání nové verze PostgreSQL.
-</p>
-<p>Některé programovací jazyky jako je např. PHP obsahují rozhraní pro PostgreSQL. Rozhraní pro jazyky jako je Perl, Tcl, Python a mnoho dalších jsou dostupné na adrese: <a href="http://gborg.postgresql.org" title="http://gborg.postgresql.org">http://gborg.postgresql.org</a> v sekci Drivers/Interfaces.
-</p>
-<h3><a name="item2.2">2.2</a>) Jaké nástroje lze použít pro PostgreSQL a web?</h3>
-<p>Dobrým úvodem do problematiky databází v prostředí webových stránek může být web <a href="http://www.webreview.com" title="http://www.webreview.com">http://www.webreview.com</a>.
-</p>
-<p>PHP (<a href="http://www.php.net" title="http://www.php.net">http://www.php.net</a>) je vynikajícím rozhraním pro tvorbu webů.
-</p>
-<p>Pro složitější úlohy se často používá Perl a jeho BDB:Pg rozhraní s podporou CGI - CGI.pm nebo mod_perl(u).
-</p>
-<h3><a name="item2.3">2.3</a>) Existuje grafické rozhraní pro PostgreSQL?</h3>
-<p>K dispozici je řada grafických nástrojů podporujících PostgreSQL a to od komerčních nebo open source vývojářů. Podrobný seznam naleznete na adrese 
-<a href="http://www.postgresql.org/docs/techdocs.54" title="http://www.postgresql.org/docs/techdocs.54">http://www.postgresql.org/docs/techdocs.54</a>.
-</p>
-<hr>
-<h2 align="center">Administrativní dotazy</h2>
-<h3><a name="item3.1">3.1</a>) Jak nainstalovat PostgreSQL jinam než do /usr/local/pgsql?</h3>
-<p>Při spouštění configure nastavte parametr --prefix
-</p>
-<h3><a name="item3.2">3.2</a>) Jak nastavit pravidla pro přístup z jiných stanic?</h3>
-<p>Ve výchozí konfiguraci, PostgreSQL umožňuje pouze připojení z lokálního uživatele prostřednictvím Unix domain sockets nebo TCP/IP spojení. Bez modifikace listen_addresses v souboru postgresql.conf, a povolení adresy v souboru $PGDATA/pg_hba.conf se nelze připojit k PostgreSQL z ostatních stanic. Změna výše zmíněných parametrů vyžaduje restart databázového serveru.
-</p>
-<h3><a name="item3.3">3.3</a>) Jak vyladit databázi na vyšší výkon?</h3>
-<p>Výkon systému můžete ovlivnit ve třech oblastech:
-</p>
-<h4> Změny dotazu </h4>
-<ul><li> Použitím indexů včetně částečných a funkcionálních
-</li>
-<li> Použitím COPY místo opakovaných INSERTů
-</li>
-<li> Sloučením mnoha SQL příkazů do jedné transakce snížením režie na commit
-</li>
-<li> Používáním CLUSTERU, pokud načítáte větší počet řádek podle indexu
-</li>
-<li> Použitím klauzule LIMIT v poddotazech
-</li>
-<li> Použitím předpřipravených dotazů
-</li>
-<li> Používáním ANALYZE. Tento příkaz aktualizuje statistiky, které se používají při optimalizaci dotazu
-</li>
-<li> Pravidelné použití VACUUM nebo používání pg_autovacuum
-</li>
-<li> Odstraněním indexů před rozsáhlými změnami v datech
-</li>
-</ul>
-<h4> Konfigurace serveru </h4>
-<p>Určité parametry v souboru postgresql.conf mají vliv na výkon serveru. Detaily naleznete v příručce Administrátora v Server Run-time Environment/Run-time Configuration. Další komentáře naleznete v <a href="http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_conf_e.html" title="http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_conf_e.html">http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_conf_e.html</a> a <a href="http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html" title="http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html">http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html</a>.
-</p>
-<h4> Výběr hardware </h4>
-<p>Vliv hardware na výkon serveru je popsán v dokumentech <a href="http://candle.pha.pa.us/main/writings/pgsql/hw_performance/index.html" title="http://candle.pha.pa.us/main/writings/pgsql/hw_performance/index.html">http://candle.pha.pa.us/main/writings/pgsql/hw_performance/index.html</a> a <a href="http://www.powerpostgresql.com/PerfList/" title="http://www.powerpostgresql.com/PerfList/">http://www.powerpostgresql.com/PerfList/</a>.
-</p>
-<h3><a name="item3.4">3.4</a>) Jaké mám ladící prostředky?</h3>
-<p>Nastavením log_* proměnných v konfiguraci serveru si vynutíte logování dotazů a procesních statistik, které Vám mohou  pomoci při ladění a optimalizaci výkonu.
-</p>
-<h3><a name="item3.5">3.5</a>) Co znamená "Sorry, too many clients", když se zkouším připojit?</h3>
-<p>Překročil jste výchozí limit, který je 100 současně připojených uživatelů. V konfiguraci serveru v postgresql.conf tuto hodnotu můžete zvětšit změnou hodnoty max_connection. Nezapomeňte restartovat server.
-</p>
-<h3><a name="item3.6">3.6</a>) Proč je nutný dump a obnovení (load) databáze při upgradu PostgreSQL?</h3>
-<p>Způsob číslování je popsán v dokumentaci na <a href="http://www.postgresql.org/support/versioning" title="http://www.postgresql.org/support/versioning">http://www.postgresql.org/support/versioning</a>. Instrukce k provedení migrace na vyšší verzi jsou taktéž v dokumentaci na adrese <a href="http://www.postgresql.org/docs/current/static/install-upgrading.html" title="http://www.postgresql.org/docs/current/static/install-upgrading.html">http://www.postgresql.org/docs/current/static/install-upgrading.html</a>.
-</p>
-<h3><a name="item3.7">3.7</a>) Jaký hardware bych měl používat?</h3>
-<p>Jelikož PC jsou většinou kompatibilní, lidé mají tendence věřit, že všechna PC jsou stejně kvalitní. Což není pravda. Paměti ECC, SCSI a kvalitní základní desky jsou mnohem spolehlivější a výkonnější než lacinější hardware. PostgreSQL poběží na většině hardwaru, nicméně pokud je pro Vás spolehlivost a výkon systému důležitá,  je dobré věnovat čas nalezení  vhodné hardwarové konfigurace. Na našich elektronických konferencích můžete diskutovat o vhodných konfiguracích a značkách.
-</p>
-<hr>
-<h2 align="center">Provozní dotazy</h2>
-<h3><a name="item4.1">4.1</a>) Jak získat pouze první řádek dotazu? Náhodný řádek?</h3>
-<p>Pokud potřebujete pouze několik řádků a pokud víte kolik, použijte 
-SELECT LIMIT. Pokud bude možné použít index shodující se s ORDER BY,
-je možné, že se nebude provádět celý dotaz. Pokud neznáte počet záznamů,
-použijte kurzor a příkaz FETCH.
-</p>
-<p>Pro výběr náhodného řádku použijte příkaz ve tvaru:
-</p>
-<pre>
-SELECT col
-FROM tab
-ORDER BY random()
-LIMIT 1;
-</pre>
-<h3><a name="item4.2">4.2</a>) Jak získám seznam tabulek, indexů, databází, a definovaných uživatelů. Mohu vidět dotazy, které používá psql pro zobrazení těchto informací?</h3>
-<p>V psql příkazem \dt získáte seznam tabulek. Úplný seznam příkazů psql získáte příkazem \?. Alternativně si můžete prostudovat zdrojový kód psql - soubor pgsql/src/bin/psql/describe.c, který obsahuje SQL příkazy, které jsou generovány pro získání výstupu psql "backslash" příkazů. Také můžete nastartovat psql s parametrem -E, který způsobí zobrazení všech SQL příkazů, které se odesílají na server. PostgreSQL také podporuje SQL standard INFORMAČNÍ SCHÉMATA (standardní systémové tabulky). Klasickým dotazem do systémových tabulek získáte požadované informace o struktuře databáze.
-</p>
-<p>Systémové tabulky PostgreSQL (mimo rámec SQL standardů) používají prefix pg_. Pro zjištění struktury databáze je můžete použít také, i když preferovány jsou dotazy do informačního schématu.
-</p>
-<p>Seznam všech databází získáte příkazem psql -l
-</p>
-<p>Další inspiraci najdete v souboru pgsql/src/tutorial/syscat.source. Obsahuje ilustrační SELECTy potřebné k získání informací z systémových tabulek databáze.
-</p>
-<h3><a name="item4.3">4.3</a>) Jak změnit datový typ sloupce?</h3>
-<p>Ve verzích 8.0 a pozdějších jednoduše:
-</p>
-<pre>
-ALTER TABLE ALTER COLUMN TYPE
-</pre><p>V starších verzích:
-</p>
-<pre>
-BEGIN;
-ALTER TABLE tab ADD COLUMN new_col new_data_type;
-UPDATE tab SET new_col = CAST(old_col AS new_data_type);
-ALTER TABLE tab DROP COLUMN old_col;
-COMMIT;
-</pre><p>Po změně spusťte příkaz VACUUM FULL, aby došlo k uvolnění diskového prostoru použitého v tu chvíli již neplatnými záznamy.
-</p>
-<h3><a name="item4.4">4.4</a>) Jaká je maximální velikost řádku, tabulky a databáze?</h3>
-<p>PostgreSQL má tato omezení:
-</p>
-<table border="0">
-<tr><td>    Maximální velikost databáze: </td><td>           neomezena (existují 32TB db)
-</td></tr>
-<tr><td>    Maximální velikost tabulky: </td><td>           32 TB
-</td></tr>
-<tr><td>    Maximální velikost řádky: </td><td>             480GB
-</td></tr>
-<tr><td>    Maximální velikost položky </td><td>            1 GB
-</td></tr>
-<tr><td>    Maximální počet řádků v tabulce:  </td><td>     neomezeno
-</td></tr>
-<tr><td>    Maximální počet sloupců v tabulce:  </td><td>   250-1600 podle typů
-</td></tr>
-<tr><td>    Maximální počet indexů na tabulce:  </td><td>   neomezeno
-</td></tr>
-</table>
-<p>Ve skutečnosti nic není neomezeno, limitem bývá vždy dostupná disková
-paměť nebo velikost operační paměti. Pokud máte některou z těchto
-hodnot neobvykle velkou, může dojít ke snížení výkonu.
-</p>
-<p>Maximální velikost tabulky je 32 TB a nevyžaduje podporu velkých
-souborů operačním systémem. Velké tabulky se ukládají do několika 1 GB
-souborů takže limity souborového systému nejsou podstatné.
-</p>
-<p>Maximální velikost tabulky a maximální počet sloupců můžeme
-zečtyřnásobit nastavením velikosti bloku na 32K.
-</p>
-<p>Indexy jsou povolené pouze na sloupcích jejichž délka je menší než 2000 znaků. Pokud tuto délku překročíme a index potřebujeme pro zajištění jednoznačnosti, je vhodnější použít funkcionální index nad MD5 funkcí nebo fulltextový index.
-</p>
-<h3><a name="item4.5">4.5</a>) Kolik diskového prostoru je potřeba k uložení dat z normálního textového souboru?</h3>
-<p>PostgreSQL vyžaduje až pětinásobek diskového prostoru k uložení dat z
-textového souboru.
-</p>
-<p>Například, uvažujme soubor se 100 tisíci řádky obsahující na každé
-řádce celé číslo a textový popis. Text je v průměrně dvacet bytů
-dlouhý. Textový soubor bude 2.8 MB dlouhý. Velikost databáze
-obsahující odpovídající data bude zhruba 5.2 MB.
-</p>
-<pre>
-    24 bytů: hlavička řádku (přibližně)
-    24 bytů: jedna celočíselná položka a jedna textová
-   + 4 byty: ukazatel na stránku k entici
-   ------------------------------------------------------
-    52 bytů na řádek
-</pre><p>Velikost datové stránky PostgreSQL je 8192 bytů (8KB)
-</p>
-<pre>
- 8192 bytů na stránce
----------------------- = 158 řádek na stránku
-  52 bytů za řádek
-
-100000 řádek
------------------------ = 633 stránek (zaokrouhleno nahoru)
-   158 řádek na stránce
-
-633 datových stránek * 8192 bytů na každou stránku = 5,185,536 bytů (5.2 MB)
-</pre><p>Indexy nemají tak velkou režii, ale mohou být také velké, protože
-obsahují indexovaná data.
-</p>
-<p>Hodnoty NULL jsou uloženy v bitmapách, takže zabírají jen velmi málo
-diskového prostoru.
-</p>
-<h3><a name="item4.6">4.6</a>) Můj dotaz je pomalý a nepoužívá vytvořené indexy. Proč?</h3>
-<p>Každý dotaz nemusí nutně použít existující indexy. Index se použije
-tehdy, když je tabulka větší než určitá minimální velikost, a dotaz
-vybírá pouze procentuálně malou část řádků tabulky. To proto, že
-náhodný přístup k disku daný čtením indexu může být pomalejší než
-lineární čtení tabulky nebo sekvenční čtení.
-</p>
-<p>PostgreSQL rozhoduje o použití indexů na základě statistiky přístupů k
-tabulce. Tyto statistiky se shromažďují příkazy VACUUM ANALYZE nebo
-ANALYZE. Díky statistikám má optimizer informaci o počtu řádek v
-tabulce a může lépe rozhodnout o použití indexů. Statistiky se uplatní
-při určení optimálního pořadí a metody spojení tabulek. Statistiky by
-se měli aktualizovat opakovaně, tak jak se mění obsah tabulek.
-</p>
-<p>Indexy nejsou obyčejně použity pro setřídění nebo spojení tabulek.
-Sekvenční zpracování následované explicitním tříděním je obyčejně
-rychlejší než použití indexu na velké tabulce.
-</p>
-<p>Jinak je tomu v případě použití LIMIT a ORDER BY, při kterém se
-většinou index použije, jelikož je výsledkem pouze malá část tabulky.
-</p>
-<p>Pokud si myslíte, že optimizer mylně zvolil sekvenční prohledávání
-tabulky, použijte příkaz SET enable_seqscan TO 'off' a zkuste zda je
-prohledávání s indexem rychlejší.
-</p>
-<p>Při vyhledávání na základě vzoru jako je např. operátor LIKE nebo ~ se
-indexy použijí pouze za určitých skutečností:
-</p>
-<ul><li> začátek hledaného vzoru musí být ukotven k začátku, tj.
-<ul><li> vzor LIKE nesmí začínat %
-</li>
-<li> ~ regulární výraz musí začínat ^
-</li>
-</ul>
-</li>
-<li> vzor nesmí začínat intervalem, např. [a-e]
-</li>
-<li> vyhledávaní, které není Case sensitiv jako je ILIKE nebo ~* nepoužívá indexy. Můžete ale použít funkcionální indexy, které jsou popsány v sekci 4.8
-</li>
-<li> při inicializaci databáze (initdb) musí být použito C locale nebo vytvořte speciální text_pattern_index, který umožní, při respektování zmíněných podmínek použití indexu operací LIKE. Pro vyhledávání celých slov je možné a výhodné použít fulltext.
-</li>
-</ul>
-<h3><a name="item4.7">4.7</a>) Jak zjistím, jak se vyhodnocuje můj dotaz?</h3>
-<p>Podívejte se do nápovědy k příkazu EXPLAIN.
-</p>
-<h3><a name="item4.8">4.8</a>) Jak použít case-(in)sensitive regulární výraz? Jak použít index pro case insensitive hledání?</h3>
-<p>Vyhledávání prostřednictvím regulárních vzorů zajišťuje operátor ~, který je case-sensitive. Jeho case-insensitive varianta je operátor ~*. Case-insensitive variací operátoru LIKE je operátor ILIKE.
-</p>
-<p>Case-insensitive vyhledání se řeší:
-</p>
-<pre>
-SELECT *
-FROM tab
-WHERE lower(col) = 'abc';
-</pre><p>Tento dotaz nepoužije standardní index. Musíte použít tzv. funkcionální index:
-</p>
-<pre>
-CREATE INDEX tabindex ON tab (lower(col));
-</pre><p>Pokud index vytvoříme jako unikátní, tak můžeme ukládat řetězce obsahující malá i velká písmena, ale nikoliv řetězce, které se od sebe odlišují jen v malých a velkých písmenech. K zajištění zápisu řetězce obsahující pouze malá nebo pouze velká písmena použijte CHECK kontroly nebo triggery.
-</p>
-<h3><a name="item4.9">4.9</a>) Jak v dotazu detekovat, že položka je NULL? Jak bezpečně spojit dva řetězce, pokud mohou obsahovat NULL? Lze třídit podle toho, jestli je položka NULL nebo ne?</h3>
-<p>Pokud chcete testovat hodnotu NULL použijte operátor IS:
-</p>
-<pre>
-   SELECT *
-   FROM tab
-   WHERE col IS NULL;
-</pre><p>K spojení řetězců, které mohou obsahovat hodnotu NULL, používejte funkci COALESCE(), např.:
-</p>
-<pre>
-   SELECT COALESCE(col1, '') || COALESCE(col2, '')
-   FROM tab
-</pre><p>Pokud chcete třídit podle hodnoty NULL, použijte výraz IS NULL nebo IS NOT NULL v klauzuli ORDER. Hodnota pravda má přednost před hodnotou false a tedy pokud použijete:
-</p>
-<pre>
-   SELECT *
-   FROM tab
-   ORDER BY (col IS NOT NULL)
-</pre><p>tak záznamy s NULL budou na začátku setříděných dat.
-</p>
-<h3><a name="item4.10">4.10</a>) Jaké jsou rozdíly mezi různými znakovými typy?</h3>
-<table border="0">
-<tr><td>Typ </td><td> Interní název </td><td> Poznámky
-</td></tr>
-<tr><td> VARCHAR(n)</td><td> varchar</td><td> n určuje maximální délku
-</td></tr>
-<tr><td> CHAR(n)</td><td> bpchar </td><td> řetězec je do dané délky rozšířen mezerami
-</td></tr>
-<tr><td> TEXT</td><td> text</td><td> bez omezení délky
-</td></tr>
-<tr><td> BYTEA</td><td> bytea</td><td> pole bytů nespecifikované délky
-</td></tr>
-<tr><td> "char"</td><td> char</td><td> jeden znak
-</td></tr>
-</table>
-<p>Na interní názvy můžete narazit v systémovém katalogu nebo v některých chybových hlášeních.
-</p>
-<p>Čtyři první typy jsou tzv. varlena typy (první čtyři byty na disku jsou obsahují délku, ostatní obsahují vlastní data). Skutečně obsazený prostor je tedy o něco málo větší než deklarovaná velikost. Na druhou stranu, delší řetězce jsou komprimovány, takže obsazený prostor na disku může být menší než se čeká.
-</p>
-<p>VARCHAR(n) je vhodný pro ukládání různě dlouhých řetězců u kterých známe délkové omezení, TEXT pro řetězce bez omezení délky (maximum je jeden gigabyte).
-</p>
-<p>CHAR(n) se používá pro uložení stejně dlouhých řetězců. CHAR(n) doplní mezerami na specifikovanou délku, VARCHAR(n) hodnoty se ukládají tak jak jsou. BYTEA je pro ukládání binárních dat - non ASCII hodnot. Všechny zmíněné typy mají podobné výkonové charakteristiky.
-</p>
-<h3><a name="item4.11.1">4.11.1</a>) Jak vytvořit serial/auto-increment položku?</h3>
-<p>V PostgreSQL můžete použít datový typ SERIAL. Jeho použitím se automaticky vytvoří sekvence.
-Například:
-</p>
-<pre>
-CREATE TABLE person (
-  id   SERIAL,
-  name TEXT
-);
-</pre><p>je automaticky transformováno na:
-</p>
-<pre>
-CREATE SEQUENCE person_id_seq;
-CREATE TABLE person (
-  id   INT4 NOT NULL DEFAULT nextval('person_id_seq'),
-  name TEXT
-);
-</pre><p>Podrobnější informace najdete v manuálu v popisu příkazu create_sequence.
-</p>
-<h3><a name="item4.11.2">4.11.2</a>) Jak získat hodnotu SERIAL po vložení řádku?</h3>
-<p>Nejjednodušším způsob, jak získat vygenerovanou hodnotu typu SERIAL, je využít klauzuli RETURNING. Pro tabulku z 4.11.1 vypadá takto:
-</p>
-<pre>
-INSERT INTO person (name) VALUES ('Blaise Pascal') RETURNING id;
-</pre><p>Také můžete použít funkci nextvall() a její výsledek použít v příkazu INSERT, nebo zavolat currval() po provedení příkazu INSERT.
-</p>
-<h3><a name="item4.11.3">4.11.3</a>) Nezpůsobí currval() a nextval() problémy ve více uživatelském prostředí?</h3>
-<p>Ne, currval vrací vždy hodnotu, která byla vygenerována pro vás.
-</p>
-<h3><a name="item4.11.4">4.11.4</a>) Proč není vygenerované číslo použito při přerušení transakce?Proč vznikají díry v číslování prostřednictvím sekvence nebo typu SERIAL?</h3>
-<p>Poté co sekvence vygeneruje nové číslo, tak se nedochází k zamčení sekvence a nečeká se na úspěšné nebo neúspěšné dokončení transakce. Odvoláním transakce, která si vyžádala čísla sekvence se tato čísla nenávratně ztratí.
-</p>
-<h3><a name="item4.12">4.12</a>) Co to je OID? Co je to CTID?</h3>
-<p>V případě, že tabulku nezaložíme s atributem WITHOUT OIDS, tak má každý řádek unikátní identifikační číslo OID. Toto číslo je 4 bajtové celé číslo, které je jedinečné v celé instalaci. Přeteče po 4 miliardách řádků. PostgreSQL používá OIDs jako interní linky v interních systémových tabulkách.
-</p>
-<p>K získání unikátního čísla v nesystémových tabulkách je vhodnější použití typu SERIAL než OID, jelikož sekvence SERIAL se používá pouze pro jednu tabulku a je tudíž méně náchylná na přetečení. Pokud byste se toho obávali, použijte typ SERIAL8.
-</p>
-<p>CTID se používá k identifikaci konkrétního fyzického řádku. CTID se mění pokud je řádek modifikován nebo znovu načten. Používají ho indexy jako adresaci fyzických řádků.
-</p>
-<h3><a name="item4.13">4.13</a>) Co znamená chybové hlášení "ERROR: Memory exhausted in AllocSetAlloc()"?</h3>
-<p>Pravděpodobně jste vyčerpal dostupnou virtuální paměť, nebo tvůj kernel
-má příliš nízké limity u určitých zdrojů. Před startem PostgreSQL vyzkoušejte:
-</p>
-<pre>
-ulimit -d 262144
-limit datasize 256m
-</pre><p>Možná, že se projde pouze jeden příkaz - záleží to na vašem shellu.
-Měl by zvednout limity datových segmentů vašich procesů na dostatečně velkou
-hodnotu a snad umožnit dokončení dotazu. Změna limitů se bude aplikovat 
-pouze na aktuální proces a na všechny nově vytvořené procesy. Jestliže máte
-problém s SQL klientem, protože vám server vrátil příliš dat, zkuste to
-před startem klienta.
-</p>
-<h3><a name="item4.14">4.14</a>) Jak zjistím, kterou verzi PostgreSQL používám?</h3>
-<p>V psql napište:
-</p>
-<pre>
-SELECT version();
-</pre>
-<h3><a name="item4.15">4.15</a>) Jak vytvořit sloupec, který bude implicitně obsahovat aktuální čas?</h3>
-<p>Použijte CURRENT_TIMESTAMP:
-</p>
-<pre>
-CREATE TABLE test (x int, modtime TIMESTAMP DEFAULT CURRENT_TIMESTAMP );
-</pre>
-<h3><a name="item4.16">4.16</a>) Jak provést vnější spojení (outer join)?</h3>
-<p>PostgreSQL podporuje standardní SQL syntaxi pro vnější spojení. Zde jsou 
-dva příklady:
-</p>
-<pre>
-SELECT *
-FROM t1 LEFT OUTER JOIN t2 ON (t1.col = t2.col);
-</pre><p>nebo
-</p>
-<pre>
-SELECT *
-FROM t1 LEFT OUTER JOIN t2 USING (col);
-</pre><p>Tyto identické dotazy spojí sloupec t1.col k sloupci t2.col, a ještě vrátí všechny nespárované řádky t2 (ty, které nedohledá v t2). RIGHT JOIN by připojil všechny nespárované řádky z t2. FULL JOIN vrátí všechny spárované řádky i všechny zbývající řádky z obou tabulek. Klíčové slovo OUTER je volitelné. Běžná operace JOIN se také označuje jako vnitřní spojení.
-</p>
-<h3><a name="item4.17">4.17</a>) Jak provést dotaz napříč několika databázemi?</h3>
-<p>Neexistuje žádný způsob, jak se v dotazu odkazovat na tabulky z jiné než aktuální databáze. A to protože má systémové tabulky uložené nezávisle v každé databázi a není tak úplně zřejmé, jak by se dotaz provedený napříč databázemi měl chovat.
-</p>
-<p>Jeden z doplňků dblink umožňuje dotaz nad několika tabulkami pomocí funkcí. Druhý způsob je simultální připojení klienta ke všem relevantním databázím a sloučení výsledku na straně klienta.
-</p>
-<h3><a name="item4.18">4.18</a>) Může funkce vrátit více řádků nebo sloupců?</h3>
-<p>Jde to jednoduše pomocí set-returning funkce. Více na 
-<a href="http://www.postgresql.org/docs/techdocs.17" title="http://www.postgresql.org/docs/techdocs.17">http://www.postgresql.org/docs/techdocs.17</a>.
-</p>
-<h3><a name="item4.19">4.19</a>) Co je příčinou chyby "relation with OID xxxxx does not exist"?</h3>
-<p>Nechtěným vedlejším efektem kešování SQL dotazů v PL/pgSQL funkci je problém s neplatnými odkazy na dočasné tabulky, které byly od prvního spuštění funkce zrušeny a znovu vytvořeny před dalším spuštěním PL/pgSQL funkce. Řešením je použít příkaz EXECUTE a to proto, že prováděcí plán SQL příkazu spouštěného příkazem EXECUTE se vytváří pokaždé znovu (neukládá se do cache).
-</p>
-<p>Tento problém by se neměl vyskytovat u PostgreSQL verze 8.3 a vyšších verzích.
-</p>
-<h3><a name="item4.20">4.20</a>) Jaké jsou možnosti replikace databází?</h3>
-<p>Replikaci databáze umožňuje několik technoligií. Každá má určité výhody a nevýhody.
-</p>
-<p>Master/Slave replikaci podporuje jeden hlavní server, který přijímá požadavky na zápis a čtení, a několik podřízených serverů, které umožňují pouze čtení (SELECT). Nejrozšířenějším volně dostupným řešením tohoto typu je <a href="http://main.slony.info/" title="http://main.slony.info/">Slony-I</a>.
-</p>
-<p>Replikace typu Multi-master podporuje existenci několika serverů s povoleným zápisem na více replikovaných serverech. Toto řešení zvyšuje zátěž serverů, protože je nutná synchronizace serverů. Nejrozšířenějším volně dostupným řešením je <a href="http://pgfoundry.org/projects/pgcluster/" title="http://pgfoundry.org/projects/pgcluster/">PGCluster</a>.
-</p>
-<p>Ještě existuje několik komerčních a hardware řešení replikací podporujících různé modely replikace.
-</p>
-<h3><a name="item4.21">4.21</a>) Proč v dotazu nejsou rozpoznány názvy mých tabulek nebo funkcí? Proč jsou velká písmena v názvech automaticky převedena na malá písmena?</h3>
-<p>Nejčastějším důvodem nerozpoznání názvu objektu bylo použití vložení názvu sloupce nebo tabulky  mezi uvozovky při zakládání tabulky. Pokud se název zapíše mezi uvozovky, pak je case sensitive, a v důsledku toho je nutné názvy těchto sloupců nebo tabulek v SQL příkazech také vkládat mezi uvozovky (pokud obsahují velká písmena). Některé programy, jako je například pgAdmin, automaticky používají uvozovky. Takže pokud chcete, aby systém identifikoval identifikátor, musíte:
-</p>
-<ul><li> nepoužívat uvozovky v příkazu CREATE TABLE
-</li>
-<li> v identifikátoru použít pouze malá písmena
-</li>
-<li> v dotazech vkládat identifikátory do uvozovek
-</li>
-</ul>
-</body>
-</htm>
diff --git a/doc/src/FAQ/FAQ_farsi.html b/doc/src/FAQ/FAQ_farsi.html
deleted file mode 100644
index b304095b75..0000000000
--- a/doc/src/FAQ/FAQ_farsi.html
+++ /dev/null
@@ -1,1533 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- saved from url=(0122) -->
-<HTML dir="rtl"><HEAD><TITLE>PostgreSQL FAQ</TITLE>
-<META content="Microsoft FrontPage 6.0" name=GENERATOR>
-<META http-equiv=Content-Type content="text/html; charset=utf-8"></HEAD>
-<BODY text=#000000 vLink=#A00000 aLink=#0000FF link=#FF0000 bgColor=#ffffff>
-<h1 dir="rtl"><font face="Tahoma"><span lang="fa">سوالاتي كه اغلب در مورد
-</span> </font>
-<font face="Tahoma">PostgreSQL</font><span lang="fa"><font face="Tahoma">‌ 
-پرسيده مي شوند</font></span></h1>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">تاريخ آخرين اصلاح اين فايل: 28 
-شهریور 1383 هجری شمسی</span></font></p>
-<P dir="rtl"><span lang="fa"><font face="Tahoma">نگهدارنده اصلي فايل (زبان 
-انگليسي)در حال حاضر </font></span><font face="Tahoma">: Bruce Momjian
-<A 
-href="mailto:[email protected]">[email protected]</A></font></P>
-<P dir="rtl"><span lang="fa"><font face="Tahoma">نگهدارنده فايل به زبان فارسي:
-</font></span><font face="Tahoma"><a href="mailto:[email protected]">
[email protected]</a> </font><span lang="fa"><font face="Tahoma">&nbsp;محمود 
-تقي‌زاده مهرجردی</font></span><font face="Tahoma"><BR></font></P>
-<P dir="rtl"><span lang="fa"><font face="Tahoma">آخرين نسخه اين فايل را 
-مي‌توانيد از اين آدرس بگيريد </font></span><font face="Tahoma">&nbsp;<A 
-href="http://www.postgresql.org/docs/faqs/FAQ.html">http://www.PostgreSQL.org/docs/faqs/FAQ.html</A></font></P>
-<P dir="rtl"><span lang="fa"><font face="Tahoma">سوالاتي كه در مورد يك 
-سکوی(پلتفرم) خاص است در اين آدرس جواب داده شده اند </font></span><font face="Tahoma">
-&nbsp;<A 
-href="http://www.postgresql.org/docs/index.html">http://www.PostgreSQL.org/docs/index.html</A></font></P>
-<HR dir="rtl">
-
-<H2 align=center dir="rtl"><font face="Tahoma"><span lang="fa">سوالات عمومي</span></font></H2>
-<p dir="rtl"><font face="Tahoma"><a href="#1.1">1.1</a>) PostgreSQL</font><span lang="fa"><font face="Tahoma"> 
-چيست و چگونه بايد آن را تلفظ كرد؟</font></span><font face="Tahoma"><BR><A 
-href="#1.2">1.2</A>)
-<span lang="fa">قانون كپي رايت‌ (حقوق معنوي) در مورد </span>PostgreSQL
-<span lang="fa">&nbsp;به چه صورت است؟</span><BR><A 
-href="#1.3">1.3</A>)<span lang="fa">
-</span>PostgreSQL</font><span lang="fa"><font face="Tahoma">‌ روي چه نوع 
-يونيكسهايي اجرا مي‌شود؟</font></span><font face="Tahoma"><BR><A 
-href="#1.4">1.4</A>)
-</font><span lang="fa"><font face="Tahoma">روي چه محيطهاي غير يونيكسي مي‌توان آن 
-را اجرا كرد؟</font></span><font face="Tahoma"><BR><A 
-href="#1.5">1.5</A>) PostgreSQL</font><span lang="fa"><font face="Tahoma"> 
-را از كجا مي‌توانم بگيرم؟</font></span><font face="Tahoma"><BR><A 
-href="#1.6">1.6</A>) 
-</font><span lang="fa"><font face="Tahoma">از كجا خدمات پشتيباني بگيرم؟</font></span><font face="Tahoma"><BR><A 
-href="#1.7">1.7</A>)</font><span lang="fa"><font face="Tahoma"> 
-آخرين نسخه اعلام شده چيست؟</font></span><font face="Tahoma"><BR><A 
-href="#1.8">1.8</A>) 
-</font><span lang="fa"><font face="Tahoma">چه مستندات و راهنمائيهايي وجود دارند؟</font></span><font face="Tahoma"><BR><A 
-href="#1.9">1.9</A>) 
-<span lang="fa">چگونه مي‌توانم ازاشكالات شناخته شده و يا امكاناتي كه در اين 
-پايگاه داده وجود ندارد&nbsp; مطلع شوم؟</span><BR><A 
-href="#1.10">1.10</A>)
-</font><span lang="fa"><font face="Tahoma">چگونه مي‌توانم زبان </font></span>
-<font face="Tahoma">SQL</font><span lang="fa"><font face="Tahoma"> را ياد بگيرم؟</font></span><font face="Tahoma"><BR><A 
-href="#1.11">1.11</A>)</font><span lang="fa"><font face="Tahoma"> 
-آيا </font></span><font face="Tahoma">PostgreSQL</font><span lang="fa"><font face="Tahoma"> 
-مشكل </font></span><font face="Tahoma">Y2K</font><span lang="fa"><font face="Tahoma">‌ 
-دارد يا خير؟</font></span><font face="Tahoma"><BR><A 
-href="#1.12">1.12</A>) 
-</font><span lang="fa"><font face="Tahoma">چگونه مي‌توانم به تيم برنامه نويس
-</font></span><font face="Tahoma">PostgreSQL</font><span lang="fa"><font face="Tahoma"> 
-ملحق شوم؟</font></span><font face="Tahoma"><BR><A 
-href="#1.13">1.13</A>) 
-<span lang="fa">چگونه مي‌توانم يك اشكال را به گروه برنامه نويس اعلام كنم؟</span><BR><A 
-href="#1.14">1.14</A>)
-</font><span lang="fa"><font face="Tahoma">&nbsp;وضعيت </font></span>
-<font face="Tahoma">PostgreSQL</font><span lang="fa"><font face="Tahoma">‌ در 
-مقايسه با ساير </font></span><font face="Tahoma">DBMS<span lang="fa">ها به چه 
-صورت است؟</span><BR><A 
-href="#1.15">1.15</A>)
-<span lang="fa">من چگونه مي‌توانم از نظر مالي به </span>PostgreSQL<span lang="fa"> 
-كمك كنم؟</span><BR>
-</font></p>
-<h2 align="center" dir="rtl"><font face="Tahoma"><span lang="fa">سوالات مربوط به 
-استفاده از پايگاه داده</span></font></h2>
-<p dir="rtl"><font face="Tahoma"><A 
-href="#2.1">2.1</A>)
-<span lang="fa">آيا هيچ درايور </span>ODBC</font><span lang="fa"><font face="Tahoma">‌ 
-براي </font></span><font face="Tahoma">PostgreSQL</font><font face="Tahoma"><span lang="fa"> 
-وجود دارد؟</span><BR><A 
-href="#2.2">2.2</A>)
-<span lang="fa">چه ابزارهايي براي استفاده از </span>PostgreSQL<span lang="fa">‌ 
-با صفحات وب وجود دارد؟</span><BR><A 
-href="#2.3">2.3</A>)
-<span lang="fa">آيا </span>PostgreSQL<span lang="fa">‌ يك واسط كاربري گرافيكي 
-دارد؟</span><BR><A 
-href="#2.4">2.4</A>)
-<span lang="fa">با چه زبانهاي برنامه‌نويسي مي‌توان با </span>PostgreSQL<span lang="fa">‌ 
-ارتباط برقرار كرد؟</span><BR>
-</font></p>
-<h2 align="center" dir="rtl"><span lang="fa"><font face="Tahoma">سوالات مربوط به 
-راهبري</font></span></h2>
-<p dir="rtl"><font face="Tahoma"><A 
-href="#3.1">3.1</A>)
-<span lang="fa">چگونه مي‌توانم </span>PostgreSQL<span lang="fa">‌ را در شاخه‌اي 
-غير از </span>/usr/local/pgsql/<span lang="fa">&nbsp; نصب كنم؟</span><BR><A 
-href="#3.2">3.2</A>)
-<span lang="fa">چرا موقعي كه من برنامه </span>postmaster<span lang="fa">‌ را 
-اجرا مي كنم پيام </span>Bad system call<span lang="fa">‌ و يا </span>core dump
-<span lang="fa">‌مي‌گيرم؟</span><BR><A 
-href="#3.3">3.3</A>)
-<span lang="fa">چرا موقعي كه من سعي مي‌كنم برنامه </span>postmaster<span lang="fa">‌ 
-را اجرا كنم خطاي</span> <I>IpcMemoryCreate</I>&nbsp; <span lang="fa">مي‌گيرم؟</span><BR><A 
-href="#3.4">3.4</A>)<I><span lang="fa">
-</span></I><span lang="fa">چرا موقعي كه من سعي مي‌كنم برنامه </span>postmaster<span lang="fa">‌ 
-را اجرا كنم خطاي</span> <I><span lang="fa">&nbsp;</span>IpcSemaphoreCreate<span lang="fa">
-</span></I><span lang="fa">مي‌گيرم؟</span><BR><A 
-href="#3.5">3.5</A>) 
-<span lang="fa">چگونه مي‌توانم اتصالات ساير ماشينها را كنترل كنم؟</span><BR><A 
-href="#3.6">3.6</A>) 
-<span lang="fa">براي كارايي بالاتر و بهتر پايگاه داده من چه تنظيماتي را بايد 
-انجام دهم؟</span><BR><A 
-href="#3.7">3.7</A>) 
-<span lang="fa">چه امكاناتي براي پيدا كردن اشكال‌ وجود دارد؟</span><BR><A 
-href="#3.8">3.8</A>)
-<span lang="fa">چرا موقعي كه من مي‌خواهم به پايگاه داده وصل شوم پيام</span> <I>
-&quot;Sorry, too many clients&quot;
-<span lang="fa">‌</span></I><span lang="fa">مي‌گيرم؟</span><BR><A 
-href="#3.9">3.9</A>)<span lang="fa"> 
-در شاخه </span>&nbsp;<I>pgsql_tmp</I> <span lang="fa">&nbsp;چه چيزي قرار دارد؟</span><BR><A 
-href="#3.10">3.10</A>)
-<span lang="fa">چرا براي به روز كردن نسخه پايگاه داده من بايد كل داده ها را
-</span>dump<span lang="fa">‌ و مجدداً </span>restore<span lang="fa"> كنم؟</span><BR><A 
-href="#3.11">3.11</A>) 
-<span lang="fa">از چه سخت افزاري بايد استفاده كنم؟</span><BR>
-</font></p>
-<H2 align=center dir="rtl"><span lang="fa"><font face="Tahoma">سوالات عملياتي</font></span></H2>
-<p dir="rtl"><font face="Tahoma"><A 
-href="#4.1">4.1</A>) تفاوت بين <span lang="en-us">binary cursors</span> و <span lang="en-us">
-Normal cursors</span> چيست؟<BR><A 
-href="#4.2">4.2</A>)
-<span lang="fa">من چگونه مي‌توانم فقط روي چند رديف اول يا يك رديف تصادفي درخواست </span>
-SELECT<span lang="fa">‌ بزنم؟</span><BR><A 
-href="#4.3">4.3</A>)
-<span lang="fa">من چگونه مي‌توانم ليستي از جداول يا ساير چيزهايي كه در </span>
-psql<span lang="fa">‌ وجود دارد را ببينم؟</span><BR><A 
-href="#4.4">4.4</A>) 
-<span lang="fa">چگونه يك ستون جدول را حذف مي‌كنيد؟ چگونه نوع داده آن را عوض 
-كنيم؟</span><BR><A 
-href="#4.5">4.5</A>) 
-<span lang="fa">حداكثر اندازه يك رديف،‌ جدول و خود پايگاه داده چقدر است؟</span><BR><A 
-href="#4.6">4.6</A>)
-<span lang="fa">چقدر فضاي ديسك سخت براي ذخيره كردن داده‌‌هاي يك فايل متني مورد 
-نياز است؟</span><BR><A 
-href="#4.7">4.7</A>)
-<span lang="fa">چگونه مي‌توانم بفهمم كه چه كاربران،‌ پايگاه داده،‌ نمايه و 
-جداولي در سيستم تعريف شده است؟</span><BR><A 
-href="#4.8">4.8</A>) 
-<span lang="fa">چرا درخواستهاي من كند اجرا مي‌شوند يا چرا از نمايه ها استفاده 
-نمي‌كنند؟</span><BR><A 
-href="#4.9">4.9</A>) 
-<span lang="fa">چگونه مي‌توانم نحوه بررسي درخواست را توسط بهينه‌ساز درخواستها 
-مشاهده كنم؟</span><BR><A 
-href="#4.10">4.10</A>) 
-<span lang="fa">نمايه </span>R-tree<span lang="fa">‌ چيست؟</span><BR><A 
-href="#4.11">4.11</A>)
-<span lang="fa">بهينه ساز تكويني درخواست چيست؟</span> (Genetic Query Optimizer)<BR><A 
-href="#4.12">4.12</A>)
-<span lang="fa">چگونه از عبارات منظم براي جستجو استفاده كنم؟ چگونه جستجويي انجام 
-دهم كه حساس به متن نباشد؟ چگونه براي يك جستجوي غير حساس به متن از نمايه استفاده 
-كنم؟</span><BR><A 
-href="#4.13">4.13</A>)
-<span lang="fa">چگونه مي‌توانم در يك درخواست تشخيص دهم كه يك فيلد </span>NULL<span lang="fa">‌ 
-است؟</span><BR><A 
-href="#4.14">4.14</A>)
-<span lang="fa">تفاوت بين گونه‌هاي مختلف </span>character<span lang="fa"> چيست؟</span><BR><A 
-href="#4.15.1">4.15.1</A>)
-<span lang="fa">چگونه مي‌توانم يك فيلد سريال يا افزايشي ايجاد كنم؟</span><BR><A 
-href="#4.15.2">4.15.2</A>)
-<span lang="fa">چگونه مي‌توانم مقدار يك درج سريالي را بدانم؟</span><BR><A 
-href="#4.15.3">4.15.3</A>) <span lang="fa">آیا توابع ()</span>nextval<span lang="fa"> 
-و ()</span>currval<span lang="fa"> منجر به ایجاد شرایط </span>race<span lang="fa"> 
-برای سایر کاربران می شوند؟</span><BR><A 
-href="#4.15.4">4.15.4</A>) 
-<span lang="fa">چرا اعداد سریالی مربوط به تراکنشهای </span>abort<span lang="fa"> 
-شده مجدداً استفاده نمی شود؟ چرا بین اعداد سریالی یک فاصله خالی ایجاد می شود؟</span><BR><A 
-href="#4.16">4.16</A>) OID<span lang="fa"> و </span>TID<span lang="fa"> چه 
-هستند؟</span><BR><A 
-href="#4.17">4.17</A>)
-<span lang="fa">معني بعضي از ترمها و كلماتي كه در </span>PostgreSQL<span lang="fa">‌ 
-استفاده مي‌شود چيست؟</span><BR><A 
-href="#4.18">4.18</A>)<span lang="fa"> 
-چرا من خطاي </span><i>&quot;ERROR: Memory exhausted in AllocSetAlloc&quot;</i><span lang="fa"> 
-مي‌گيرم؟</span><BR><A 
-href="#4.19">4.19</A>)
-<span lang="fa">از كجا تشخيص دهم كه ويرايش يا نسخه </span>PostgreSQL<span lang="fa">يي 
-كه من استفاده مي‌كنم چيست؟</span><BR><A 
-href="#4.20">4.20</A>) <span lang="fa">چرا در حین اجرای عملیات روی </span>
-large-object<span lang="fa">ها خطای </span>&quot;<I>invalid large obj descriptor</I>&quot;<span lang="fa">به 
-وجود می آید؟</span><BR><A 
-href="#4.21">4.21</A>)
-<span lang="fa">چگونه يك ستون ايجاد كنم كه مقدار زمان جاري را به عنوان مقدار 
-پيش‌فرض داشته باشد؟</span><BR><A 
-href="#4.22">4.22</A>)
-<span lang="fa">چرا زير درخواستهايي كه از </span>IN<span lang="fa"> استفاده 
-مي‌كنند كند هستند؟</span><BR><A 
-href="#4.23">4.23</A>) 
-<span lang="fa">چگونه مي‌توانم يك الحاق خارجي (</span>outer join<span lang="fa">) 
-انجام دهم؟</span><BR><A 
-href="#4.24">4.24</A>)
-<span lang="fa">چگونه مي‌توان درخواستهايي از چند پايگاه داده توليد كرد؟</span><BR><A 
-href="#4.25">4.25</A>) 
-<span lang="fa">چگونه خروجي يك تابع مي‌تواند&nbsp; چند رديف يا ستون باشد؟</span><BR><A 
-href="#4.26">4.26</A>)&nbsp;
-<span lang="fa">در توابع </span>PL/PgSQL<span lang="fa"> چرا نمي‌توان با اطمينان 
-جداول موقت را ايجاد يا حذف كرد؟</span><BR><A 
-href="#4.27">4.27</A>) 
-<span lang="fa">چه گزينه‌هايي براي تكرار (</span>replication<span lang="fa">)</span>
-<span lang="fa">وجود دارد؟</span><BR><A 
-href="#4.28">4.28</A>) 
-<span lang="fa">چه گزينه‌هايي براي رمزنگاري وجود دارد؟</span><BR>
-</font></p>
-<h2 align="center" dir="rtl"><font face="Tahoma"><span lang="fa">توسعه </span>
-PostgreSQL</font></h2>
-<p dir="rtl"><font face="Tahoma"><A 
-href="#5.1">5.1</A>)
-<span lang="fa">من يك تابع نوشته‌ام. چگونه آن را در </span>psql<span lang="fa"> 
-اجرا كنم؟ چرا با اجراي آن </span>core dump<span lang="fa"> مي‌گيرم؟</span><BR><A 
-href="#5.2">5.2</A>)
-<span lang="fa">چگونه مي‌توانم در توليد نوع‌ها و توابع جديد و جالب براي </span>
-PostgreSQL<span lang="fa">‌ همكاري و مشاركت داشته باشم.</span><BR><A 
-href="#5.3">5.3</A>)
-<span lang="fa">چگونه مي‌توانم يك تابع به زبان </span>C<span lang="fa"> بنويسم 
-كه خروجي آن يك</span> <span lang="fa">‌</span>tuple<span lang="fa"> </span>&nbsp;<span lang="fa">(چند 
-تايي) باشد؟</span><BR><A 
-href="#5.4">5.4</A>) 
-<span lang="fa">من يك فايل منبع را عوض كرده ام چرا در عمليات كامپيل مجدد آن 
-تغيير ديده نمي‌شود؟</span><BR>
-</font></p>
-<HR dir="rtl">
-
-<H2 align=center dir="rtl"><font face="Tahoma"><span lang="fa">سوالات عمومي</span></font></H2>
-<H4 dir="rtl"><font face="Tahoma"><A name=1.1>1.1</A>) <span lang="en-us">
-PostgreSQL</span> چيست و چگونه آن را بايد تلفظ كرد؟</font></H4>
-<p dir="rtl"><span lang="en-us">PostgreSQL</span> به صورت <span lang="en-us">
-Post-Gres-Q-L</span>‌ تلفظ مي‌شود. يك فايل صوتي در آدرس
-<a href="http://www.postfresql.org/postgresql.mp3&#8204;"><span lang="en-us">
-http://www.postfresql.org/postgresql.mp3</span>‌</a> براي كساني كه مايلند تلفظ 
-صحيح را بشنوند وجود دارد.</p>
-<P dir="rtl"><span lang="en-us">PostgreSQL</span> از روي سيستم مديريت پايگاه 
-داده <span lang="en-us">POSTGRES</span> توسعه داده شده است (هنوز هم بعضي مواقع 
-براي سادگي به آن <span lang="en-us">Postgres</span> گفته مي‌شود) كه يك نمونه 
-تحقيقاتي از پايگاه داده‌هاي نسل بعد است. <span lang="en-us">PostgreSQL</span> 
-همان الگوي داده قوي و انواع داده&nbsp; را حفظ كرده است ولي زبان
-<span lang="en-us">PostQuel</span> را با يك زيرمجموعه پيشرفته از
-<span lang="en-us">SQL</span> جايگزين كرده است. <span lang="en-us">PostgreSQL</span> 
-متن باز بوده و متن كامل آن در دسترس است.</P>
-<P dir="rtl"><font face="Tahoma"><span lang="en-us">PostgreSQL </span>&nbsp;توسط يك 
-تيم برنامه‌نويس كه همگي در گروه پست الكترونيك برنامه‌نويسان
-<span lang="en-us">PostgreSQL</span>&nbsp; عضو هستند، انجام مي‌شود. هماهنگ كننده 
-اصلي در حال حاضر <span lang="en-us">Marc G. Fournier</span>‌ به آدرس
-<span lang="en-us"><a href="mailto:[email protected]">
[email protected]</a></span>&nbsp; مي‌باشد. (براي ديدن نحوه ملحق شدن به اين 
-تيم قسمت <A 
-href="#1.6">1.6</A> 
-را ببينيد). اين تيم در حاضر مسئوليت تمام مسائل مربوط به برنامه‌نويسي
-<span lang="en-us">PostgreSQL</span> را بر عهده دارد. اين يك پروژه گروهي است و 
-تحت كنترل هيچ شركتي نيست. براي اطلاعات بيشتر در مورد اين تيم به آدرس
-<A 
-href="http://www.postgresql.org/docs/faqs/FAQ_DEV.html">
-http://www.PostgreSQL.org/docs/faqs/FAQ_DEV.html</A> 
-مراجعه كنيد.</font></P>
-<P dir="rtl"><font face="Tahoma">اولين نسخه <span lang="en-us">PostgreSQL</span>‌ 
-توسط Andrew Yu and Jolly Chen به وجود آمد. افراد بسياري در توسعه و رفع اشكال و 
-انتقال آن شركت كرده‌اند. متن اصلي <span lang="en-us">Postgres</span> كه
-<span lang="en-us">PostgreSQL</span> از روي آن نوشته شده است، توسط تعداد زيادي 
-دانشجوي كارشناسي ارشدو دانشجوي كارشناسي و تيم برنامه‌نويسي كه تحت نظر پروفسور 
-Michael Stonebrake در دانشگاه بركلي،‌كاليفرنيا كار مي‌كرده‌اند نوشته شده است.</font></P>
-<P dir="rtl"><font face="Tahoma">نام اصلي نرم افزار در دانشگاه بركلي
-<span lang="en-us">Postgres</span>‌ بود. در سال 1995 بعد از اضافه شدن
-<span lang="en-us">SQL</span> نام آن به<span lang="en-us"> Postgres95</span> 
-تغيير داده شد.<span lang="en-us"> </span>در سال 1996 نام آن به
-<span lang="en-us">PostgreSQL</span> تغيير داده شد.</font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=1.2>1.2</A>) قوانين كپي رايت در مورد
-<span lang="en-us">PostgreSQL</span> به چه صورت است؟</font></H4>
-<p dir="rtl"><font face="Tahoma"><span lang="en-us">PostgreSQL</span> تحت قانون 
-كپي رايت زير قرار دارد:</font></p>
-<P dir="ltr"><font face="Tahoma">PostgreSQL Data Base Management System</font></P>
-<P dir="ltr"><font face="Tahoma">Portions copyright (c) 1996-2004, PostgreSQL 
-Global Development Group Portions Copyright (c) 1994-6 Regents of the University 
-of California</font></P>
-<P dir="ltr"><font face="Tahoma">Permission to use, copy, modify, and distribute 
-this software and its documentation for any purpose, without fee, and without a 
-written agreement is hereby granted, provided that the above copyright notice 
-and this paragraph and the following two paragraphs appear in all copies.</font></P>
-<P dir="ltr"><font face="Tahoma">IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA 
-BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR 
-CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS 
-SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN 
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</font></P>
-<P dir="ltr"><font face="Tahoma">THE UNIVERSITY OF CALIFORNIA SPECIFICALLY 
-DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED 
-HEREUNDER IS ON AN &quot;AS IS&quot; BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO 
-OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR 
-MODIFICATIONS.</font></P>
-<P dir="rtl"><font face="Tahoma">قانون بالا ليسانس <span lang="en-us">BSD</span> 
-كه يك ليسانس كلاسيك براي متن‌هاي باز است مي‌باشد. هيچ محدوديتي در مورد نحوه 
-استفاده از متن در آن ديده نمي‌شود. ما آن را دوست داريم و هيچ قصدي براي تغيير آن 
-نداريم.</font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=1.3>1.3</A>) PostgreSQL</font><span lang="fa"><font face="Tahoma">‌ 
-روي چه نوع يونيكسهايي اجرا مي‌شود؟</font></span></H4>
-<p dir="rtl"><font face="Tahoma">در حالت كلي <span lang="en-us">PostgreSQL</span> 
-روي هر پلتفرم (سكوي) سازگار با يونيكس اجرا مي‌شود. ليست پلتفرمهايي كه تاكنون
-<span lang="en-us">PostgreSQL</span>‌ روي آنها نصب و تست شده است درقسمت 
-دستورالعملهاي نصب آمده است.</font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=1.4>1.4</A>) </font><span lang="fa"><font face="Tahoma">
-روي چه محيطهاي غير يونيكسي مي‌توان آن را اجرا كرد؟</font></span></H4>
-<P dir="rtl"><font face="Tahoma"><STRONG>Client</STRONG></font></P>
-<P dir="rtl"><font face="Tahoma">مي‌توان <span lang="en-us">psql, </span>
-كتابخانه <span lang="en-us">libpq</span> و ساير واسطها و برنامه‌هاي كاربردي را 
-طوري كامپيل كرد كه روي محيطهاي ويندوز نيز اجرا شوند. در اين حالت
-<span lang="en-us">Client</span> روي ويندوز اجرا مي‌شود و از طربق شبكه و پروتكل
-<span lang="en-us">TCP/IP</span> با يك سرور كه روي يك پلتفرم لينوكس در حال 
-اجراست ارتباط برقرار مي‌كند.يك فايل <span lang="en-us">win32.mak</span> همراه با 
-كدهاي <span lang="en-us">PostgreSQL</span> وجود دارد كه براي كامپيل كردن 
-كتابخانه <span lang="en-us">libpq</span> و برنامه <span lang="en-us">psql</span> 
-مي‌باشد. <span lang="en-us">P</span>‌<span lang="en-us">ostgreSQL</span>‌ همچنين 
-امكان ارتباط به صورت <span lang="en-us">ODBC</span>‌&nbsp; را نيز دارد.</font></P>
-<P dir="rtl"><font face="Tahoma"><STRONG>Server</STRONG></font></P>
-<P dir="rtl"><strong style="font-weight: 400"><font face="Tahoma">با استفاده از
-<span lang="en-us">Cygwin</span>‌ و كتابخانه <span lang="en-us">Cygnus</span> 
-مي‌توان پايگاه داده را روي ويندوز <span lang="en-us">NT</span> و يا
-<span lang="en-us">Win2K</span> اجرا كرد.براي ديدن اطلاعات بيشتر فايل<span lang="en-us">
-</span></font></strong><font face="Tahoma"> <I>pgsql/doc/FAQ_MSWIN<span lang="en-us">
-</span>‌</I>را كه بهمراه توزبع‌هاي <span lang="en-us">PostgreSQL</span> آمده است 
-ببينيد و يا اينكه به اين صفحه <A 
-href="http://www.postgresql.org/docs/faqs/text/FAQ_MSWIN">
-http://www.PostgreSQL.org/docs/faqs/text/FAQ_MSWIN</A> 
-مراجعه كنيد.</font></P>
-<P dir="rtl"><font face="Tahoma">در حال حاضر يك عمليات انتقال <span lang="en-us">
-PostgreSQL</span> به روي سكوهاي <span lang="en-us">Win NT/2000/XP</span> در 
-جريان است. براي ديدن وضعيت اين پروژه به سايت‌هاي <A 
-href="http://momjian.postgresql.org/main/writings/pgsql/win32.html">
-http://momjian.postgresql.org/main/writings/pgsql/win32.htm</A> و <A 
-href="http://techdocs.postgresql.org/guides/Windows">
-http://techdocs.postgresql.org/guides/Windows</A> 
-مراجعه كنيد. </font></P>
-<P dir="rtl"><font face="Tahoma">همچنين يك عمليات انتقال بر روي
-<span lang="en-us">Novell Netware 6</span> نيز در حال انجام است كه در سايت <A 
-href="http://forge.novell.com/">http://forge.novell.com</A> مي‌توانيد اطلاعات 
-بيشتر را ببينيد.</font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=1.5>1.5</A>) PostgreSQL</font><span lang="fa"><font face="Tahoma"> 
-را از كجا مي‌توانم بگيرم؟</font></span></H4>
-<p dir="rtl"><font face="Tahoma"><span lang="en-us">PostgreSQL</span>‌ را از 
-سايت اصلي آن&nbsp; <A 
-href="ftp://ftp.postgresql.org/pub">ftp://ftp.PostgreSQL.org/pub</A> مي‌توانيد 
-بگيريد. در صفحه اصلي سايت ليست ساير آدرسهايي كه مي‌توانيد <span lang="en-us">
-PostgreSQL</span>‌ را از آنها بگيريد آمده است.</font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=1.6>1.6</A>) </font><span lang="fa"><font face="Tahoma">
-از كجا خدمات پشتيباني بگيرم؟</font></span></H4>
-<p dir="rtl"><font face="Tahoma">گروه پستي اصلي <A 
-href="mailto:[email protected]">[email protected]</A> 
-مي‌باشد. اين گروه براي بحث در مورد موضوعات مختلف در زمينه <span lang="en-us">
-PostgreSQL</span> است. براي عضو شدن در اين گروه پستي يك نامه الكترونيكي به آدرس 
-گروه با محتوياتی كه در ادامه آمده است ارسال كنيد. در قسمت <span lang="en-us">
-Subject</span> چيزي ننويسيد.</font></p>
-<div dir="rtl">
-	<PRE><font face="Tahoma">    subscribe
-    end
-</font></PRE>
-</div>
-<P dir="rtl"><font face="Tahoma">آدرس گروه: <A 
-href="mailto:[email protected]">
[email protected]</A></font></P>
-<P dir="rtl"><font face="Tahoma">همچنين يك گروه پستي هم به صورت ارسال چكيده 
-پيامها وجود دارد. براي عضو شدن در اين گروه يك نامه با محتويات زير به این آدرس&nbsp; 
-ارسال كنيد. <A 
-href="mailto:[email protected]">
[email protected]</A> 
-</font></P>
-<div dir="rtl">
-	<PRE><font face="Tahoma">    subscribe
-    end
-</font></PRE></div>
-<p dir="rtl"><font face="Tahoma">در اين گروه هر موقع حجم نامه‌ها به 30 كيلوبايت 
-رسيد براي تمام اعضاء ارسال مي‌شود.</font></p>
-<p dir="rtl"><font face="Tahoma">گروه پستي بررسي اِشكالات هم وجود دارد. براي عضو 
-شدن در اين گروه يك نامه با محتويات زير به 
-<A 
-href="mailto:[email protected]">
[email protected]</A> 
-ارسال كنيد.</font></p>
-<div dir="rtl">
-	<PRE><font face="Tahoma">    subscribe
-    end
-</font></PRE></div>
-<P dir="rtl"><font face="Tahoma" size="3">گروه پستي مخصوص توسعه دهندگان (برنامه‌نويسان) 
-نيز وجوددارد. براي عضويت در اين گروه يك نامه به آدرس زير با محتويات مشخص شده 
-ارسال كنيد.&nbsp; </font><font face="Tahoma">
-<A 
-href="mailto:[email protected]"><font size="3">[email protected]</font></A><span lang="en-us">
-</span>&nbsp;</font></p>
-<div dir="rtl">
-	<PRE><font face="Tahoma">    subscribe
-    end
-</font></PRE>
-</div>
-<p dir="rtl"><font face="Tahoma">گروههاي پستي ديگري نيز در زمينه
-<span lang="en-us">PostgreSQL</span>‌ وجود دارد&nbsp; كه مي‌توانيد در سايت <A 
-  href="http://www.postgresql.org/">http://www.postgresql.org</A> ببينيد.</font></p>
-<p dir="rtl"><font face="Tahoma">همچنين يك كانال <span lang="en-us">IRC</span> 
-روي <span lang="en-us">Freenode</span> و <span lang="en-us">EFNet</span> بنام <I>
-PostgreSQL<span lang="en-us">#</span> </I>
-وجود دارد. شما مي‌توانيد از فرمان يونيكسي </font> <CODE>
-<font face="Tahoma">irc -c &#39;#PostgreSQL&#39; &quot;$USER&quot; irc.phoenix.net.</font></CODE><font face="Tahoma"> 
-يا </font> <CODE>
-<font face="Tahoma">irc -c &#39;#PostgreSQL&#39; &quot;$USER&quot; irc.freenode.net<span lang="en-us">
-</span>استفاده كنيد.</font></CODE></p>
-<p dir="rtl"><font face="Tahoma">ليست شركتهايي كه از طريق آنها مي‌توانيد خدمات 
-پشتيباني تجاري در زمينه <span lang="en-us">PostgreSQL</span> دريافت كنيد در اين 
-آدرس <A 
-href="http://techdocs.postgresql.org/companies.php">
-http://techdocs.postgresql.org/companies.php</A></font><code><font face="Tahoma"> 
-موجود است.</font></code></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=1.7>1.7</A>) </font><span lang="fa"><font face="Tahoma"> 
-آخرين نسخه اعلام شده چيست؟</font></span></H4>
-<p dir="rtl"><font face="Tahoma">آخرين نسخه <span lang="en-us">PostgreSQL</span>‌<span lang="en-us">
-</span>&nbsp;كه وجود دارد 7.4.3 است.</font></p>
-<p dir="rtl"><font face="Tahoma">هدف ما آن است كه هر 6 ماه تا 8 ماه يك نسخه جديد 
-ارائه شود.</font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=1.8>1.8</A>) </font><span lang="fa"><font face="Tahoma">
-چه مستندات و راهنمائيهايي وجود دارند؟</font></span></H4>
-<p dir="rtl"><font face="Tahoma">چندين كتابچه و صفحات راهنما و مثالهاي كوچك 
-همراه با متن اصلي <span lang="en-us">PostgreSQL</span>‌ در شاخه
-<span lang="en-us">doc </span>وجود دارد. براي ديدن صفحات راهنما مي‌توانيد به 
-سايت <A 
-href="http://www.postgresql.org/docs">http://www.PostgreSQL.org/docs</A><span lang="en-us">
-</span>&nbsp;نيز مراجعه نماييد.</font></p>
-<p dir="rtl"><font face="Tahoma">دو كتاب در زمينه <span lang="en-us">PostgreSQL</span>‌<span lang="en-us">
-</span>&nbsp;در آدرس‌هاي <A 
-href="http://www.postgresql.org/docs/awbook.html">
-http://www.PostgreSQL.org/docs/awbook.htm</A> 
-و <A 
-href="http://www.commandprompt.com/ppbook/">http://www.commandprompt.com/ppbook</A> 
-وجود دارد. ليستي از كتابهايي كه قابل خريد است در آدرس <A 
-href="http://techdocs.postgresql.org/techdocs/bookreviews.php">
-http://techdocs.PostgreSQL.org/techdocs/bookreviews.php</A><span lang="en-us">
-</span>وجود دارد. همچنين ليستي از مقالات فني در مورد <span lang="en-us">
-PostgreSQL</span> در آدرس <A 
-href="http://techdocs.postgresql.org/">http://techdocs.PostgreSQL.org</A><span lang="en-us">
-</span>وجود دارد.</font></p>
-<p dir="rtl"><font face="Tahoma">برنامه <span lang="en-us">psql</span> يك دستور
-<span lang="en-us">d\</span> دارد كه اطلاعاتي در مورد انواع داده‌هاي قابل تعريف 
-و عملگر‌ها و توابع و ... به ما نشان مي‌دهد. در سايت اصلي ما اطلاعات بيشتري را 
-مي‌توانيد پيدا كنيد.</font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=1.9>1.9</A>)  
-<span lang="fa">چگونه مي‌توانم ازاشكالات شناخته شده و يا امكاناتي كه در اين 
-پايگاه داده وجود ندارد&nbsp; مطلع شوم؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma"><span lang="en-us">PostgreSQL</span> يك زير 
-مجموعه پيشرفته از <span lang="en-us">SQL-92</span> را پشتيباني مي‌كند. در ليست
-<span lang="en-us">&nbsp;</span><A 
-href="http://developer.postgresql.org/todo.php">TODO</A>&nbsp;&nbsp; اِشكالات 
-شناخته شده يا امكاناتي كه وجود ندارد و يا برنامه‌‌هاي آينده آمده است.</font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=1.10>1.10</A>) </font><span lang="fa"><font face="Tahoma">
-چگونه مي‌توانم زبان </font></span>
-<font face="Tahoma">SQL</font><span lang="fa"><font face="Tahoma"> را ياد بگيرم؟</font></span></H4>
-<p dir="rtl"><font face="Tahoma">كتاب <span lang="en-us">PostgreSQL</span> در 
-آدرس <span lang="en-us">SQL</span> <A 
-href="http://www.postgresql.org/docs/awbook.html">
-http://www.PostgreSQL.org/docs/awbook.html</A><span lang="en-us">
-</span>‌را آموزش مي‌دهد. همچنين يك كتاب در آدرس <A 
-href="http://www.commandprompt.com/ppbook/">http://www.commandprompt.com/ppbook </A>
-وجود دارد. يك راهنماي خيلي خوب هم در سايت‌هاي&nbsp; <A 
-href="http://www.intermedia.net/support/sql/sqltut.shtm">
-http://www.intermedia.net/support/sql/sqltut.shtm</A> 
-و <A 
-href="http://ourworld.compuserve.com/homepages/graeme_birchall/HTM_COOK.HTM">
-http://ourworld.compuserve.com/homepages/graeme_birchall/HTM_COOK.HTM</A> 
-و&nbsp; <A href="http://sqlcourse.com/">http://sqlcourse.com</A> در مورد
-<span lang="en-us">SQL</span> وجود دارد.</font></p>
-<p dir="rtl"><font face="Tahoma">كتاب ديگري كه مي‌توان براي يادگيري
-<span lang="en-us">SQL</span> از آن استفاده كرد كتاب <span lang="en-us">&quot;SQL</span> 
-را در 21 روز ياد بگيريد،‌ ويرايش دوم<span lang="en-us">&quot; </span>در سايت <A 
-href="http://members.tripod.com/er4ebus/sql/index.htm">
-http://members.tripod.com/er4ebus/sql/index.htm</A><span lang="en-us">
-</span>مي‌باشد.</font></p>
-<p dir="rtl"><font face="Tahoma">تعداد زيادي از كاربران كتاب <span lang="en-us">
-The Practical SQL</span> را ترجيح مي‌دهند. كتاب ديگر <span lang="en-us">The 
-Complete Refrence SQL</span> انتشارات <span lang="en-us">McGraw-Hill</span> 
-مي‌باشد.</font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=1.11>1.11</A>) </font><span lang="fa"><font face="Tahoma"> 
-آيا </font></span><font face="Tahoma">PostgreSQL</font><span lang="fa"><font face="Tahoma"> 
-مشكل </font></span><font face="Tahoma">Y2K</font><span lang="fa"><font face="Tahoma">‌ 
-دارد يا خير؟</font></span></H4>
-<p dir="rtl"><font face="Tahoma">خير،‌<span lang="en-us">PostgreSQL</span>‌ با 
-تاريخ‌هاي قبل و بعد از 2000 مشكلي ندارد.</font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=1.12>1.12</A>) </font><span lang="fa"><font face="Tahoma">
-چگونه مي‌توانم به تيم برنامه نويس
-</font></span><font face="Tahoma">PostgreSQL</font><span lang="fa"><font face="Tahoma"> 
-ملحق شوم؟</font></span></H4>
-<p dir="rtl"><font face="Tahoma">ابتدا،‌آخرين سورس را دونلود كرده و مستندات 
-مربوط به برنامه‌نويسي <span lang="en-us">PostgreSQL</span> را در سايت مطالعه 
-كنيد. سپس به گروههاي پستي ‌ <I>pgsql-patches </I>
-و <i><span lang="en-us">pgsql-hackers
-</span>&nbsp;</i>عضو شويد. در مرحله آخر وصله‌هاي با كيفيت بالا را به
-<span lang="en-us">pgsql-patches</span> ارسال كنيد.</font></p>
-<p dir="rtl"><font face="Tahoma">تعداد زيادي از برنامه‌نويسان وجود دارند كه 
-امتياز انجام تغييرات در <span lang="en-us">cvs</span>‌ را دارند. هر كدام از آنها 
-تعداد زيادي وصله‌‌ با كيفيت بالا به گروه ارسال كرده‌اند كه اعتماد گردانندگان
-<span lang="en-us">PostgreSQL</span> را به دست آورده‌اند.</font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=1.13>1.13</A>)  
-<span lang="fa">چگونه مي‌توانم يك اِشكال را به گروه برنامه نويس اعلام كنم؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma">لطفاً صفحه مربوط به اِشكالات <span lang="en-us">
-PostgreSQL</span> را در سايت <A 
-href="http://www.postgresql.org/bugs/bugs.php">
-http://www.PostgreSQL.org/bugs/bugs.php</A><span lang="en-us">
-</span>مشاهده‌<span lang="en-us"> </span>كنيد. در اين سايت نحوه گزارش و ارسال يك 
-اشكال توضيح داده شده است.</font></p>
-<p dir="rtl"><font face="Tahoma"><span lang="en-us">&nbsp;</span>همچنين براي ديدن 
-نسخه‌هاي جديدتر <span lang="en-us">PostgreSQL</span> و يا وجود يك وصله جديد از 
-سايت <A 
-href="ftp://ftp.postgresql.org/pub">ftp://ftp.PostgreSQL.org/pub</A> بازديد 
-كنيد.</font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=1.14>1.14</A>) </font><span lang="fa"><font face="Tahoma">
-وضعيت </font></span>
-<font face="Tahoma">PostgreSQL</font><span lang="fa"><font face="Tahoma">‌ در 
-مقايسه با ساير </font></span><font face="Tahoma">DBMS<span lang="fa">ها به چه 
-صورت است؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma">راههاي مختلفي براي اندازه‌گيري و مقايسه 
-نرم‌افزارها وجود دارد كه عبارتند از امكانات، كارايي، قابليت اعتماد، پشتيباني و 
-قيمت</font></p>
-<DL>
-  <div dir="rtl">
-  <dl>
-	<dt><b><font face="Tahoma">امكانات</font></b></dt>
-	<dd><font face="Tahoma"><span lang="en-us">PostgreSQL</span> بيشتر امكانات 
-	موجود در سيستم‌هاي پايگاه داده تجاري بزرگ نظير <span lang="en-us">
-	transactions, subselets, triggers, views, foreign key referential integrity
-	</span>و <span lang="en-us">sophisticated locking</span>‌ را دارد. در
-	<span lang="en-us">PostgreSQL</span>‌‌ امكاناتي وجود دارد كه پايگاههاي داده 
-	ديگر آن را ندارند نظير <span lang="en-us">user-defined types</span>‌و
-	<span lang="en-us">Inheritance</span>‌و <span lang="en-us">rules</span>‌و
-	<span lang="en-us">multi-version concurrency control</span></font></dd>
-	</dl>
-	</div>
-  <DD>
-	<p dir="rtl">&nbsp;<div dir="rtl">
-  <b><font face="Tahoma">كارايي</font></b><p><font face="Tahoma"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	</b>كارايي <span lang="en-us">PostgreSQL</span> در حد بقيه سيستم‌هاي تجاري و 
-	متن باز است. در بعضي موارد سريعتر و در بعضي موارد از آنها كندتر است. در 
-	مقايسه با <span lang="en-us">MySQL</span> براي كاربران بيشتر و درخواست‌هاي 
-	پيچيده و بار زياد خواندن/نوشتن سريعتر است. در درخواست‌هاي ساده<span lang="en-us"> 
-	SELECT</span>‌ از <span lang="en-us">MySQL</span> كندتر است. البته
-	<span lang="en-us">MySQL</span> خيلي از امكانات <span lang="en-us">
-	PostgreSQL</span> كه در بالا به آن اشاره شد را ندارد. هدف اصلي ما امكانات و 
-	قابليت اعتماد بالاست در ضمن آنكه تلاش مي‌كنيم تا كارايي آن نيز بهبود يابد. 
-	در آدرس <A 
-  href="http://openacs.org/philosophy/why-not-mysql.html">
-	http://openacs.org/philosophy/why-not-mysql.html</A> 
-  يك مقايسه جالب بين <span lang="en-us">MySQL</span> و <span lang="en-us">
-	PostgreSQL</span> وجود دارد. از طرف ديگر <span lang="en-us">MySQL</span>‌ يك 
-	شركت است كه محصول خود را به صورت متن باز ارائه مي‌كند ولي براي نرم‌افزار غير 
-	متن باز خود احتياج به ليسانس تجاري دارد بر خلاف <span lang="en-us">
-	PostgreSQL</span> كه يك گروه كاملاً متن باز هستند.</font></div>
-  <DD>
-	<p dir="rtl">&nbsp;<div dir="rtl">
-  <dl>
-	<dt><b><font face="Tahoma">قابليت اطمينان</font></b></dt>
-	<dd><font face="Tahoma">ما فكر مي‌كنيم كه يك سيستم پايگاه داده‌اي كه مطمئن 
-	نباشد ارزشي ندارد. ما تمام تلاشمان را براي ارائه كدهاي پايداري كه به خوبي 
-	تست شده باشند و كمترين اِشكالات را داشته باشند مي‌كنيم. هر نسخه جديدي كه 
-	ارائه مي‌شود حداقل يك ماه را در مرحله تست بتا مي‌گذراند. ما بر اين باور 
-	هستيم كه قابليت اطمينان <span lang="en-us">PostgreSQL</span>‌ در مقايسه با 
-	ساير سيستم‌هاي پايگاه داده قابل توجه است و نسخه‌هايي كه تاكنون ارائه شده است 
-	نشان مي‌دهد كه ما توانايي ارائه يك سيستم قوي و محكم و مطمئن را كه آماده 
-	بهره‌برداري است داريم.</font></dd>
-	</dl>
-	</div>
-  <DD>
-	<div dir="rtl">
-  <dl>
-	<dt><b><font face="Tahoma">پشتيباني</font></b></dt>
-	<dd><font face="Tahoma">گروههاي پستي ما امكان ارتباط و تماس به گروه بزرگي از 
-	برنامه نويسان و كاربران را مي‌دهد كه مي‌توانند در حل مشكلات به ديگران كمك 
-	كنند. دسترسي مستقيم به برنامه‌نويسان و گروههاي كاربران و راهنماها و كداصلي 
-	باعث مي‌شود كه پشتيباني <span lang="en-us">PostgreSQL</span> نسبت به ساير 
-	پايگاههاي داده به نحو بهتري انجام شود. همچنين امكان ارائه خدمات پشتيباني به 
-	صورت تجاري نيز وجود دارد. براي ديدن اطلاعات بيشتر به <A 
-  href="#1.6">FAQ section 1.6</A>&nbsp; مراجعه كنيد.</font></dd>
-	</dl>
-	</div>
-  <DD>
-	<div dir="rtl">
-  <dl>
-	<dt><b><font face="Tahoma">قيمت</font></b></dt>
-	<dd><font face="Tahoma">هم براي استفاده تجاري و هم غير تجاري هيچ هزينه‌اي 
-	نبايد پرداخت شود. هيچ محدوديتي براي انجام تغييرات در <span lang="en-us">
-	PostgreSQL</span> توسط استفاده كنندگان وجود ندارد به جز مواردي كه در ليسانس
-	<span lang="en-us">BSD</span> به آن اشاره شده است.</font></dd>
-	</dl>
-	</div>
-  </DL>
-<H4 dir="rtl"><font face="Tahoma"><A name=1.15>1.15</A>) 
-<span lang="fa">من چگونه مي‌توانم از نظر مالي به </span>PostgreSQL<span lang="fa"> 
-كمك كنم؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma"><span lang="en-us">PostgreSQL </span>&nbsp;داراي يك 
-ساختار تشكيلاتي درجه اول است كه آن را مديون <span lang="en-us">Marc Fournier</span>‌ 
-است كه اين ساختار را ايجاد كرده است.</font></p>
-<p dir="rtl"><font face="Tahoma">كيفيت يك ساختار براي يك پروژه متن باز بسيار 
-اهميت دارد. يك ساختار خوب مي‌تواند مانع از حوادثي شود كه در حركت روبه‌جلوي پروژه 
-خللي وارد مي‌كنند.</font></p>
-<p dir="rtl"><font face="Tahoma">البته اين ساختار تشكيلاتي ارزان نيست. هزينه‌هاي 
-ثابت ماهانه و روزمره براي نگهداري و حفظ اين ساختار مورد نياز است. اگر شما يا 
-شركت شما مايل است كه از نظر مالي به اين حركت كمك كند لطفاً به سايت <A 
-href="http://store.pgsql.com/shopping/">http://store.pgsql.com/shopping</A> 
-مراجعه كرده و كمك خود را اهدا كنيد.</font></p>
-<p dir="rtl"><font face="Tahoma">هر چند در صفحه اصلي عبارت <span lang="en-us">
-PostgreSQL,Inc</span>‌ ذكر شده است ولي مشاركت عمدتاً براي پشتيباني از پروژه
-<span lang="en-us">PostgreSQL</span>‌ مي باشد و نه براي يك شركت مشخص. اگر ترجيح 
-مي‌دهيد مي‌توانيد يك چك به آدرس مشخص شده ارسال كنيد.</font></p>
-<p dir="rtl"><font face="Tahoma">اگر يك استفاده موفق از <span lang="en-us">
-PostgreSQL</span> سراغ داريد لطفاً آن را به سايت <A 
-href="http://advocacy.postgresql.org/">http://advocacy.postgresql.org</A> گزارش 
-دهيد.</font></p>
-<HR dir="rtl">
-
-<h2 align="center" dir="rtl"><font face="Tahoma"><span lang="fa">سوالات مربوط به 
-استفاده از پايگاه داده</span></font></h2>
-<H4 dir="rtl"><font face="Tahoma"><A name=2.1>2.1</A>)
-<span lang="fa">آيا هيچ درايور </span>ODBC</font><span lang="fa"><font face="Tahoma">‌ 
-براي </font></span><font face="Tahoma">PostgreSQL<span lang="fa"> 
-وجود دارد؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">دو درايور </span>ODBC<span lang="fa"> 
-بنامهاي </span>psqlODBC<span lang="fa">‌ و </span>OpenLink<span lang="fa"> براي
-</span>PostgreSQL<span lang="fa">‌ وجود دارد.</span></font></p>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">براي گرفتن </span>psqlODBC<span lang="fa"> 
-به سايت </span> <A 
-href="http://gborg.postgresql.org/project/psqlodbc/projdisplay.php">
-http://gborg.postgresql.org/project/psqlodbc/projdisplay.php</A><span lang="fa"> 
-مراجعه كنيد.</span></font></p>
-<p dir="rtl"><font face="Tahoma"><span lang="en-us">OpenLlink</span> را از اين 
-سايت <A 
-href="http://www.openlinksw.com/">http://www.openlinksw.com</A> مي‌توانيد 
-بگيريد. اين درايور با نرم‌افزارهاي مختلف <span lang="en-us">ODBC</span> كار 
-مي‌كند بنابراين شما قادر خواهيد بود با استفاده از <span lang="en-us">OpenLink</span> 
-روي اكثر سكو‌هايي كه نرم‌افزار<span lang="en-us">ODBC</span>‌دارند بدون مشكل به
-<span lang="en-us">PostgreSQL</span> نيز متصل شويد.</font></p>
-<p dir="rtl"><font face="Tahoma">اين محصول به كساني كه احتياج به خدمات پشتيباني 
-تجاري دارند فروخته مي‌شود. ولي نسخه آزاد اين نرم‌افزار هميشه در درسترس مي‌باشد. 
-براي كسب اطلاعات بيشتر سوالات خود را به آدرس <A 
-href="mailto:[email protected]">[email protected]</A><span lang="en-us">
-</span>‌ارسال نماييد.</font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=2.2>2.2</A>) 
-<span lang="fa">چه ابزارهايي براي استفاده از </span>PostgreSQL<span lang="fa">‌ 
-با صفحات وب وجود دارد؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma">در سايت <A 
-href="http://www.webreview.com/">http://www.webreview.com</A> براي استفاده از
-<span lang="en-us">PostgreSQL</span>‌ در صفحات وب راهنماييهاي خوبي وجود دارد.</font></p>
-<P dir="rtl"><font face="Tahoma">براي تركيب و استفاده در صفحات وب زبان
-<span lang="en-us">PHP</span>‌ يك واسط بسيار مناسب است. اطلاعات بيشتر راجع به
-<span lang="en-us">PHP</span>‌در سايت <A 
-href="http://www.php.net/">http://www.php.net</A><span lang="en-us"> </span>وجود 
-دارد.</font></P>
-<P dir="rtl"><font face="Tahoma">مثالهايي نيز با استفاده از <span lang="en-us">
-Perl</span>‌ و<span lang="en-us"> CGI.pm</span> و <span lang="en-us">mod_perl</span> 
-وجود دارد.</font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=2.3>2.3</A>) 
-<span lang="fa">آيا </span>PostgreSQL<span lang="fa">‌ يك واسط كاربري گرافيكي 
-دارد؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma">چند نرم افزار گرافيكي براي <span lang="en-us">
-PostgreSQL</span>‌ وجود دارد كه شامل <span lang="en-us">pgAccess</span> درسايت <A 
-href="http://www.pgaccess.org/">http://www.pgaccess.org</A><span lang="en-us">
-</span>و <span lang="en-us">pgAdmin III</span> در سايت <A 
-href="http://www.pgadmin.org/">http://www.pgadmin.org</A><span lang="en-us">
-</span>و <span lang="en-us">RHDB Admin</span> در سايت <A 
-href="http://sources.redhat.com/rhdb/">http://sources.redhat.com/rhdb</A><span lang="en-us">
-</span>و <span lang="en-us">Rekall</span> در سايت <A href="http://www.thekompany.com/products/rekall/"> 
-http://www.thekompany.com/products/rekall<span lang="en-us"> </span></A>
-&nbsp;مي‌باشد. همچنين يك <span lang="en-us">phpPgAdmin</span> هم در سايت <A href="http://phppgadmin.sourceforge.net/"> 
-http://phppgadmin.sourceforge.net</A><span lang="en-us"> </span>وجود دارد كه يك 
-واسط وبي براي مديريت <span lang="en-us">PostgreSQL</span> مي‌باشد.</font></p>
-<P dir="rtl"><font face="Tahoma">براي ديدن اطلاعات بيشتر راجع به نرم‌افزارهاي 
-گرافيكي براي <span lang="en-us">PostgreSQL</span> به آدرس <A 
-href="http://techdocs.postgresql.org/guides/GUITools">
-http://techdocs.postgresql.org/guides/GUITools</A><span lang="en-us">
-</span>مراجعه كنيد.</font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=2.4>2.4</A>) 
-<span lang="fa">با چه زبانهاي برنامه‌نويسي مي‌توان با </span>PostgreSQL<span lang="fa">‌ 
-ارتباط برقرار كرد؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">بيشتر زبانهاي برنامه‌نويسي 
-مي‌توانند با </span>PostgreSQL<span lang="fa">‌ ارتباط برقرار كنند. به همراه&nbsp; 
-سورس </span>PostgreSQL<span lang="fa"> تعدادي از واسطهاي مورد نياز براي ارتباط 
-با پايگاه داده از طريق زبانهاي مختلف آمده است كه در زير ليست آنها را مشاهده 
-مي‌كنيد.</span></font></p>
-<ul dir="rtl">
-	<li dir="ltr">
-	<p dir="ltr" align="left"><font face="Tahoma">C (libpq) </font></li>
-	<li dir="ltr">
-	<p dir="ltr" align="left"><font face="Tahoma">Embedded C (ecpg) </font>
-	</li>
-	<li dir="ltr">
-	<p dir="ltr" align="left"><font face="Tahoma">Java (jdbc) </font></li>
-	<li dir="ltr">
-	<p dir="ltr" align="left"><font face="Tahoma">Python (PyGreSQL) </font>
-	</li>
-	<li dir="ltr">
-	<p dir="ltr" align="left"><font face="Tahoma">TCL (libpgtcl) </font></li>
-</ul>
-<p dir="rtl" align="right"><span lang="fa"><font face="Tahoma">واسطهاي ديگر در 
-سايت </font></span><font face="Tahoma"> <A 
-href="http://gborg.postgresql.org/">http://gborg.postgresql.org</A> 
-<span lang="fa">در قسمت </span><i>Drivers/Interfaces</i><span lang="fa"> وجود 
-دارد.</span></font></p>
-<HR dir="rtl">
-
-<h2 align="center" dir="rtl"><span lang="fa"><font face="Tahoma">سوالات مديريتي</font></span></h2>
-<H4 dir="rtl"><font face="Tahoma"><A name=3.1>3.1</A>) 
-<span lang="fa">چگونه مي‌توانم </span>PostgreSQL<span lang="fa">‌ را در شاخه‌اي 
-غير از </span>/usr/local/pgsql/<span lang="fa">&nbsp; نصب كنم؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma">موقع اجراي دستور <i><span lang="en-us">
-configure</span> </i>از گزينه <span lang="en-us">prefix--</span> استفاده كنيد.</font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=3.2>3.2</A>) 
-<span lang="fa">چرا موقعي كه من برنامه </span>postmaster<span lang="fa">‌ را 
-اجرا مي كنم پيام </span>Bad system call<span lang="fa">‌ و يا </span>core dump
-<span lang="fa">‌مي‌گيرم؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma">به دلايل مختلف ممكن است اين اتفاق بيفتد. اما در 
-قدم اول شما مطمئن شويد كه كه امكانات اضافه <span lang="en-us">System V</span>‌ 
-در كرنل شما نصب شده باشد. <span lang="en-us">PostgreSQL</span> براي اجرا شدن 
-نياز به استفاده از امكانات حافظه مشترك و سمافورها دارد.</font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=3.3>3.3</A>)
-<span lang="fa">چرا موقعي كه من سعي مي‌كنم برنامه </span>postmaster<span lang="fa">‌ 
-را اجرا كنم خطاي</span> <I>IpcMemoryCreate</I>&nbsp; <span lang="fa">مي‌گيرم؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma">احتمالاً‌ قسمت ايجاد حافظه مشترك در كرنل به 
-درستي تنظيم نشده است و يا اينكه بايد فضاي حافظه اشتراكي در كرنل را زياد كرد. 
-ميزان دقيق حافظه مشترك مورد نياز بسته به معماري و نحوه استفاده از بافرها توسط 
-برنامه <span lang="en-us"><i>postmaster </i></span>دارد. براي بيشتر سيستم‌ها كه 
-با تنظيمات پيش‌فرض كار مي‌كنند مقدار اين حافظه حدود <span lang="en-us">1</span> 
-مگابايت است. براي ديدن اطلاعات بيشتر راجع به حافظه مشترك و سمافور به <A 
-href="http://www.postgresql.org/docs/view.php?version=current&amp;idoc=1&amp;file=kernel-resources.html">
-PostgreSQL Administrator&#39;s Guide</A><span lang="en-us"> </span>مراجعه كنيد.</font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=3.4>3.4</A>) <span lang="fa">چرا موقعي 
-كه من سعي مي‌كنم برنامه </span>postmaster<span lang="fa">‌ را اجرا كنم خطاي</span> <I><span lang="fa">
-&nbsp;</span>IpcSemaphoreCreate<span lang="fa">
-</span></I><span lang="fa">مي‌گيرم؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma">اگر پيغام خطا<span lang="en-us"> </span><i>
-(‌pcSemaphoreCreate: semget failed (No space left on devi<span lang="en-us">ce
-</span>&nbsp;</i>باشد به اين معني است كه تعداد سمافورهاي تنظيم شده در كرنل كافي نيست. <span lang="en-us">
-PostgreSQL</span>‌ براي هر فرايندي كه در
-<span lang="en-us">backend</span> اجرا مي‌شود به يك سمافور نياز دارد. يك راه حل 
-موقت براي اين مسئله آن است كه <i><span lang="en-us">postmaster</span> </i>را با 
-اعمال محدوديت روي تعداد فرايندهايي كه مي‌تواند ايجاد كند اجرا كنيم. براي اينكار 
-از گزينه <span lang="en-us">N-</span> و يك عدد كمتر از 32 استفاده كنيد. راه حل 
-دائمي اين مشكل آن است كه پارامترهاي <span lang="en-us">SEMMNS, SEMMNI</span> 
-كرنل را افزايش دهيم.</font></p>
-<P dir="rtl"><font face="Tahoma">در زمان دسترسي خيلي زياد به پايگاه داده، ‌ 
-سمافورهاي نامعتبر مي‌توانند باعث <span lang="en-us">crash</span>‌ كردن سيستم 
-شوند.</font></P>
-<P dir="rtl"><font face="Tahoma">اگر پيغام خطا چيز ديگري باشد احتمالاً به دليل 
-آن است كه كرنل از سمافورها پشتيباني نمي‌كند. براي ديدن اطلاعات بيشتر راهنماي 
-مديريتي <span lang="en-us">PostgreSQL</span> را مطالعه كنيد.</font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=3.5>3.5</A>)  
-<span lang="fa">چگونه مي‌توانم اتصالات ساير ماشينها را كنترل كنم؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma">به صورت پيش فرض فقط از ماشيني كه
-<span lang="en-us">PostgreSQL </span>روي آن در حال اجراست مي‌توان با استفاده از 
-سوكت‌هاي يونيكسي به آن متصل شد. ساير ماشين‌ها قادر نيستند به <span lang="en-us">
-PostgreSQL</span> متصل شوند مگر آنكه گزينه <span lang="en-us">tcp_sockets</span> 
-در فايل <span lang="en-us">postgresql.conf</span> فعال شده و همچنين با اصلاح 
-فايل <span lang="en-us">PGDATA/ph_hba.conf</span> هويت‌شناسي مبتني بر ميزبان نيز 
-فعال شود. با اين كار مي‌توان اتصالات <span lang="en-us">TCP/IP</span> به
-<span lang="en-us">PostgreSQL</span>‌ ايجاد كرد.</font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=3.6>3.6</A>)  
-<span lang="fa">براي كارايي بالاتر و بهتر پايگاه داده من چه تنظيماتي را بايد 
-انجام دهم؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma">به طور حتم استفاده از انديس‌ها باعث بالا رفتن 
-سرعت پاسخ‌گويي به درخواست‌ها خواهد شد. دستور <span lang="en-us">EXPLAIN ANALYZE</span> 
-به شما امكان ديدن نحوه پردازش يك دستور توسط <span lang="en-us">PostgreSQL</span> 
-را مي‌دهد.</font></p>
-<p dir="rtl"><font face="Tahoma">اگر شما تعداد زيادي<span lang="en-us"> INSERT</span>‌ 
-داريد سعي كنيد آنها را با قرار دادن در يك فايل با دستور <span lang="en-us">COPY</span>‌ 
-اجرا كنيد. اين دستور به مراتب از <span lang="en-us">INSERT</span> سريعتر است. 
-حتي‌الامكان سعي كنيد از تراكنشها استفاده نكنيد. تراكنشها مجموعه دستوراتي هستند 
-كه بيند <span lang="en-us">BEGIN</span> و ‍<span lang="en-us">COMMIT</span> 
-مي‌آيند. اگر يك دستور به صورت عادي اجرا شود <span lang="en-us">PostgreSQL</span> 
-خود آن دستور را به صورت يك تراكنش مستقل نگاه كرده و اجرا مي‌كند. موقعی كه 
-تغييرات زيادي در پايگاه داده انجام مي‌شود انديسهاي قبلي را حذف و مجدداً‌ ايجاد 
-كنيد.</font></p>
-<p dir="rtl"><font face="Tahoma">استفاده از گزينه <span lang="en-us">o -F-</span> 
-در فرمان <i><span lang="en-us">postmaster</span></i> باعث غير فعال كردن
-<span lang="en-us">()fsync</span> مي‌شود. اين دستور بعد از هر تراكنش اطلاعات را 
-روي هاردديسك منتقل مي‌كند.</font></p>
-<p dir="rtl"><font face="Tahoma">براي افزايش تعداد بافرهاي حافظه اشتراكي از 
-گزينه <span lang="en-us">B-</span> به همراه فرمان <i><span lang="en-us">
-postmaster</span></i> استفاده كنيد. توجه كنيد كه اگر اين عدد خيلي بزرگ باشد ممكن 
-است <i><span lang="en-us">postmaster</span></i> اصلاً‌ اجرا نشود. هر بافر 8 كيلو 
-بايت حافظه نياز دارد و تعداد بافرها به طور پيش فرض 64 است.</font></p>
-<p dir="rtl"><font face="Tahoma">همچنين مي‌توان با گزينه <span lang="en-us">S-</span>&nbsp; 
-ميزان حافظه‌اي كه براي مرتب‌سازي‌هاي موقت توسط <span lang="en-us">PostgreSQL</span> 
-استفاده مي‌شود را افزايش داد. مقدار پيش فرض 512 كيلو بايت است.</font></p>
-<p dir="rtl"><font face="Tahoma">استفاده از دستور <span lang="en-us">CLUSTER</span> 
-نيز براي بالا بردن كارايي موثر ا ست. دستور راهنماي <span lang="en-us">CLUSTER</span> 
-اطلاعات بيشتري در اين زمينه به شما مي‌دهد.</font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=3.7>3.7</A>)  
-<span lang="fa">چه امكاناتي براي پيدا كردن اشكال‌ وجود دارد؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma"><span lang="en-us">PostgerSQL</span>‌ امكانات 
-مختلفي براي گزارش دادن وضعيت خود دارد كه براي اشكال زدايي مي‌توان از آنها 
-استفاده كرد.</font></p>
-<P dir="rtl"><font face="Tahoma">با استفاده از گزينه <span lang="en-us">
-enable-assert--</span> 
-تعداد زيادي <span lang="en-us">()assert</span> براي مونيتور كردن و توقف برنامه 
-در صورت بروز خطاهاي ناخواسته فعال مي‌شود.</font></P>
-<P dir="rtl"><font face="Tahoma">هم <i><span lang="en-us">Postmaster</span></i> 
-و هم <i><span lang="en-us">postgres</span></i> گزينه‌هاي زيادي براي اشكال زدايي 
-دارند. موقعي كه <i><span lang="en-us">postmaster</span></i> را اجرا مي‌كنيد 
-خروجي استاندارد و خطا را سمت فايل <span lang="en-us">log</span> ارسال كنيد.</font></P>
-<div dir="ltr">
-	<PRE><font face="Tahoma">    cd /usr/local/pgsql
-    ./bin/postmaster &gt;server.log 2&gt;&amp;1 &amp;
-</font></PRE>
-</div>
-<P dir="rtl"><font face="Tahoma">اين كار يك فايل<span lang="en-us"> 
-log</span> 
-در بالاترين شاخه <span lang="en-us">PostgreSQL</span>‌ ايجاد مي‌كند. اين فايل 
-حاوي اطلاعات مفيدي در مورد مسائل و خطاهايي است كه براي سرور اتفاق افتاده است. 
-براي ديدن جزئيات بيشتر مي‌توان از <span lang="en-us">d-</span>&nbsp; به همراه 
-فرمان <i><span lang="en-us">postmaster</span>‌</i> استفاده كرد. گزينه
-<span lang="en-us">d-</span> همچنين يك عدد مي‌گيرد كه نشان دهنده سطح جزئياتي است 
-كه در <span lang="en-us">Log</span>‌فايل نوشته مي‌شود. با بالابردن اين عدد حجم 
-اطلاعات توليد شده در <span lang="en-us">Log</span>فايل نيز افزايش مي‌يابد.</font></P>
-<P dir="rtl"><font face="Tahoma">اگر <i><span lang="en-us">postmaster</span></i> 
-در حال اجرا نباشد، مي‌توانيم <span lang="en-us">postgres</span> را به طور مستقيم 
-از خط فرمان اجرا كرده و&nbsp; دستورات <span lang="en-us">SQL</span> را به آن 
-بدهيم. اين كار فقط براي اشكال‌يابي توصيه مي‌شود. توجه كنيد كه در اين حالت يك 
-دستور با كاراكتر <span lang="en-us">newline</span> خاتمه پيدا مي‌كند و نه با
-<span lang="en-us">;. </span>اگر <span lang="en-us">postmaster</span> را با 
-امكانات اشكال‌يابي كامپيل كرده باشيد مي‌توانيد با استفاده از يك برنامه اشكال‌ياب 
-اجراي برنامه را مونيتور كنيد. </font></P>
-<P dir="rtl"><font face="Tahoma">اگر <i><span lang="en-us">postmaster</span></i> 
-در حال اجرا باشد با دستور <span lang="en-us">psql</span> مي‌توان به
-<span lang="en-us">postgres</span> متصل شد. با پيدا كردن <span lang="en-us">PID</span> 
-فرايند <span lang="en-us">postgres</span> كه <span lang="en-us">psql</span> به 
-آن متصل شده است مي‌توان آن را مونيتور كرد. براي اينكار بايد يك برنامه اشكال‌ياب 
-را به آن <span lang="en-us">pid</span> متصل كرد. اگر بخواهيم بالا آمدن
-<span lang="en-us">postgres</span> را مونيتور كنيم كافي است<span lang="en-us"> 
-&quot;PGOPTIONS=&quot;-W</span> <span lang="en-us">n</span> و <span lang="en-us">psql</span> 
-را اجرا كنيم. اين كار باعث مي‌شود كه <span lang="en-us">postgres</span> با
-<span lang="en-us">n</span> ثانيه تاخير اجرا شود و در اين فاصله شما مي‌توانيد 
-برنامه اشكال‌ياب را به آن متصل كرده و با قرار دادن يك نقطه توقف&nbsp; روند اجراي 
-آن را مونيتور كنيد.</font></P>
-<P dir="rtl"><font face="Tahoma"><i><span lang="en-us">postgres</span></i> 
-گزينه‌هاي <span lang="en-us">s-</span>‌ و <span lang="en-us">A-</span> و
-<span lang="en-us">t-</span>‌ دارد كه براي پيدا كردن اشكالات بسيار مناسب هستند.</font></P>
-<p dir="rtl"><font face="Tahoma">شما مي‌توانيد <span lang="en-us">postgreSQL</span> 
-را با امكانات <span lang="en-us">profiling</span> كامپيل كنيد. اين كار باعث 
-مي‌شود كه زمان اجراي دقيق هر تابع در برنامه مشخص شود. خروجي‌هاي توليد شده در اين 
-حالت در فايل <span lang="en-us">DLINUX_PROFILE.</span> ريخته مي‌شود.</font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=3.8>3.8</A>) 
-<span lang="fa">چرا موقعي كه من مي‌خواهم به پايگاه داده وصل شوم پيام</span> <I>
-&quot;Sorry, too many clients&quot;
-<span lang="fa">‌</span></I><span lang="fa">مي‌گيرم؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma">شما بايد حداكثر تعداد فرايندهاي همزمان <i>
-<span lang="en-us">postmaster</span></i> را افزايش دهيد. مقدار پيش فرض 32 است. 
-براي افزايش آن مي‌توان از گزينه <span lang="en-us">N-</span> استفاده كرد و يا 
-فايل <i><span lang="en-us">postgresql.conf</span></i> را اصلاح نمود</font></p>
-<p dir="rtl"><font face="Tahoma">توجه كنيد كه اگر <span lang="en-us">N-</span> 
-مقداري بيشتر از 32 داشته باشد بايد مقدار <span lang="en-us">B-</span> را نيز 
-افزايش دهيم. اين مقدار بايد حداقل دو برابر مقدار <span lang="en-us">N-</span>‌ 
-باشد. براي اعداد خيلي بالا بايد بعضي از پارامترهاي كرنل را نيز اصلاح كرد. 
-پارامترهايي نظير حداكثر اندازه حافظه اشتراكي <span lang="en-us">SHMMAX</span> ، 
-حداكثر تعداد سمافورها<span lang="en-us"> SEMMNI</span>‌ و <span lang="en-us">
-SEMMNS </span>، حداكثر تعداد فرايندها <span lang="en-us">NPROC</span>، حداكثر 
-فرايندهاي يك كاربر <span lang="en-us">MAXUPRC</span> و حداكثر فايلهاي باز
-<span lang="en-us">NFILE</span> و <span lang="en-us">NINODE. </span>يكي از 
-دلايلي كه تعداد اتصالات همزمان <span lang="en-us">postgreSQL</span> محدود است آن 
-است كه نيازهاي <span lang="en-us">PostgreSQL</span> بيش از منابع موجود سيستم 
-نباشد.</font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=3.9>3.9</A>) <span lang="fa"> 
-در شاخه </span>&nbsp;<I>pgsql_tmp</I> <span lang="fa">&nbsp;چه چيزي قرار دارد؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma">دراين شاخه فايلهاي موقتي قرار دارد كه با اجراي 
-درخواستها به وجود آمده است. به عنوان مثال اگر براي اجراي دستور
-<span lang="en-us">order by</span> نياز به انجام مرتب سازي باشد و در صورتي كه 
-حافظه مشخص شده با گزينه <span lang="en-us">S-</span> براي اينكار كافي نباشد 
-سيستم يك فايل موقت در اين شاخه ايجاد مي‌كند تا عمل مرتب سازي را انجام دهد.</font></p>
-<P dir="rtl"><font face="Tahoma">فايلهاي موقت معمولاً به صورت اتوماتيك پاك 
-مي‌شود اما اگر <span lang="en-us">postgreSQL</span> در حين مرتب سازي
-<span lang="en-us">crash</span>‌ كند آن فايلها باقي مي‌مانند. با
-<span lang="en-us">stop</span> و <span lang="en-us">start</span> كردن برنامه <i>
-<span lang="en-us">postmaster</span></i> اين فايلها پاك مي‌شوند.</font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=3.10>3.10</A>) 
-<span lang="fa">چرا براي به روز كردن نسخه پايگاه داده من بايد كل داده ها را
-</span>dump<span lang="fa">‌ و مجدداً </span>restore<span lang="fa"> كنم؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma">تيم برنامه نويس <span lang="en-us">postgreSQL</span> 
-در نسخه‌هاي ارائه شده كه فقط <span lang="en-us">minor</span> آنها متفاوت است فقط 
-تغييرات كوچكي اعمال مي‌كنند؛ بنابراين براي به روز كردن از نسخه
-<span lang="en-us">7.2</span>‌به 7.2.1<span lang="en-us"> </span>نيازي به
-<span lang="en-us">dump</span> و <span lang="en-us">restore</span> نيست. اما در 
-نسخه‌هايي كه <span lang="en-us">major</span> آنها تغيير مي‌كند غالباً ساختار 
-داخلي جداول و فايلهاي داده تغيير مي‌كند. اين تغييرات معمولاً‌ پيچيده هستند. براي 
-انتقال داده‌هاي موجود در پايگاه داده در اين حالت بايد ‌از <span lang="en-us">
-dump</span> و <span lang="en-us">restore</span> استفاده كرد.</font></p>
-<P dir="rtl"><font face="Tahoma">در نسخه‌هايي كه ساختار روي ديسك تغييري نمي‌كند 
-مي توان از برنامه <span lang="en-us">pg_upgrade</span> براي به روز كردن پايگاه 
-داده استفاده كرد بدون اينكه نيازي به استفاده از <span lang="en-us">dump</span> و
-<span lang="en-us">restore </span>&nbsp;باشد. در يادداشتي كه به همراه هر توزيع مي‌آيد 
-ذكر شده است كه آيا برنامه <span lang="en-us">pg_upgrade</span> براي اين توزيع 
-وجود دارد يا خير.</font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=3.11>3.11</A>)  
-<span lang="fa">از چه سخت افزاري بايد استفاده كنم؟</span><BR>
-</font></H4>
-<P dir="rtl"><font face="Tahoma">چون اكثر سخت‌افزارهاي <span lang="en-us">PC
-</span>&nbsp;سازگار هستند مردم فكر مي‌كنند كه كيفيت آنها نيز يكسان است. در حاليكه 
-اينطور نيست. استفاده از هاردهاي <span lang="en-us">SCSI</span> و حافظه‌هاي <span lang="en-us">
-ECC</span> و مادربردهاي با كيفيت بالا نسبت به سخت افزارهاي ارزانتر نتايج بهتري 
-از نظر كارايي و پايداري سيستم بهمراه خواهد داشت.<span lang="en-us"> 
-PostgreSQL</span> روي بيشتر سخت افزارها اجرا مي‌شود اما اگر كارايي و اطمينان 
-فاكتورهاي مهمي هستند بايد سخت افزار مناسب استفاده شود. در گروههاي پستي در مورد 
-سخت افزار مناسب&nbsp; و انتخاب آن بحث شده است. </font></P>
-<HR dir="rtl">
-
-<H2 align=center dir="rtl"><span lang="fa"><font face="Tahoma">سوالات عملياتي</font></span></H2>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.1>4.1</A>) تفاوت بين
-<span lang="en-us">binary cursors</span> و <span lang="en-us">Normal cursors</span> 
-چيست؟</font></H4>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">راهنماي دستور </span>DECLARE<span lang="fa">‌ 
-را مطالعه كنيد.</span></font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.2>4.2</A>) 
-<span lang="fa">من چگونه مي‌توانم فقط روي چند رديف اول يا يك رديف تصادفي درخواست </span>
-SELECT<span lang="fa">‌ بزنم؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">راهنماي دستور </span>FETCH
-<span lang="fa">&nbsp;يا </span>SELECT...LIMIT<span lang="fa"> را ببينيد.</span></font></p>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">در واقع كل درخواست بايد بررسي و 
-ارزيابي شود حتي اگر شما فقط چند رديف اول را بخواهيد. براي مثال درخواست </span>
-ORDER BY<span lang="fa"> را در نظر بگيريد. اگر انديس يا نمايه‌اي براي </span>
-ORDER BY<span lang="fa"> وجود داشته باشد،‌</span>postgreSQL<span lang="fa">‌ 
-ممكن است بتواند فقط چند سطر اول درخواستي را ارزيابي كند و يا اينكه كل درخواست 
-پردازش شود تا تعداد رديف‌هاي درخواستي توليد شود.</span></font></P>
-<P dir="rtl"><span lang="fa"><font face="Tahoma">براي انتخاب يك سطر تصادفي به 
-روش زير عمل مي‌كنيم:</font></span><div dir="ltr">
-	<PRE><font face="Tahoma">    SELECT col
-    FROM tab
-    ORDER BY random()
-    LIMIT 1;
-</font></PRE>
-</div>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.3>4.3</A>) 
-<span lang="fa">من چگونه مي‌توانم ليستي از جداول يا ساير چيزهايي كه در </span>
-psql<span lang="fa">‌ وجود دارد را ببينم؟</span></font></H4>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">براي ديدن ليست جداول دستور&nbsp;
-</span>dt\<span lang="fa"> را در برنامه </span><i>psql</i><span lang="fa"><i>‌</i> 
-استفاده كنيد. براي ديدن ليست كامل فرمانها </span>?\<span lang="fa"> را اجرا 
-كنيد. راه ديگر خواندن متن برنامه </span>psql<span lang="fa">‌ است كه در شاخه
-</span> <I>pgsql/src/bin/psql/describe.c <span lang="fa">‌</span></I><span lang="fa">قرار 
-دارد.<I> </I>اين فايل حاوي فرامين </span>SQL<span lang="fa">يي است كه خروجي را 
-براي&nbsp; دستوراتي كه با </span>\<span lang="fa">‌در </span>psql<span lang="fa"> 
-شروع مي‌شوند توليد مي‌كنند. راه ديگر اجراي </span>psql<span lang="fa"> با گزينه
-</span>E-<span lang="fa">‌است. اينكار باعث مي‌شود كه </span>psql<span lang="fa"> 
-قبل از اجرا هر دستور </span>SQL<span lang="fa">‌متناظر آن را نشان دهد. </span>
-PostgreSQL<span lang="fa">‌همچنين يك برنامه </span>SQLi<span lang="fa"> دارد كه 
-مي‌توان با استفاده از آن&nbsp; اطلاعات داخلي پايگاه داده را استخراج كرد.</span></font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.4>4.4</A>)  
-<span lang="fa">چگونه يك ستون جدول را حذف مي‌كنيد؟ چگونه نوع داده آن را عوض 
-كنيم؟</span></font></H4>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">حذف يك ستون در توزيع </span>7.3
-<span lang="fa">با استفاده از دستور </span>ALTER TABLE DROP COLUMN<span lang="fa"> 
-اضافه شده است. در نسخه‌هاي قبلي به روش زير عمل كنيد:</span></font></P>
-<div dir="ltr">
-	<PRE><font face="Tahoma">    BEGIN;
-    LOCK TABLE old_table;
-    SELECT ...  -- <span lang="fa">تمام ستونها غير از ستوني كه مي‌خواهيد آن را حذف كنيد را در اينجا بياوريد</span>
-    INTO TABLE new_table
-    FROM old_table;
-    DROP TABLE old_table;
-    ALTER TABLE new_table RENAME TO old_table;
-    COMMIT;
-</font></PRE>
-</div>
-<P dir="rtl"><span lang="fa"><font face="Tahoma">براي عوض كردن نوع داده يك ستون 
-به روش زير عمل كنيد:</font></span></P>
-<div dir="ltr">
-	<PRE><font face="Tahoma">    BEGIN;
-    ALTER TABLE tab ADD COLUMN new_col <I>new_data_type</I>;
-    UPDATE tab SET new_col = CAST(old_col AS <I>new_data_type</I>);
-    ALTER TABLE tab DROP COLUMN old_col;
-    COMMIT;
-</font></PRE>
-</div>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.5>4.5</A>)  
-<span lang="fa">حداكثر اندازه يك رديف،‌ جدول و خود پايگاه داده چقدر است؟</span></font></H4>
-<p dir="rtl"><span lang="fa"><font face="Tahoma">محدوديتها عبارتند از:</font></span></p>
-<div dir="rtl">
-	<PRE><font face="Tahoma">    <span lang="fa">حداكثر اندازه پايگاه داده </span>            <span lang="fa">نامحدود (تا 32 ترابايت وجود دارد)</span>
-    <span lang="fa">حداكثر اندازه يك جدول</span>               <span lang="fa">32 ترابايت</span>
-    <span lang="fa">حداكثر ا ندازه يك رديف</span>              <span lang="fa">1.6 ترابايت</span>
-    <span lang="fa">حداكثر اندازه يك فيلد</span>                <span lang="fa">1 گيگا بايت</span>
-    <span lang="fa">حداكثر اندازه رديفهاي يك جدول</span> <span lang="fa"> نا محدود</span>
-    <span lang="fa">حداكثر ستونهاي يك جدول</span> <span lang="fa">	بسته به نوع جدول بين 250 تا 6000 </span>
-    <span lang="fa">حداكثر انديسهاي يك جدول	نا محدود</span>
-</font></PRE></div>
-<p dir="rtl"><span lang="fa"><font face="Tahoma">البته در حالت نامحدود نيز ما 
-محدود به حجم هاردديسك و فضاي حافظه خواهيم بود. در صورتي که مقادير مشخص شده به 
-عنوان نامحدود به صورت غير معمولي بزرك شوند كارايي سيستم كاهش خواهد يافت.</font></span></p>
-<P dir="rtl"><span lang="fa"><font face="Tahoma">براي ذخيره كردن جداول با اندازه 
-خيلي بزرگ نيازي نيست كه سيستم عامل امكان ايجاد فايلهاي بزرگ را داشته باشد. بلكه 
-جداول خيلي بزرگ به صورت فايلهايي به حجم يك گيگا بايت نگاهداري مي‌شوند.</font></span></P>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">اگر اندازه بلوكهاي داده را 
-برابر 32 كيلو بايت قرار دهيم حداكثر اندازه جدول و حداكثر تعداد ستونها 4 برابر 
-خواهد شد.</span></font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.6>4.6</A>) 
-<span lang="fa">چقدر فضاي ديسك سخت براي ذخيره كردن داده‌‌هاي يك فايل متني مورد 
-نياز است؟</span></font></H4>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">يك پايگاه داده </span>
-PostgreSQL<span lang="fa">‌ تا 5 برابر فضايي روي هاردديسك براي نگاهداري يك فايل 
-متني نياز دارد.</span></font></P>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">به عنوان مثال يك فايل با 100000 
-خط را در نظر بگيريد كه در هر خط يك عدد صحيح و يك توضيح متني آمده است. فرض كنيد 
-كه رشته متني به طور متوسط 20 بايت باشد. اندازه فايل برابر 2.8 مگا بايت خواهد بود 
-ولي </span>PostgreSQL<span lang="fa"> براي نگاهداري اين فايل به 6.4 مگا بايت 
-اطلاعات نياز خواهد داشت.</span></font></P>
-<div dir="rtl">
-	<PRE><font face="Tahoma">    32 bytes: <span lang="fa">اندازه سرايند هر خط به طور تقريبي</span>
-    24 bytes: <span lang="fa">يك عدد صحيح و يك رشته 24 بايتي</span>
-   + 4 bytes: <span lang="fa">اشاره گر روي صفحه به يك چندتايي</span>
-   ----------------------------------------
-    60 bytes <span lang="fa">در هر رديف</span>
-
-<span lang="fa">اندازه صفحات داده در </span>PostgreSQL<span lang="fa"> برابر با 8 كيلو بايت است</span>
-   8192 <span lang="fa">تعداد بايت‌ها در هر صفحه</span>
-   -------------------   =  136 <span lang="fa">تعداد رديف‌ها در يك صفحه پايگاه داده</span>
-     60 <span lang="fa"> تعداد بايت‌هاي هر رديف</span>
-
-   100000 <span lang="fa"> تعداد رديفها</span>
-   --------------------  = <span lang="fa">تعدادصفحات پايگاه داده</span>
-      128 <span lang="fa">تعداد رديفها در هر صفحه</span>
-
-735 <span lang="fa">تعداد صفحات</span> * 8192 <span lang="fa">تعداد بايت‌هاي هر صفحه</span>  =  6,021,120 <span lang="fa">مگا بايت</span>
-</font></PRE>
-</div>
-<P dir="rtl"><span lang="fa"><font face="Tahoma">سربار انديسها يا نمايه‌ها از 
-اين مقدار كمتر است ولي چون شامل خود داده‌ها هم هست </font></span>
-<font face="Tahoma">م<span lang="fa">مکن است اندازه آنها هم بزرگ شود</span>.</font></P>
-<p dir="rtl"><font face="Tahoma">NULL<span lang="fa">ها به صورت </span>bitmap<span lang="fa"> 
-ذخيره مي‌شوند و از اينرو فضاي بسيار كمي را اشغال مي‌كنند.</span></font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.7>4.7</A>) 
-<span lang="fa">چگونه مي‌توانم بفهمم كه چه كاربران،‌ پايگاه داده،‌ نمايه و 
-جداولي در سيستم تعريف شده است؟</span></font></H4>
-<P dir="rtl"><font face="Tahoma"><i>psql<span lang="fa"> </span></i>
-<span lang="fa">تعداد زيادي دستور دارد كه با </span>\<span lang="fa"> شروع 
-مي‌شوند و اين اطلاعات را در اختيار ما قرار مي‌دهند. براي ديدن آنها دستور </span>
-?\ <span lang="fa">&nbsp;را اجرا كنيد.&nbsp; همچنين جداول سيستمي كه با نام آنها
-</span>pg<span lang="fa">_</span> <span lang="fa">‌شروع مي‌شود نيز اين اطلاعات 
-را در خود دارند. اجراي برنامه </span>psql<span lang="fa"> با گزينه </span>l-
-<span lang="fa">&nbsp;نيز باعث نشان دادن ليست تمام پايگاههاي داده مي‌شود.</span></font></P>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">همچنين فايل </span> <I>
-pgsql/src/tutorial/syscat.source<span lang="fa">
-</span></I><span lang="fa">نيز فرمانهاي </span>SELECT<span lang="fa"> كه با 
-استفاده از آن مي‌توان اطلاعات پايگاه داده را استخراج كرد شرح داده است.</span></font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.8>4.8</A>)  
-<span lang="fa">چرا درخواستهاي من كند اجرا مي‌شوند يا چرا از نمايه ها استفاده 
-نمي‌كنند؟</span></font></H4>
-<p dir="rtl"><span lang="fa"><font face="Tahoma">به طور معمول </font></span>
-<font face="Tahoma"><span lang="fa">براي درخواستها از نمايه‌ها استفاده نمي‌شود. 
-تنها در صورتي از نمايه‌ها استفاده مي‌شود كه اندازه جدول از يك اندازه حداقل 
-بزرگتر باشد و درخواست هم فقط قسمتي از رديف‌هاي جدول را انتخاب كرده باشد. دليل 
-اين كار آن است كه دسترسي‌هاي تصادفي به هاردديسك كه به خاطر نمايه‌ها ايجاد مي‌شود 
-ممكن است از خواندن مستقيم جدول يا خواندن ترتيبي ركوردها كندتر باشد.</span></font></p>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">براي تعيين اينكه از نمايه 
-استفاده شود يا خير، </span>PostgreSQL<span lang="fa"> بايد اطلاعات آماري را در 
-مورد يك جدول بداند. اين اطلاعات توسط دستور </span>ANALYZE<span lang="fa"> و
-</span>VACUUM ANALYZE<span lang="fa"> به دست مي‌آيد. با استفاده از اين اطلاعات،‌ 
-بهينه ساز از تعداد رديف‌هاي يك جدول اطلاع پيدا مي‌كند و بهتر مي‌تواند تعيين كند 
-كه آيا از نمايه استفاده شود يا خير. اطلاعات آماري همچنين براي تعيين ترتيب الحاق 
-و روشهاي الحاق به صورت بهينه نيز كاربر دارد. جمع آوري اطلاعات آماري بايد به صورت 
-دوره‌اي همزمان با تغيير داده‌هاي جدول انجام شود.</span></font></p>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">نمايه‌ها به طور معمول همراه با 
-دستور </span>ORDER BY<span lang="fa"> به كار برده نمي‌شوند. براي يك جدول بزرگ يك 
-پيمايش ترتيبي همراه با دستور مرتب سازي از به كار بردن نمايه‌ها سريعتر خواهد بود.</span></font></P>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">اما اگر همراه با </span>ORDER 
-BY<span lang="fa">‌ از </span>LIMIT<span lang="fa"> استفاده شود اغلب از نمايه‌ها 
-استفاده مي‌شود چون فقط قسمتي از جدول استفاده مي‌شود. در حقيقت هر چند</span>
-<span lang="fa">توابع ()</span>MIN<span lang="fa">‌ و </span>()MAX
-<span lang="fa">از نمايه‌ها استفاده نمي‌كنند ولي مي‌توانيم با استفاده از دستور 
-زير با استفاده از نمايه‌ها و دستور </span>ORDER BY<span lang="fa"> و </span>
-LIMIT<span lang="fa">‌ آنها را به دست آوريم.</span></font></p>
-<div dir="ltr">
-	<PRE><font face="Tahoma">    SELECT col
-    FROM tab
-    ORDER BY col [ DESC ]
-    LIMIT 1;
-</font></PRE>
-</div>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">اگر شما فكر مي‌كنيد كه بهينه 
-ساز سيستم در انتخاب پيمايش ترتيبي اشتباه كرده است با دستور </span>&#39;</font><CODE><font face="Tahoma">SET 
-enable_seqscan TO &#39;off&#39;</font></CODE><font face="Tahoma"><span lang="fa">&nbsp; 
-مي‌توانيد ببينيد آيا استفاده از نمايه‌ها باعث افزايش سرعت درخواست‌ها خواهد شد.</span></font></P>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">استفاده از نمايه‌ها هنگامي كه 
-از علائم ويژه نظير </span>LIKE<span lang="fa"> و </span>~<span lang="fa"> 
-استفاده مي‌كنيد فقط در بعضي شرايط خاصي كه در اينجا ذكر شده است ممكن است:</span></font></P>
-<ul dir="rtl">
-	<li dir="rtl">
-	<p dir="rtl"><font face="Tahoma"><span lang="fa">ابتداي رشته جستجو بايد به 
-	طور صريح مشخص باشد براي مثال:</span></font></li>
-	<li dir="rtl">
-	<p dir="rtl"><span dir="rtl"><font face="Tahoma"><span lang="fa">دستورات
-	</span>LIKE<span lang="fa"> نبايد با علامت </span>%<span lang="fa"> شروع 
-	شوند</span></font></span></li>
-	<li dir="rtl">
-	<p dir="rtl"><font face="Tahoma"><span lang="fa">الگوهاي منظمي كه با </span>
-	~<span lang="fa"> مي‌ايد حتماً بايد با علامت </span>^<span lang="fa"> شروع 
-	شود</span></font></li>
-	<li dir="rtl">
-	<p dir="rtl"><font face="Tahoma"><span lang="fa">رشته جستجو نبايد با يك 
-	مجموعه از كاراكتر‌ها&nbsp; مثل </span>[a-e]<span lang="fa"> شروع شود</span></font></li>
-	<li dir="rtl">
-	<p dir="rtl"><font face="Tahoma"><span lang="fa">جستجوهاي غيرحساس به متن مثل&nbsp;
-	</span>ILIKE<span lang="fa">‌ و </span>*~<span lang="fa"> از نمايه‌ها 
-	استفاده نمي‌كنند. در عوض از توابع نمايه‌اي كه در قسمت </span>
-	<A 
-  href="#4.12">4.12</A><span lang="fa"> 
-	توضيح داده شد استفاده مي‌كنند.</span></font></li>
-	<li dir="rtl">
-	<p dir="rtl"><font face="Tahoma"><span lang="fa">مقدار پيش فرض </span>locale<span lang="fa">‌ 
-	بايد در </span>initdb<span lang="fa"> استفاده شود.</span></font></li>
-</ul>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.9>4.9</A>)  
-<span lang="fa">چگونه مي‌توانم نحوه بررسي درخواست را توسط بهينه‌ساز درخواستها 
-مشاهده كنم؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">راهنماي دستور </span>EXPLAIN<span lang="fa"> 
-را نگاه كنيد.</span></font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.10>4.10</A>)  
-<span lang="fa">نمايه </span>R-tree<span lang="fa">‌ چيست؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">از نمايه </span>R-Tree
-<span lang="fa">&nbsp;براي انديس كردن داده‌هاي فاصله‌اي استفاده مي‌شود. يك نمايه
-</span>hash<span lang="fa"> نمي‌توانند جستجوهاي محدوده‌اي را انجام دهد. نمايه</span> 
-&quot;B-tree&quot;<span lang="fa"> نيز براي انجام جستجوي محدوده‌اي در يك جهت قابل استفاده 
-است. اما </span>R-Tree<span lang="fa"> مي‌تواند داده‌هاي چند بعدي را نيز 
-پشتيباني كند. براي مثال استفاده اگر از نمايه </span>R-tree<span lang="fa">‌ براي 
-گونه </span>Point<span lang="fa"> استفاده شود سرعت درخواست‌هايي نظير &quot;</span>select 
-all points within a bounding rectangle<span lang="fa">&quot; به مراتب افزايش مي‌يابد.</span></font></p>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">مقاله‌اي كه طراحي </span>R-tree<span lang="fa"> 
-را توضيح داده است </span></font></P>
-<P><font face="Tahoma">Guttman, A. &quot;R-trees: A Dynamic Index Structure for 
-Spatial Searching.&quot; Proceedings of the 1984 ACM SIGMOD Int&#39;l Conf on Mgmt of 
-Data, 45-57.</font></P>
-<P dir="rtl"><font face="Tahoma">R-tree<span lang="fa">‌ مي‌تواند چندضلعيها و 
-چند وجهي را پشتيباني كند. در تئوري </span>R-tree<span lang="fa"> مي‌تواند تعداد 
-بعدهاي بالاتر ري نيز پشتيباني كند. در عمل توسعه </span>R-tree<span lang="fa">‌ 
-نياز به كار بيشتري دارد.</span></font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.11>4.11</A>) 
-<span lang="fa">بهينه ساز تكويني درخواست چيست؟</span> (Genetic Query Optimizer)</font></H4>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">استفاده از </span>GEQO<span lang="fa"> 
-سرعت بهينه سازي درخواست را هنگاميكه تعداد زيادي جدول را با استفاده از الگوريتم 
-ژنتيك الحاق مي‌كنيم افزايش مي‌دهد.</span></font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.12>4.12</A>) 
-<span lang="fa">چگونه از عبارات منظم براي جستجو استفاده كنم؟ چگونه جستجويي انجام 
-دهم كه حساس به متن نباشد؟ چگونه براي يك جستجوي غير حساس به متن از نمايه استفاده 
-كنم؟</span></font></H4>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">براي جستجوي عبارت منظم از عملگر
-</span>~<span lang="fa">‌ استفاده مي‌كنيم. براي جستجوي غير حساس به متن از عملگر
-</span>*~ <span lang="fa">و يا </span>ILIKE<span lang="fa">‌ استفاده مي‌كنيم.</span></font></P>
-<p dir="rtl"><span lang="fa"><font face="Tahoma">روش ديگر انجام جستجوي غير حساس 
-به متن در زير نشان داده شده است.</font></span></p>
-<PRE><font face="Tahoma">    SELECT *
-    FROM tab
-    WHERE lower(col) = &#39;abc&#39;;
-</font></PRE>
-<p dir="rtl"><span lang="fa"><font face="Tahoma">اين از نمايه‌هاي استاندارد 
-استفاده نمي‌كند. ولي شما مي توانيد با دستور زير يك نمايه ايجاد كنيد و از آن 
-استفاده كنيد.</font></span></p>
-<PRE><font face="Tahoma">    CREATE INDEX tabindex ON tab (lower(col));
-</font></PRE>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.13>4.13</A>) I<span lang="fa">چگونه 
-مي‌توانم در يك درخواست تشخيص دهم كه يك فيلد </span>NULL<span lang="fa">‌ است؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">با استفاده از توابع </span>IS 
-NULL<span lang="fa"> و </span>IS NOT NULL<span lang="fa"> مي‌توانيم </span>NULL<span lang="fa"> 
-بودن يك فيلد را تست كنيم.</span></font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.14>4.14</A>) 
-<span lang="fa">تفاوت بين گونه‌هاي مختلف </span>character<span lang="fa"> چيست؟</span></font></H4>
-<PRE><font face="Tahoma">Type            Internal Name   Notes
---------------------------------------------------
-VARCHAR(n)      varchar      <span lang="fa">اندازه، حداكثر طول را نشان مي دهد بدون اضافه شدن كاراكتر اضافه</span>
-CHAR(n)       <span lang="fa">   </span>  bpchar       <span lang="fa">كاراكترهاي بلانك براي پر شدن طول مشخص شده استفاده مي‌شود</span>
-TEXT            <span lang="fa">    </span>text           <span lang="fa"> </span>ح<span lang="fa">داكثر طول را مشخص نمي‌كند</span>
-BYTEA          <span lang="fa">    </span> bytea         <span lang="fa">آرايه‌اي از بايت با طول متغير</span>
-&quot;char&quot;          <span lang="fa">     </span>char           <span lang="fa">يك كاراكتر</span>
-</font></PRE>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">نام داخلي گونه‌ها را در </span>
-system catalogue <span lang="fa">‌و بعضي از پيغامهاي خطا مي‌توان ديد.</span></font></p>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">چهار گونه اول همگي از نوع
-</span>varlena <span lang="fa">هستند (4 بايت اول روي ديسك طول را مشخص مي‌كند كه 
-به دنبال آن داده‌ها قرار دارند.)‌بنابراين فضاي واقعي استفاده شده روي ديسك از 
-اندازه تعريف شده بيشتر است. اما اين گونه‌ها را مي‌توان فشرده كرد كه اينكار باعث 
-مي‌شود فضاي كمتري روي ديسك اشغال كنند.</span></font></p>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">براي ذخيره رشته‌هاي با طول 
-متغير</span><font size="2">(</font><SMALL>VARCHAR(n<span lang="fa">‌
-<font size="3">بهترين انتخاب است. در اين گونه حداكثر طول رشته محدود است بر خلاف
-</font></span><font size="3">text<span lang="fa"> كه هيچ محدوديتي روي حداكثر 
-اندازه رشته نمي‌گذارد.(در اين گونه حداكثر طول يك رشته يك گيگا بايت خواهد بود)</span></font></SMALL></font></P>
-<p dir="rtl"><span lang="fa"><font face="Tahoma">گونه <font size="2">(</font></font></span><font face="Tahoma">CHAR(n<span lang="fa">
-<font size="3">&nbsp;براي ذخيره داده‌هاي با طول يكسان است.يك گونه‌</font>ي</span><font size="3"> </font>
-<font size="2"><span lang="fa">(</span></font>CHAR(n <span lang="fa">
-<font size="3">با كاراكترهاي بلانك (خالي) پر مي‌شود تا به طول مشخص شده برسد در 
-حاليكه گونه </font></span><font size="3">VARCHAR</font><font size="3"><span lang="fa"> 
-كاراكترها را به همان صورت كه هستند ذخيره مي‌كند. گونه </span>BYTEA<span lang="fa"> 
-براي ذخيره داده‌هاي باينري است به خصوص داده‌هاي باينتري كه شامل بايت‌هاي </span>
-NULL<span lang="fa"> هستند. از نظر كارايي تمام اين گونه‌ها يكسان هستند.</span></font></font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.15.1>4.15.1</A>) 
-<span lang="fa">چگونه مي‌توانم يك فيلد سريال يا افزايشي ايجاد كنم؟</span></font></H4>
-<p dir="rtl"><font face="Tahoma">PostgreSQL<span lang="fa"> از داده‌هاي سريال 
-پشتيباني مي‌كند. براي ايجاد يك فيلد سريال (براي داشتن يك فيلد منحصر به فرد براي 
-هر رديف )به روش زير عمل كنيد:</span></font></p>
-<PRE><font face="Tahoma">    CREATE TABLE person ( 
-        id   SERIAL, 
-        name TEXT 
-    );
-</font></PRE>
-<p dir="rtl"><span lang="fa"><font face="Tahoma">دستور بالا به طور اتوماتيک به 
-دستور زير تبديل مي‌شود:</font></span></p>
-<PRE><font face="Tahoma">    CREATE SEQUENCE person_id_seq;
-    CREATE TABLE person ( 
-        id   INT4 NOT NULL DEFAULT nextval(&#39;person_id_seq&#39;),
-        name TEXT 
-    );
-</font></PRE>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">براي ديدن اطلاعات بيشتر به 
-راهنماي دستور </span> <I>create_sequence</I> <span lang="fa">&nbsp;مراجعه كنيد. 
-همچنين مي‌توان از </span>OID<span lang="fa">‌هر رديف به عنوان يك مقدار منحصر به 
-فرد استفاده كرد. اما در اين حالت براي </span>dump<span lang="fa"> كردن و </span>
-reload<span lang="fa">‌كردن پايگاه داده بايد دستور </span><i>pg_dumps</i><span lang="fa"><i>‌</i> 
-را با گزينه </span>o-<span lang="fa">‌ اجرا كنيد.</span></font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.15.2>4.15.2</A>) <span lang="fa">
-چگونه مي‌توانم مقدار يك درج سريالي را بدانم؟</span></font></H4>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">يك روش براي گرفتن مقدار بعدي يك 
-فيلد سريال استفاده از تابع </span><i>()nextval</i><span lang="fa"> است.</span>
-<span lang="fa">در شبه كُدي كه در ادامه آمده است روش انجام اين كار نشان داده شده 
-است:</span></font></P>
-<PRE><font face="Tahoma">    new_id = execute(&quot;SELECT nextval(&#39;person_id_seq&#39;)&quot;);
-    execute(&quot;INSERT INTO person (id, name) VALUES (new_id, &#39;Blaise Pascal&#39;)&quot;);
-</font></PRE>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">با اجرا دستور فوق مقدار جديد را 
-در متغير </span>new_id<span lang="fa"> نيز خواهيدداشت كه مي‌توانيد آن را در بقيه 
-درخواست‌هاي نيز استفاده كنيد. توجه داشته باشيد كه نام </span>SEQUENCE<span lang="fa">يي 
-كه به طور اتوماتيك ايجاد شده است به صورت </span><i>table</i>_<I>serialcolumn</I>_<I>seq<span lang="fa">‌
-</span></I><span lang="fa">خواهد بود</span>. <span lang="fa">كه در آن </span>
-table<span lang="fa">‌ نام جدول و </span>serialcolumn<span lang="fa"> نام فيلد 
-سريال جدول مي‌باشد.</span></font></p>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">براي ديدن مقدار نسبت داده شده 
-به فيلد سريال نيز مي‌توان از تابع <i>()</i></span> <I>currval </I>
-<span lang="fa">به صورت زير استفاده كرد. </span></font></P>
-<PRE><font face="Tahoma">    execute(&quot;INSERT INTO person (name) VALUES (&#39;Blaise Pascal&#39;)&quot;);
-    new_id = execute(&quot;SELECT currval(&#39;person_id_seq&#39;)&quot;);
-</font></PRE>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">و سرانجام شما مي‌توانيد از 
-مقدار </span>OID<span lang="fa"> كه خروجي دستور </span>INSERT <span lang="fa">
-&nbsp;است براي ديدن مقدار پيش فرض استفاده كنيد. هر چند اين روش در همه پلتفرمها قابل 
-استفاده نيست و ضمن اينكه فيلد </span>oid<span lang="fa">‌ بعد از عدد 4 ميليارد 
-دوباره صفر مي‌شود. در زبان </span>perl<span lang="fa"> با استفاده از </span>DBI<span lang="fa"> 
-و </span>DBD::Pg<span lang="fa"> مقدار </span>oid<span lang="fa">‌را مي‌توانيد 
-به شكل زير استخراج كنيد:</span> <span lang="fa">بعد از اجراي ()</span>st-&gt;execute<span lang="fa">$ 
-مقدار </span>oid<span lang="fa">‌ در متغير </span>&nbsp;<I>sth-&gt;pg_oid_status<span lang="fa">$</span></I><span lang="fa"> 
-ذخيره خواهد شد.</span></font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.15.3>4.15.3</A>) <span lang="fa">آیا 
-توابع ()</span>nextval<span lang="fa"> و ()</span>currval<span lang="fa"> منجر 
-به ایجاد شرایط </span>race<span lang="fa"> برای سایر کاربران می شوند؟</span></font></H4>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">خیر، استفاده از این توابع شرایط
-</span>race<span lang="fa"> را به وجود نمی آورد.</span></font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.15.4>4.15.4</A>)</font><font face="Tahoma"><span lang="fa"> 
-چرا اعداد سریالی مربوط به تراکنشهای </span>abort<span lang="fa"> شده مجدداً 
-استفاده نمی شود؟ چرا بین اعداد سریالی یک فاصله خالی ایجاد می شود؟</span></font></H4>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">برای بالا بردن امکان اجرای 
-همزمان تراکنشها، اعداد سریالی به محض اجرای تراکنش به آنها تخصیص می یابد در این 
-حالت اگر بعضی از تراکنشها </span>abort<span lang="fa"> شوند بین اعداد سریالی 
-استفاده شده یک فاصله خالی به وجود می آید.</span></font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.16>4.16</A>) OID<span lang="fa"> و </span>
-TID<span lang="fa"> چه هستند؟</span></font></H4>
-<P dir="rtl"><font face="Tahoma">OID<span lang="fa"> راه حل </span>PostgreSQL<span lang="fa"> 
-برای داشتن یک شناسه منحصر به فرد برای هر ردیف است. هر ردیف جدیدی که ایجاد می شود 
-یک </span>OID<span lang="fa"> منحصر به فرد به آن اختصاص می یابد. تمام </span>OID<span lang="fa">هایی 
-که در حین </span>initdb<span lang="fa"> ایجاد می شوند از 16384 کمتر هستند و
-</span>OID<span lang="fa">هایی بعداً تولید می شود از این عدد بزرگتر خواهد بود. 
-نکته مهم آن است که </span>OID<span lang="fa">ها نه تنها در یک جدول شبیه نیستند 
-بلکه در کل پایگاه داده هیچ دو ردیفی دارای </span>OID<span lang="fa"> یکسان 
-نخواهد بود.</span></font></P>
-<P dir="rtl"><font face="Tahoma">PostgreSQL<span lang="fa"> از </span>OID<span lang="fa"> 
-در سیستم داخلی خود برای ایجاد ارتباط بین ردیفهای جداول مختلف استفاده می کند. 
-توصیه می شود که یک ستون از نوع </span>OID<span lang="fa"> برای ذخیره این فیلد در 
-جدول ایجاد کنید. ساختن یک نمایه برای این فیلد باعث دسترسی سریعتر به آن خواهد شد.</span></font></P>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">تمام پایگاههای داده در </span>
-PostgreSQL<span lang="fa"> برای گرفتن </span>OID<span lang="fa"> جدید از یک 
-ناحیه مرکزی استفاده می کند. ولی اگر بخواهیم </span>OID<span lang="fa"> را به روش 
-دیگری بگیریم و یا اینکه در حین کپی کردن یک جدول بخواهیم </span>OID<span lang="fa">های 
-اصلی آن تغییر نکند به روش زیر می توانیم عمل کنیم:</span></font></P>
-<P dir="rtl">&nbsp;</P>
-<div dir="ltr">
-	<PRE><font face="Tahoma">        CREATE TABLE new_table(mycol int);
-        SELECT oid AS old_oid, mycol INTO tmp_table FROM old_table;
-        COPY tmp_table TO &#39;/tmp/pgtable&#39;;
-        COPY new_table WITH OIDS FROM &#39;/tmp/pgtable&#39;;
-        DROP TABLE tmp_table;
-</font></PRE>
-</div>
-<P dir="rtl"><font face="Tahoma">OID<span lang="fa"> یک عدد صحیح 4 بایتی است و 
-بنابراین حداکثر مقدار آن 4 میلیارد خواهد بود و بعد از آن مقدار آن سرریز خواهد 
-شد.&nbsp; البته تا کنون برای&nbsp; کسی&nbsp; این اتفاق نیفتاده است و تصمیم 
-گرداندگان </span>PostgreSQL<span lang="fa"> آن است که قبل از آنکه این اتفاق رخ 
-دهد این مشکل را برطرف کنند.</span></font></P>
-<P dir="rtl"><font face="Tahoma">TID<span lang="fa">ها برای شناسایی محل فیزیکی 
-یک ردیف بر اساس بلوک و آفست می باشد. </span>TID<span lang="fa">ها بعد از تغییر 
-پیدا کردن یک ردیف و یا بازخوانی آن عوض می شوند. </span>TID<span lang="fa">ها 
-توسط نمایه ها استفاده می شوند.</span></font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.17>4.17</A>) 
-<span lang="fa">معني بعضي از ترمها و كلماتي كه در </span>PostgreSQL<span lang="fa">‌ 
-استفاده مي‌شود چيست؟</span></font></H4>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">لیست برخی از ترمها و کلماتی که 
-استفاده می شوند:</span></font></P>
-<UL>
-  <LI dir="ltr">
-	<p dir="ltr"><font face="Tahoma">table, relation, class <span lang="fa">
-    :کلاس، رابطه، جدول</span></font><LI dir="ltr">
-	<p dir="ltr"><font face="Tahoma">row, record, tuple <span lang="fa">چندتایی، 
-	رکورد، ردیف</span></font><LI dir="ltr">
-	<p dir="ltr"><font face="Tahoma">column, field, attribute <span lang="fa">
-    صفت، فیلد، ستون</span></font><LI dir="ltr">
-	<p dir="ltr"><font face="Tahoma">retrieve, select <span lang="fa">انتخاب، 
-	خواندن</span></font><LI dir="ltr">
-	<p dir="ltr"><font face="Tahoma">replace, update<span lang="fa">به روز کردن، 
-	جایگزینی</span> 
-  </font> 
-  <LI dir="ltr">
-	<p dir="ltr"><font face="Tahoma">append, insert <span lang="fa">درج، اضافه 
-	کردن</span></font><LI dir="ltr">
-	<p dir="ltr"><font face="Tahoma"><SMALL>OID</SMALL>, serial value
-    <span lang="fa">مقدار سریال</span></font><LI dir="ltr">
-	<p dir="ltr"><font face="Tahoma">portal, cursor 
-  </font> 
-  <LI dir="ltr">
-	<p dir="ltr"><font face="Tahoma">range variable, table name, table alias 
-	</font> </LI></UL>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">یک لیست عمومی از ترمهای مورد 
-استفاده در پایگاه داده در آدرس&nbsp; </span> <A 
-href="http://hea-www.harvard.edu/MST/simul/software/docs/pkgs/pgsql/glossary/glossary.html">
-http://hea-www.harvard.edu/MST/simul/software/docs/pkgs/pgsql/glossary/glossary.htm</A>
-<span lang="fa">وجود دارد.</span></font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.18>4.18</A>) <span lang="fa"> 
-چرا من خطاي </span><i>&quot;ERROR: Memory exhausted in AllocSetAlloc&quot;</i><span lang="fa"> 
-مي‌گيرم؟</span></font></H4>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">این خطا احتمالاً یا به خاطر 
-تمام شدن حافظه مجازی سیستم شماست و یا اینکه کرنل برای برنامه ها در مورد میزان 
-استفاده از حافظه مجازی محدودیت اعمال کرده است. قبل از اجرای برنامه اصلی یکی از 
-دستورات زیر را اجرا کنید.</span></font></P>
-<div dir="ltr">
-	<PRE><font face="Tahoma">    ulimit -d 262144
-    limit datasize 256m
-</font></PRE></div>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">بسته به نوع شل یکی از این 
-دستورات ممکن است با موفقیت اجرا شود. با اجرای آن دستور محدودیت حافظه مجازی برای 
-برنامه ها برداشته شده و با این کار احتمالاً درخواستی که قبلاً خطا می داده است 
-اجرا خواهد شد.</span></font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.19>4.19</A>) <span lang="fa">از كجا 
-تشخيص دهم كه ويرايش يا نسخه </span>PostgreSQL<span lang="fa">يي كه من استفاده 
-مي‌كنم چيست؟</span></font></H4>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">با اجرای دستور</span>
-<span lang="fa">()</span>SELECT version</font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.20>4.20</A>) <span lang="fa">چرا در 
-حین اجرای عملیات روی </span>large-object<span lang="fa">ها خطای </span>&quot;<I>invalid 
-large obj descriptor</I>&quot;<span lang="fa">به وجود می آید؟</span></font></H4>
-<p align="right" dir="rtl"><font face="Tahoma"><span lang="fa">شما باید قبل از 
-شروع دستوراتی که با </span>large-object<span lang="fa">ها کار می کنند از </span>
-BEGIN<span lang="fa">&nbsp; و بعد از آنها هم یک </span>END<span lang="fa"> 
-بگذارید. در حال حاضر </span>PostgreSQL<span lang="fa"> هندل </span>large-object<span lang="fa">ها 
-را در زمان نهایی شدن تراکنش (</span>commit<span lang="fa">شدن)</span>
-<span lang="fa">می بندد. به همین دلیل اولین تلاش برای انجام هر کاری با هندل منجر 
-به خطای </span><i>invalid large obj descriptor</i><span lang="fa"> خواهد شد.</span>
-<span lang="fa">برای جلوگیری از این خطا حتماً باید از یک تراکنش استفاده کنید. 
-این کار همانطور که قبلاً گفته شد با استفاده از قرار دادن </span>BEGIN<span lang="fa"> 
-و </span>END<span lang="fa"> در ابتدا و انتهای دستورات انجام می شود.</span></font></p>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">اگر این خطا را در حین استفاده 
-از یک درایور </span>ODBC<span lang="fa"> دریافت کردید احتمالاً باید این دستور را 
-اجرا کنید: </span>set </font> <CODE><font face="Tahoma">auto-commit off</font></CODE></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.21>4.21</A>) 
-<span lang="fa">چگونه يك ستون ايجاد كنم كه مقدار زمان جاري را به عنوان مقدار 
-پيش‌فرض داشته باشد؟</span></font></H4>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">از</span> <I>CURRENT_TIMESTAMP
-<span lang="fa">&nbsp;</span></I><span lang="fa">استفاده کنید در مثال زیر نحوه انجام 
-این کار نشان داده شده است:</span></font></P>
-<div dir="ltr">
-	<PRE><CODE><font face="Tahoma">CREATE TABLE test (x int, modtime timestamp DEFAULT CURRENT_TIMESTAMP );
-</font></CODE><font face="Tahoma">
-</font></PRE>
-</div>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.22>4.22</A>) 
-<span lang="fa">چرا &quot;زير درخواستهايي&quot; كه از </span>IN<span lang="fa"> استفاده 
-مي‌كنند كند هستند؟</span></font></H4>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">در نسخه های قبل از 7.4 عمل 
-الحاق زیر درخواست و درخواست اصلی به این صورت انجام می شود که نتایج به دست آمده 
-از زیر درخواست به صورت ترتیبی برای هر ردیف اعمال می شود. اگر زیردرخواست ردیف های 
-کمی را به عنوان خروجی برگرداند و درخواست بیرونی ردیف های زیادی را شامل شود 
-استفاده از </span>IN<span lang="fa"> بهترین روش است در غیر اینصورت بهتر است از
-</span>EXISTS<span lang="fa"> استفاده شود</span></font></P>
-<div dir="ltr">
-	<PRE><font face="Tahoma">    SELECT *
-    FROM tab
-    WHERE col IN (SELECT subcol FROM subtab);
-</font></PRE></div>
-<p dir="rtl"><span lang="fa"><font face="Tahoma">به:</font></span></p>
-<div dir="ltr">
-	<PRE><font face="Tahoma">    SELECT *
-    FROM tab
-    WHERE EXISTS (SELECT subcol FROM subtab WHERE subcol = col);
-</font></PRE></div>
-<p dir="rtl"><font face="Tahoma"><span lang="fa">برای اجرای سریع این درخواست 
-باید برای ستون </span>subcol<span lang="fa"> نمایه ایجاد شده باشد.</span></font></p>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">در نسخه های بعد از 7.4 </span>
-IN<span lang="fa"> برای الحاق از همان تکنیک پیچیده مورد استفاده در دستورات 
-معمولی استفاده می کند و بنابراین استفاده از آن نسبت به </span>EXISTS<span lang="fa"> 
-ارجحیت دارد.</span></font><H4 dir="rtl"><font face="Tahoma"><A name=4.23>4.23</A>) <span lang="fa">
-چگونه مي‌توانم يك الحاق خارجي (</span>outer join<span lang="fa">) انجام دهم؟</span></font></H4>
-<p dir="rtl"><span lang="fa"><font face="Tahoma">برای انجام الحاق خارجی به روش 
-زیر عمل کنید:</font></span></p>
-<div dir="ltr">
-	<PRE><font face="Tahoma">    SELECT *
-    FROM t1 LEFT OUTER JOIN t2 ON (t1.col = t2.col);
-</font></PRE></div>
-<p dir="rtl"><span lang="fa"><font face="Tahoma">یا</font></span></p>
-<div dir="ltr">
-	<PRE><font face="Tahoma">    SELECT *
-    FROM t1 LEFT OUTER JOIN t2 USING (col);
-</font></PRE>
-</div>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">درخواستهای بالا </span>t1.col , 
-t2.col<span lang="fa"> را به هم الحاق می کند و همچنین ردیفهای </span>t1<span lang="fa"> 
-که نظیر آنها در </span>t2<span lang="fa"> نبوده است را نیز برمی گرداند. اگر از
-</span>RIGHT<span lang="fa"> استفاده شود نتیجه بر عکس است. یعنی ردیفهای </span>
-t2<span lang="fa"> که نظیر آنها در </span>t1 <span lang="fa">نباشد را نشان می 
-دهد و اگر از </span>FULL<span lang="fa"> استفاده شود نتیجه هم شامل ردیفهای
-</span>t1<span lang="fa"> است&nbsp; و هم شامل ردیفهای </span>t2<span lang="fa">. 
-استفاده از کلمه </span>OUTER<span lang="fa"> اختیاری است چرا که این کلمه به طور 
-ضمنی دستورهای </span>LEFT, RIGHT, FULL<span lang="fa"> وجود دارد.</span></font></P>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">در نسخه های قبلی پایگاه داده می 
-توانیم الحاق خارجی را به کمک دستورهای </span>UNION, NOT IN<span lang="fa"> شبیه 
-سازی کنیم. این کار در مثال زیر نشان داده شده است:</span><BR></font></P>
-<div dir="ltr">
-	<PRE><font face="Tahoma">    SELECT tab1.col1, tab2.col2
-    FROM tab1, tab2
-    WHERE tab1.col1 = tab2.col1
-    UNION ALL
-    SELECT tab1.col1, NULL
-    FROM tab1
-    WHERE tab1.col1 NOT IN (SELECT tab2.col1 FROM tab2)
-    ORDER BY col1
-</font></PRE>
-</div>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.24>4.24</A>) 
-<span lang="fa">چگونه مي‌توان درخواستهايي از چند پايگاه داده توليد كرد؟</span></font></H4>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">در حال حاضر این کار امکان پذیر 
-نیست. </span>PostgreSQL<span lang="fa"> فقط امکان درخواست از پایگاه داده ای را 
-می دهد که در حال حاضر به آن متصل باشید و نمی توان به طور همزمان از دو پایگاه 
-داده استفاده کرد. البته یک برنامه کاربردی خود می تواند به طور همزمان دو&nbsp; 
-پایگاه داده را مورد استفاده قرار داده و نتایج را با هم ترکیب کند ولی نمی تواند 
-در یک درخواست به هر&nbsp; دو پایگاه داده رجوع کند.</span></font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.25>4.25</A>)  
-<span lang="fa">چگونه خروجي يك تابع مي‌تواند&nbsp; چند رديف يا ستون باشد؟</span></font></H4>
-<P dir="rtl"><span lang="fa"><font face="Tahoma">در نسخه 7.3 خروجی یک تابع می 
-تواند چند ردیف یا چند ستون باشد. برای دیدن&nbsp; اطلاعات بیشتر به سایت زیر 
-مراجعه کنید:</font></span><font face="Tahoma"><A 
-href="http://techdocs.postgresql.org/guides/SetReturningFunctions">http://techdocs.postgresql.org/guides/SetReturningFunctions</A><span lang="fa">
-</span>&nbsp;</font><H4 dir="rtl"><font face="Tahoma"><A name=4.26>4.26</A>) 
-<span lang="fa">در توابع </span>PL/PgSQL<span lang="fa"> چرا نمي‌توان با اطمينان 
-جداول موقت را ايجاد يا حذف كرد؟</span></font></H4>
-<P dir="rtl"><font face="Tahoma">PL/PgSQL<span lang="fa"> محتوای توابع را ذخیره 
-(</span>cache<span lang="fa">) می کند.</span> <span lang="fa">یک اثر بد جانبی 
-این کار آن است که اگر در تابع از یک جدول موقت استفاده شود و بعداً آن جدول حذف و 
-یک جدول جدید به جای آن ایجاد شود، در فراخوانی مجدد&nbsp; آن تابع، محتوای ذخیره 
-شده تابع&nbsp; هنوز به جدول قدیمی اشاره می کند و بنابراین اجرای تابع با اشکال 
-مواجه می شود. راه حل این مشکل آن است که برای جداول موقت از دستور </span>EXECUTE<span lang="fa"> 
-استفاده شود که این کار سبب می شود که درخواست برای هر بار اجرا مجدداً پیمایش و 
-تفسیر شود.</span></font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.27>4.27</A>) 
-<span lang="fa">چه گزينه‌هايي براي تكرار (</span>replication<span lang="fa">)</span>
-<span lang="fa">وجود دارد؟</span> 
-</font> </H4>
-<P dir="rtl"><font face="Tahoma">There are several master/slave replication 
-options available. These allow only the master to make database changes and the 
-slave can only do database reads. The bottom of <A 
-href="http://gborg.postgresql.org/genpage?replication_research">
-http://gborg.PostgreSQL.org/genpage?replication_research</A> 
-lists them. A multi-master replication solution is being worked on at <A 
-href="http://gborg.postgresql.org/project/pgreplication/projdisplay.php">
-http://gborg.PostgreSQL.org/project/pgreplication/projdisplay.php</A>.</font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=4.28>4.28</A>) 
-<span lang="fa">چه گزينه‌هايي براي رمزنگاري وجود دارد؟</span> 
-</font> </H4>
-<UL>
-  <LI dir="rtl">
-	<p dir="rtl"><font face="Tahoma">contrib<I>/pgcrypto </I><span lang="fa">
-    شامل توابع رمزنگاری زیادی است که می توان از آنها در دستورات </span>SQL<span lang="fa"> 
-    استفاده کرد.</span></font><LI dir="rtl">
-	<p dir="rtl"><font face="Tahoma"><span lang="fa">برای رمز کردن ارتباط بین
-    </span>client<span lang="fa"> و </span>server<span lang="fa"> ، پایگاه داده 
-	حتماً گزینه </span>SSL<span lang="fa"> را بر روی پایگاه داده فعال کنیم.</span></font><LI dir="rtl">
-	<p dir="rtl"><font face="Tahoma"><span lang="fa">در نسخه 7.3 به بعد کلمات 
-	عبور کاربران به طور اتوماتیک به صورت رمز شده ذخیره می شود ولی در نسخه های 
-	قبلی باید گزینه </span> 
-  <I>PASSWORD_ENCRYPTION</I> <span lang="fa">&nbsp;در فایل</span><I>postgresql.conf </I>
-    <span lang="fa">فعال کنیم. </span> 
-  </font> 
-  <LI dir="rtl">
-	<p dir="rtl"><span lang="fa"><font face="Tahoma">می توان پایگاههای داده را 
-	روی یک فایل سیستم رمزشده نگاهداری کرد</font></span></LI></UL>
-<HR dir="rtl">
-
-<H2 align=center dir="rtl"><font face="Tahoma">Extending PostgreSQL</font></H2>
-<H4 dir="rtl"><font face="Tahoma"><A name=5.1>5.1</A>)
-<span lang="fa">من يك تابع نوشته‌ام. چگونه آن را در </span>psql<span lang="fa"> 
-اجرا كنم؟ چرا با اجراي آن </span>core dump<span lang="fa"> مي‌گيرم؟</span></font></H4>
-<p dir="rtl"><span lang="fa"><font face="Tahoma">دلایل مختلفی می تواند باعث بروز 
-این مشکل شود. اما قبل از همه تابع خود را به صورت جدا تست کنید.</font></span></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=5.2>5.2</A>) <span lang="fa">چگونه 
-مي‌توانم در توليد نوع‌ها و توابع جديد و جالب براي
-</span>PostgreSQL<span lang="fa">‌ همكاري و مشاركت داشته باشم</span></font><span lang="fa"><font face="Tahoma">؟</font></span></H4>
-<p dir="rtl"><span lang="fa"><font face="Tahoma">کد خود را به گروه پستی </font>
-</span><font face="Tahoma"> <I>pgsql-hackers<span lang="fa">&nbsp; </span></I>
-<span lang="fa">&nbsp;ارسال کنید.</span></font></p>
-<H4 dir="rtl"><font face="Tahoma"><A name=5.3>5.3</A>)&nbsp;
-<span lang="fa">چگونه مي‌توانم يك تابع به زبان </span>C<span lang="fa"> بنويسم 
-كه خروجي آن يك</span> <span lang="fa">‌</span>tuple<span lang="fa"> </span>&nbsp;<span lang="fa">(چند 
-تايي) باشد؟</span></font></H4>
-<P dir="rtl"><font face="Tahoma"><span lang="fa">در نسخه های 7.3 به بعد یک تابع 
-می تواند یک جدول را به عنوان خروجی برگرداند. این ویژگی در توابعی که به زبانهای
-</span>C<span lang="fa"> و </span>PL/PgSQL<span lang="fa"> نوشته می شوند به طور 
-کامل وجود دارد. راهنما برنامه نویسان را مطالعه کنید. یک مثال از نحوه برگرداندن 
-یک جدول به عنوان خروجی در </span><i>contrib/tablefunc</i><span lang="fa"> آمده 
-است.</span></font></P>
-<H4 dir="rtl"><font face="Tahoma"><A name=5.4>5.4</A>) 
-<span lang="fa">من يك فايل منبع را عوض كرده ام چرا در عمليات كامپيل مجدد آن 
-تغيير ديده نمي‌شود؟</span></font></H4>
-<P dir="rtl"><font face="Tahoma">Makefile<span lang="fa"> برای فایلهای </span>
-include<span lang="fa"> شده وابستگیها را به درستی نشان نمی دهد. برای اطمینان از 
-اینکه فایلی که عوض کرده اید حتماً دوباره کامپیل می شود دستور </span>make clean<span lang="fa"> 
-را اجرا کنید. اگر از کامپیلر </span>gcc<span lang="fa"> استفاده می کنید می 
-توانید از گزینه </span>enable-depend--<span lang="fa"> در موقع اجرای برنامه
-</span>configure<span lang="fa"> استفاده کنید این گزینه باعث می شود که وابستگیها 
-به طور اتوماتیک تولید شود.</span></font></P></BODY></HTML>
\ No newline at end of file
diff --git a/doc/src/FAQ/FAQ_french.html b/doc/src/FAQ/FAQ_french.html
deleted file mode 100644
index 12f33422e2..0000000000
--- a/doc/src/FAQ/FAQ_french.html
+++ /dev/null
@@ -1,1466 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-  <HEAD>
-    <META name="generator" content="HTML Tidy, see www.w3.org">
-    <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <TITLE>PostgreSQL FAQ</TITLE>
-  </HEAD>
-
-  <BODY bgcolor="#ffffff" text="#000000" link="#ff0000" vlink="#a00000"
-  alink="#0000ff">
-    <H1>Foire Aux Questions (FAQ) pour PostgreSQL</H1>
-
-    <P>Derni�re mise � jour&nbsp;: vendredi 14 novembre 2004 16:32:47</P>
-
-    <P>Mainteneur actuel&nbsp;: Bruce Momjian (<A href=
-    "mailto:[email protected]">[email protected]</A>)<BR>
-    </P>
-
-    <P>La plus r�cente version de ce document est disponible sur <A
-    href=
-    "http://www.PostgreSQL.org/docs/faqs/FAQ.html">http://www.PostgreSQL.org/docs/faqs/FAQ.html</A>.</P>
-
-    <P>Les questions sp�cifiques � la plateforme sont r�pondues sur <A href=
-    "http://www.PostgreSQL.org/docs/index.html">http://www.PostgreSQL.org/docs/index.html</A>.</P>
-    <HR>
-
-    <H2 align="center">Questions g�n�rales</H2>
-    <A href="#1.1">1.1</A>) Qu'est ce que PostgreSQL&nbsp;? Comment le prononcer&nbsp;?<BR>
-     <A href="#1.2">1.2</A>) Quelle est la licence de PostgreSQL&nbsp;?<BR>
-     <A href="#1.3">1.3</A>) Sous quels environnements Unix PostgreSQL tourne-t-il&nbsp;?<BR>
-     <A href="#1.4">1.4</A>) Sous quels environnements non-Unix PostgreSQL tourne-t-il&nbsp;?<BR>
-     <A href="#1.5">1.5</A>) O� puis-je me procurer PostgreSQL&nbsp;?<BR>
-     <A href="#1.6">1.6</A>) O� puis-je obtenir du support&nbsp;?<BR>
-     <A href="#1.7">1.7</A>) Quelle est la derni�re version&nbsp;?<BR>
-     <A href="#1.8">1.8</A>) Quelle documentation est disponible&nbsp;?<BR>
-     <A href="#1.9">1.9</A>) Comment savoir quels sont les bogues connus ou les fonctionnalit�s manquantes&nbsp;?<BR>
-     <A href="#1.10">1.10</A>) Comment puis-je apprendre le <SMALL>SQL</SMALL>&nbsp;?<BR>
-     <A href="#1.11">1.11</A>) PostgreSQL est-il compatible an 2000&nbsp;?<BR>
-     <A href="#1.12">1.12</A>) Comment puis-je rejoindre l'�quipe de d�veloppement&nbsp;?<BR>
-     <A href="#1.13">1.13</A>) Comment dois-je soumettre un rapport de
-    bogue&nbsp;?<BR>
-     <A href="#1.14">1.14</A>) Comment PostgreSQL se compare-t'il � d'autres
-    <SMALL>SGBD</SMALL>&nbsp;?<BR>
-     <A href="#1.15">1.15</A>) Comment puis-je aider financi�rement PostgreSQL&nbsp;?<BR>
-     
-
-    <H2 align="center">Questions sur le client utilisateur</H2>
-    <A href="#2.1">2.1</A>) Y a-t-il des pilotes <SMALL>ODBC</SMALL> pour
-    PostgreSQL&nbsp;?<BR>
-    <A href="#2.2">2.2</A>) Quels outils sont disponibles pour utiliser
-    PostgreSQL avec des pages Web&nbsp;?<BR>
-    <A href="#2.3">2.3</A>) PostgreSQL a-t-il une interface graphique&nbsp;?<BR>
-    <A href="#2.4">2.4</A>) Quels langages sont disponibles pour
-    communiquer avec PostgreSQL&nbsp;?<BR>
-
-
-    <H2 align="center">Questions administratives</H2>
-    <A href="#3.1">3.1</A>) Comment installer PostgreSQL ailleurs que sous <I>/usr/local/pgsql</I>&nbsp;?<BR>
-    <A href="#3.2">3.2</A>) Quand je lance <I>postmaster</I>, j'obtiens un <I>Bad System Call</I> ou un message <I>core dumped</I>. Pourquoi&nbsp;?<BR>
-    <A href="#3.3">3.3</A>) Quand je lance <I>postmaster</I>, j'obtiens des erreurs <I>IpcMemoryCreate</I>. Pourquoi&nbsp;?<BR>
-    <A href="#3.4">3.4</A>) Quand je lance <I>postmaster</I>, j'obtiens des erreurs <I>IpcSemaphoreCreate</I>. Pourquoi&nbsp;?<BR>
-    <A href="#3.5">3.5</A>) Comment contr�ler les connexions d'autres machines&nbsp;?<BR>
-    <A href="#3.6">3.6</A>) Comment r�gler le moteur de la base de donn�es pour de meilleures performances&nbsp;?<BR>
-    <A href="#3.7">3.7</A>) Quelles fonctionalit�s de d�boguage sont disponibles&nbsp;?<BR>
-    <A href="#3.8">3.8</A>) Pourquoi est-ce que j'obtiens des messages <I>Sorry, too many clients</I> quand je me connecte&nbsp;?<BR>
-    <A href="#3.9">3.9</A>) Que contient le r�pertoire <I>pgsql_tmp</I>&nbsp;?<BR>
-    <A href="#3.10">3.10</A>) Pourquoi ai-je besoin de faire une sauvegarde des bases et de restaurer pour mettre a jour les versions de PostgreSQL&nbsp;?<BR>
-    <A href="#3.11">3.11</A>) Quels mat�riels dois-je utiliser&nbsp;?<BR>
-
-
-    <H2 align="center">Questions fonctionnelles</H2>
-    <A href="#4.1">4.1</A>) Quelle est la diff�rence entre curseur binaire
-    et curseur normal&nbsp;?<BR>
-    <A href="#4.2">4.2</A>) Comment faire un <SMALL>SELECT</SMALL> seulement
-     sur les premi�res lignes d'une requ�te&nbsp;?  Sur une ligne al�atoire&nbsp;?<BR>
-    <A href="#4.3">4.3</A>) Comment obtenir une liste des tables ou
-     d'autres choses que je vois dans <I>psql</I>&nbsp;?<BR>
-     <A href="#4.4">4.4</A>) Comment supprime-t-on une colonne d'une table,
-     ou comment change-t-on son type de donn�es&nbsp;?<BR>
-     <A href="#4.5">4.5</A>) Quelle est la taille maximale pour une ligne,
-     une table et une base de donn�es&nbsp;?<BR>
-     <A href="#4.6">4.6</A>) Combien d'espace disque faut-il pour stocker
-     les donn�es d'un fichier texte typique&nbsp;?<BR>
-     <A href="#4.7">4.7</A>) Comment puis-je savoir quels index, tables,
-     bases de donn�es et utilisateurs sont d�finis&nbsp;?<BR>
-     <A href="#4.8">4.8</A>) Mes requ�tes sont lentes ou ne font pas usage
-     des index. Pourquoi&nbsp;?<BR>
-     <A href="#4.9">4.9</A>) Comment puis-je savoir si l'optimiseur �value
-     mes requ�tes&nbsp;?<BR>
-     <A href="#4.10">4.10</A>) Qu'est-ce qu'un index R-tree&nbsp;?<BR>
-     <A href="#4.11">4.11</A>) Qu'est-ce que l'optimiseur g�n�tique de
-    requ�tes&nbsp;?<BR>
-     <A href="#4.12">4.12</A>) Comment puis-je r�aliser des recherches par des
-    expressions rationnelles ainsi que des recherches non sensibles � la
-    casse&nbsp;? Comment puis-je utiliser un index lors de recherches non
-    sensibles � la casse&nbsp;?<BR>
-     <A href="#4.13">4.13</A>) Comment puis-je d�tecter si un champ est
-    <SMALL>NULL</SMALL> dans une requ�te&nbsp;?<BR>
-     <A href="#4.14">4.14</A>) Quelle sont les diff�rences entre les nombreux
-    types de caract�res&nbsp;?<BR>
-     <A href="#4.15.1">4.15.1</A>) Comment puis-je cr�er un champ s�rie,
-    c'est-�-dire s'incr�mentant automatiquement&nbsp;?<BR>
-     <A href="#4.15.2">4.15.2</A>) Comment puis-je obtenir la valeur d'un
-    <SMALL>SERIAL</SMALL> suite � une insertion&nbsp;?<BR>
-     <A href="#4.15.3">4.15.3</A>) Est-ce que <I>currval()</I> et
-     <I>nextval()</I> n'am�nent pas des probl�mes lorsque plusieurs utilisateurs
-     les lancent en m�me temps&nbsp;?<BR>
-     <A href="#4.15.4">4.15.4</A>) Pourquoi mes num�ros de s�quences ne sont pas
-     r�-utilis�s lors d'une annulation de transaction&nbsp;? Pourquoi
-     existe-t'il des trous dans la num�rotation de ma colonne s�quentielle
-     (SERIAL)&nbsp;?<BR>
-     <A href="#4.16">4.16</A>) Qu'est-ce qu'un <SMALL>OID</SMALL>? Qu'est-ce qu'un <SMALL>TID</SMALL>&nbsp;?<BR>
-     <A href="#4.17">4.17</A>) A quoi correspond certains termes utilis�s avec
-    PostgreSQL&nbsp;?<BR>
-     <A href="#4.18">4.18</A>) Pourquoi ai-je l'erreur <I>ERROR:
-    Memory exhausted in AllocSetAlloc()</I>&nbsp;?<BR>
-     <A href="#4.19">4.19</A>) Comment puis-je conna�tre la version de
-    PostgreSQL que j'utilise&nbsp;?<BR>
-     <A href="#4.20">4.20</A>) Pourquoi ai-je <I>invalid large obj
-    descriptor</I> lors d'op�rations avec des gros objets&nbsp;?<BR>
-     <A href="#4.21">4.21</A>) Comment puis-je cr�er une colonne qui aura par
-    d�faut l'heure actuelle comme valeur&nbsp;?<BR>
-     <A href="#4.22">4.22</A>) Pourquoi mes sous-requ�tes utilisant
-    <CODE><SMALL>IN</SMALL></CODE> sont-elles si lentes&nbsp;?<BR>
-     <A href="#4.23">4.23</A>) Comment puis-je r�aliser une jointure
-    externe&nbsp;?<BR>
-     <A href="#4.24">4.24</A>) Comment puis-je lancer des requ�tes utilisant
-    plusieurs bases de donn�es&nbsp;??<BR>
-     <A href="#4.25">4.25</A>) Comment puis-je renvoyer plusieurs lignes ou
-    colonnes � partir d'une fonction&nbsp;?<BR>
-     <A href="#4.26">4.26</A>) Pourquoi ne puis-je pas cr�er/supprimer des
-    tables temporaires dans les fonctions PL/PgSQL de fa�on stable&nbsp;?<BR>
-     <A href="#4.27">4.27</A>) Quelles options de cryptage sont
-    disponibles&nbsp;?<BR>
-     
-    <H2 align="center">Etendre PostgreSQL</H2>
-    <A href="#5.1">5.1</A>) J'ai �crit une fonction utilisateur. Lorsque je l'ex�cute avec
-    <I>psql</I>, pourquoi cela finit-il avec un "dump core"&nbsp;?<BR>
-     <A href="#5.2">5.2</A>) Comment puis-je contribuer avec de nouveaux types et fonctions
-    pour PostgreSQL&nbsp;?<BR>
-     <A href="#5.3">5.3</A>) Comment puis-je �crire une fonction C pour r�cup�rer une
-    ligne&nbsp;?<BR>
-     <A href="#5.4">5.4</A>) J'ai modifi� un fichier source. Pourquoi la modification
-      n'est-elle pas visible apr�s la recompilation&nbsp;?<BR>
-     
-    <HR>
-
-    <H2 align="center">Questions g�n�rales</H2>
-
-    <H4><A name="1.1">1.1</A>) Qu'est ce que PostgreSQL&nbsp;? Comment
-    le prononcer&nbsp;?</H4>
-
-    <P>PostgreSQL se prononce <I>Post-Gres-Q-L</I>. Un fichier audio est
-    disponible sur <A
-    href="http://www.postgresql.org/postgresql.mp3">http://www.postgresql.org/postgresql.mp3</A>
-    pour ceux souhaitant entendre la prononciation.</P>
-
-    <P>PostgreSQL est une am�lioration du syst�me de gestion de bases
-    de donn�es POSTGRES (et est toujours quelque fois appel� "Postgres"),
-    un prototype de recherche de
-    <SMALL>SGBD</SMALL> de prochaine g�n�ration. PostgreSQL garde le
-    puissant mod�le de donn�es et les types de donn�es riches de
-    POSTGRES, mais remplace le langage de requ�tes PostQuel par un
-    sous-ensemble �tendu de <SMALL>SQL</SMALL>. PostgreSQL est gratuit
-    et les sources complets sont disponibles.</P>
-
-    <P> PostgreSQL est �crit par une �quipe de d�veloppeurs qui sont
-    tous inscrits � la liste de diffusion de d�veloppement de
-    PostgreSQL. Le coordinateur actuel est Marc G. Fournier (<A href=
-    "mailto:[email protected]">[email protected]</A> et voir
-    la section <a href="#1.6">1.6</a> pour contacter les
-    d�veloppeurs). Cette �quipe est responsable de tout le
-    d�veloppement de PostgreSQL. C'est un projet soutenu par une
-    communaut� sans �tre contr�l� par une soci�t�. Pour y contribuer,
-    voir la FAQ des d�veloppeurs sur <A
-    href="http://www.postgresql.org/docs/faqs/FAQ_DEV.html">http://www.postgresql.org/docs/faqs/FAQ_DEV.html</A>.</P>
-
-    <P>Les auteurs de PostgreSQL 1.01 �taient Andrew Yu et Jolly Chen.
-    Beaucoup d'autres personnes ont contribu� au portage, aux tests,
-    au d�boguage et � l'am�lioration du code. Le code de Postgres
-    original, duquel PostgreSQL est d�riv�, �tait le fruit de
-    l'effort de nombreux �tudiants dipl�m�s et non dipl�m�s, et de
-    programmeurs travaillant sous la direction du Professeur Michael
-    Stonebraker � l'universit� de Californie, Berkeley.</P>
-
-    <P>Le nom original du logiciel � Berkeley �tait Postgres. Quand le
-    <SMALL>SQL</SMALL> fut ajout� en 1995, le nom a d� �tre chang� en
-    Postgres95. Fin 1996, le nom fut chang� en PostgreSQL.</P>
-
-    <H4><A name="1.2">1.2</A>) Quelle est la licence de PostgreSQL&nbsp;?</H4>
-
-    <P>PostgreSQL est distribu� sous la licence suivante&nbsp;:</P>
-
-    <P>PostgreSQL Data Base Management System</P>
-
-    <P>Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
-    Portions Copyright (c) 1994-6 Regents of the University of California</P>
-
-    <P>Permission to use, copy, modify, and distribute this software
-    and its documentation for any purpose, without fee, and without a
-    written agreement is hereby granted, provided that the above
-    copyright notice and this paragraph and the following two
-    paragraphs appear in all copies.</P>
-
-    <P>IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY
-    PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
-    DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS
-    SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
-    CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>
-
-    <P>THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
-    SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE
-    UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,
-    SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.</P>
-
-    <P>La licence ci-dessus est la licence BSD, une licence open-source
-    classique.</P>
-
-    <H4><A name="1.3">1.3</A>) Sous quels environnements Unix PostgreSQL tourne-t-il&nbsp;?</H4>
-
-    <P>En g�n�ral, tout environnement compatible Unix moderne devrait
-    pouvoir faire fonctionner PostgreSQL. Les environnements qui ont �t�
-    test�s explicitement sont list�s dans les instructions
-    d'installation.</P>
-
-    <H4><A name="1.4">1.4</A>) Sous quels environnements non Unix PostgreSQL fonctionne-t'il&nbsp;?</H4>
-
-    
-    <p>� partir de la version 8.0, PostgreSQL fonctionne nativement sur les
-    syst�mes d'exploitation Microsoft Windows � base NT comme Win2000, WinXP et Win2003.
-    Un installeur est disponible sur
-    <a href="http://pgfoundry.org/projects/pginstaller">http://pgfoundry.org/projects/pginstaller</a>.</p>
-   
-    <p>Il existe aussi un port sur Novell Netware sur
-    <a href="http://forge.novell.com">http://forge.novell.com</a>.</p>
-
-    <H4><A name="1.5">1.5</A>) O� puis-je me procurer PostgreSQL&nbsp;?</H4>
-
-    <P>Le site FTP anonyme principal de PostgreSQL est <A href=
-    "ftp://ftp.PostgreSQL.org/pub">ftp://ftp.PostgreSQL.org/pub</A>.
-    Pour les sites miroirs, voir notre site web principal.</P>
-
-    <H4><A name="1.6">1.6</A>) O� puis-je obtenir du support&nbsp;?</H4>
-
-    <P>La liste de diffusion principale est <A href=
-    "mailto:[email protected]">[email protected]</A>.
-    Elle est disponible pour discuter de sujets en rapport avec
-    PostgreSQL. Pour s'y inscrire, il faut envoyer un courriel avec
-    les lignes suivantes dans le corps du message (pas dans la ligne
-    du sujet)&nbsp;:</P>
-<PRE>
-    subscribe
-    end
-</PRE>
-
-    <P>� <A href=
-    "mailto:[email protected]">[email protected]</A>.</P>
-
-    <P>Il existe aussi un recueil de la liste. Pour s'y inscrire,
-    envoyez un courriel � <A href=
-    "mailto:[email protected]">[email protected]</A>
-    avec dans le corps&nbsp;:</P>
-<PRE>
-    subscribe
-    end
-</PRE>
-
-    Les recueils sont envoy�s aux membres de cette liste d�s que la
-    liste principale a re�u 30&nbsp;Ko de messages. 
-
-    <P>Une liste de diffusion de bogues est disponible. Pour s'y inscrire,
-    envoyer un courriel � <A href=
-    "mailto:[email protected]">[email protected]</A>
-      avec dans le corps&nbsp;:</P>
-<PRE>
-    subscribe
-    end
-</PRE>
-
-    Une liste de diffusion pour les d�veloppeurs est aussi disponible. Pour s'y
-    inscrire, envoyez un courriel � <A href=
-    "mailto:[email protected]">[email protected]</A>
-    avec dans le corps&nbsp;: 
-<PRE>
-    subscribe
-    end
-</PRE>
-
-    <P>Vous pouvez trouver d'autres listes et informations sur
-    PostgreSQL sur le site web de PostgreSQL&nbsp;:</P>
-
-    <BLOCKQUOTE>
-      <p><A href="http://www.PostgreSQL.org">http://www.PostgreSQL.org</A></p>
-    </BLOCKQUOTE>
-
-    <P>Il y a aussi un canal IRC sur Freenode et EFNet, le canal
-    <I>#PostgreSQL</I>. Vous pouvez utiliser la commande Unix
-    <CODE>irc -c '#PostgreSQL' "$USER" irc.phoenix.net</CODE> ou
-    <CODE>irc -c '#PostgreSQL' "$USER" irc.freenode.net</CODE>.</P>
-
-    <P>Une liste de soci�t�s pouvant fournir un support commercial
-    est disponible sur <A href=
-    "http://techdocs.postgresql.org/companies.php">http://techdocs.postgresql.org/companies.php</A>.</P>
-
-    <H4><A name="1.7">1.7</A>) Quelle est la derni�re version&nbsp;?</H4>
-
-    <P>La derni�re version de PostgreSQL est la version 7.4.5.</P>
-
-    <P>Nous projetons de sortir une version majeure tous les six � huit
-    mois.</P>
-
-    <H4><A name="1.8">1.8</A>) Quelle documentation est disponible&nbsp;?</H4>
-
-    <P>Plusieurs manuels, pages de manuel ainsi que des petits exemples de
-    test sont inclus dans la distribution. Voir le r�pertoire
-    <I>/doc</I>. Vous pouvez aussi acc�der aux manuels en ligne sur <A href=
-    "http://www.PostgreSQL.org/docs">http://www.PostgreSQL.org/docs</A>.</P>
-
-    <P>Deux livres sur PostgreSQL sont disponibles en ligne sur <A href=
-    "http://www.PostgreSQL.org/docs/awbook.html">http://www.PostgreSQL.org/docs/awbook.html</A>
-    et <A href=
-    "http://www.commandprompt.com/ppbook/">http://www.commandprompt.com/ppbook/</A>.
-    Il y a une liste de livres sur PostgreSQL pouvant �tre achet�s sur <A
-    href=
-    "http://techdocs.postgresql.org/techdocs/bookreviews.php">http://techdocs.PostgreSQL.org/techdocs/bookreviews.php</A>.
-    Il y a aussi une collection d'articles techniques sur PostgreSQL sur <A
-    href=
-    "http://techdocs.PostgreSQL.org/">http://techdocs.PostgreSQL.org/</A>.</P>
-
-    <P><I>psql</I> poss�de des commandes \d pratiques montrant des
-    informations sur les types, op�rateurs, fonctions, aggr�gats, etc.</P>
-
-    <P>Notre site web contient encore plus de documentations.</P>
-
-    <H4><A name="1.9">1.9</A>) Comment savoir quels sont les bogues connus ou les fonctionnalit�s manquantes&nbsp;?</H4>
-
-    <P>PostgreSQL supporte un sous-ensemble �tendu de <SMALL>SQL</SMALL>-92.
-    Voir notre liste <A href="http://www.postgresql.org/docs/faqs.TODO.html">TODO</A>
-    pour les bogues connus, les fonctionnalit�s manquantes et les
-    plans pour le futur.</P>
-
-    <H4><A name="1.10">1.10</A>) Comment puis-je apprendre le <SMALL>SQL</SMALL>&nbsp;?</H4>
-
-    <P>Le livre PostgreSQL sur <A href=
-    "http://www.PostgreSQL.org/docs/awbook.html">http://www.PostgreSQL.org/docs/awbook.html</A>
-    enseigne le <SMALL>SQL</SMALL>. Il existe un autre livre PostgreSQL sur <A
-    href=
-    "http://www.commandprompt.com/ppbook/">http://www.commandprompt.com/ppbook.</A>
-    Il existe de bons tutoriels sur <A href=
-    "http://www.intermedia.net/support/sql/sqltut.shtm">http://www.intermedia.net/support/sql/sqltut.shtm,</A>
-    <A href=
-    "http://ourworld.compuserve.com/homepages/graeme_birchall/HTM_COOK.HTM">
-    http://ourworld.compuserve.com/homepages/graeme_birchall/HTM_COOK.HTM</A>
-    et <A href=
-    "http://sqlcourse.com/">http://sqlcourse.com.</A></P>
-
-    <P>Un autre (en anglais uniquement) "Teach Yourself SQL in 21 Days, Second Edition"
-    se trouve sur <A href=
-    "http://members.tripod.com/er4ebus/sql/index.htm">http://members.tripod.com/er4ebus/sql/index.htm</A></P>
-
-    <P>Nombre de nos utilisateurs aiment <I>The Practical SQL Handbook</I>,
-    Bowman, Judith S., et al., Addison-Wesley. D'autres aiment <I>The
-    Complete Reference SQL</I>, Groff et al., McGraw-Hill.</P>
-
-    <H4><A name="1.11">1.11</A>) PostgreSQL est-il compatible an 2000&nbsp;?</H4>
-
-    <P>Oui, nous manipulons facilement les dates apr�s et avant l'an 2000.</P>
-
-    <H4><A name="1.12">1.12</A>) Comment puis-je rejoindre l'�quipe de d�veloppement&nbsp;?</H4>
-
-    <P>Tout d'abord, t�l�chargez les derniers sources et lisez la
-    documentation pour les d�veloppeurs sur notre site web ou bien
-    dans la distribution. Ensuite, inscrivez-vous aux listes de
-    diffusion <I>pgsql-hackers</I> et <I>pgsql-patches</I>. Et pour finir,
-    soumettez des correctifs de grande qualit� sur <i>pgsql-patches</i>.</P>
-
-    <P>Environ une douzaine de personnes ont des droits de modification
-    sur l'archive <SMALL>CVS</SMALL> de PostgreSQL. Ils ont chacun
-    soumis tellement de correctifs de qualit� qu'il �tait devenu
-    impossible aux d�veloppeurs de tenir la cadence et nous avions
-    confiance dans le qualit� des correctifs qu'ils soumettaient.</P>
-
-    <H4><A name="1.13">1.13</A>) Comment dois-je soumettre un rapport de
-    bogue&nbsp;?</H4>
-
-    <P>Merci de visiter la page PostgreSQL BugTool sur <A href=
-    "http://www.PostgreSQL.org/bugs/bugs.php">http://www.PostgreSQL.org/bugs/bugs.php</A>,
-    qui donne des indications sur la fa�on de soumettre un rapport de bogue.</P>
-
-    <P>De m�me, v�rifiez notre site ftp <A href=
-    "ftp://ftp.PostgreSQL.org/pub">ftp://ftp.PostgreSQL.org/pub</A> pour
-    voir s'il existe une version PostgreSQL plus r�cente ou des
-    correctifs.</P>
-
-    <H4><A name="1.14">1.14</A>) Comment PostgreSQL se compare-til �
-      d'autres <SMALL>SGBD</SMALL>&nbsp;?</H4>
-
-    <P>Il y a plusieurs mani�res de mesurer un logiciel&nbsp;: les fonctionnalit�s,
-    les performances, la fiabilit�, le support, et le prix.</P>
-
-    <DL>
-      <DT><B>Fonctionnalit�s</B></DT>
-
-      <DD>PostgreSQL poss�de la plupart des fonctionnalit�s pr�sentes
-      dans les <SMALL>SGBD</SMALL> commerciaux, comme les
-      transactions, les requ�tes imbriqu�es, les d�clencheurs,
-      les vues, l'int�grit� r�f�rentielle par cl�s �trang�res, et le
-      verrouillage sophistiqu�. Nous avons des fonctionnalit�s qu'ils
-      n'ont pas, comme les types d�finis par l'utilisateur,
-      l'h�ritage, les r�gles, et le contr�le de concurrence par
-      multi-versionnage pour r�duire les contentions de verrouillage.<BR>
-      <BR>
-      </DD>
-
-      <DT><B>Performances</B></DT>
-
-      <DD>PostgreSQL a des performances similaires aux autres bases de
-      donn�es commerciales et open source. Il est plus rapide pour
-      certaines op�rations, plus lent pour d'autres. Par rapport �
-      MySQL ou d'autres <SMALL>SGBD</small> plus l�ger, nous sommes
-      plus rapides pour de nombreux utilisateurs, des requ�tes complexes et
-      une charge pour les requ�tes de lecture/�criture. MySQL est plus rapide
-      pour des requ�tes SELECT simples effectu�es par quelques utilisateurs.
-      Bien s�r, MySQL ne poss�de aucune des fonctionnalit�s de la section
-      <I>Fonctionnalit�s</I> ci-dessus. PostgreSQL est construit pour la
-      fiabilit� et les fonctionnalit�s et nous continuons � am�liorer les
-      performances � chaque version. Il y a une page web int�ressante
-      qui compare PostgreSQL � MySQL sur <A
-      href="http://openacs.org/philosophy/why-not-mysql.html">
-      http://openacs.org/philosophy/why-not-mysql.html</A>. De plus, MySQL
-      est une soci�t� qui distribue son produit via l'open source et requiert
-      une licence commerciale pour les logiciels propri�taires, donc pas une
-      communaut� de d�veloppement open source comme PostgreSQL.<BR>
-
-      <BR>
-      </DD>
-
-      <DT><B>Fiabilit�</B></DT>
-
-      <DD>Nous somme conscients qu'un <SMALL>SGBD</SMALL> doit �tre
-      fiable ou bien il est inutile. Nous faisons le maximum pour
-      sortir des versions bien test�es, du code stable ne contenant qu'un
-      minimum de bogues. Chaque version a au moins un mois de tests,
-      et notre historique de versions montre que nous pouvons
-      fournir des versions stables et robustes, pr�tes pour une
-      utilisation en environnement de production. Nous pensons que
-      nous nous comparons favorablement aux autres bases de donn�es
-      dans ce domaine.<BR>
-      <BR>
-      </DD>
-
-      <DT><B>Support</B></DT>
-
-      <DD>Nos listes de diffusion offrent un contact avec un large
-	groupe de d�veloppeurs et d'utilisateurs afin d'aider � la
-	r�solution des probl�mes rencontr�s. Nous ne pouvons garantir
-	un correctif mais les <SMALL>SGBD</SMALL> commerciaux ne le
-	garantissent pas toujours non plus. L'acc�s direct aux
-	d�veloppeurs, � la communaut� d'utilisateurs, aux manuels, et
-	au code source, fait du support pour PostgreSQL un support
-	sup�rieur aux autres <SMALL>SGBD</SMALL>. Un support commercial par
-	incident est disponible pour ceux qui en ont le besoin (voir
-	la <A
-	href="#1.6">section 1.6 de la FAQ</A>).<BR>
-      <BR>
-      </DD>
-
-      <DT><B>Prix</B></DT>
-
-      <DD>Nous sommes gratuits pour tous les usages, commerciaux et
-	non commerciaux. Vous pouvez inclure notre code dans vos
-	produits sans limitation, except�es celles cit�es dans notre
-	licence de type BSD donn�e plus haut.<BR>
-      <BR>
-      </DD>
-    </DL>
-
-    <H4><A name="1.15">1.15</A>) Comment puis-je aider financi�rement
-      PostgreSQL&nbsp;?</H4>
-
-    <P>PostgreSQL poss�de une infrastructure de premi�re classe depuis
-    le d�but en 1996. Ceci gr�ce � Marc Fournier, qui a cr�� et g�r�
-    cette infrastructure des ann�es durant.</P>
-
-    <P>Une infrastructure de qualit� est importante pour un projet
-    open-source. Cela permet d'emp�cher l'�parpillement qui ralentirait
-    beaucoup l'avancement du projet.</P>
-
-    <P>Bien s�r, cette infrastructure n'est pas donn�e. Elle requiert
-    un certain nombre de d�penses mensuelles ou ponctuelles. Si vous
-    ou votre soci�t� peut donner de l'argent pour soutenir cet effort,
-    merci de consulter la page web <A
-    href="http://store.pgsql.com/shopping/">http://store.pgsql.com/shopping/</A>
-    et de faire une donation.</P>
-
-    <P>Bien que la page web mentionne PostgreSQL, Inc, les
-    contributions sont exclusivement utilis�es pour soutenir le
-    projet PostgreSQL et ne soutiennent aucune soci�t� que ce soit. Si
-    vous le pr�f�rez, vous pouvez  aussi envoyer un ch�que � l'adresse
-    de contact.</P>
-    <HR>
-
-    <P>De plus, si vous avez une histoire de succ�s avec PostgreSQL,
-    merci de la soumettre � notre site d'�vang�lisation sur <a
-    href="http://advocacy.postgresql.org">
-    http://advocacy.postgresql.org</a>.</P>
-
-
-
-    <H2 align="center">Questions sur le client utilisateur</H2>
-
-    <H4><A name="2.1">2.1</A>) Existe-t'il des pilotes <SMALL>ODBC</SMALL> pour
-    PostgreSQL&nbsp;?</H4>
-
-    <P>Il y a deux pilotes <SMALL>ODBC</SMALL> disponibles, PsqlODBC
-    et OpenLink <SMALL>ODBC</SMALL>.</P>
-
-    <P>Vous pouvez t�l�charger PsqlOBDC depuis <A href=
-    "http://gborg.postgresql.org/project/psqlodbc/projdisplay.php">
-    http://gborg.postgresql.org/project/psqlodbc/projdisplay.php</A>.</P>
-
-    <P>OpenLink <SMALL>ODBC</SMALL> peut �tre obtenu depuis <A href=
-    "http://www.openlinksw.com/">http://www.openlinksw.com</A>. Il fonctionne
-    avec leur logiciel client <SMALL>ODBC</SMALL> standard, vous aurez
-    donc PostgreSQL <SMALL>ODBC</SMALL> sur toutes les plateformes 
-    client qu'ils supportent (Win, Mac, Unix, VMS).</P>
-
-    <P>Ils vendront probablement ce produit aux gens qui recherchent 
-    une qualit� de support professionnelle mais une version freeware sera
-    toujours disponible. Merci d'envoyer vos questions � <A href=
-    "mailto:[email protected]">[email protected]</A>.</P>
-
-    <H4><A name="2.2">2.2</A>) Quels outils sont disponibles pour utiliser 
-    PostgreSQL avec des pages Web&nbsp;?</H4>
-
-    <P>Une bonne introduction aux pages Web adoss�s � une base de donn�es se
-    trouve � <A href="http://www.webreview.com">http://www.webreview.com</A></P>
-
-    <P>Pour l'int�gration Web, PHP est une excellente interface. Elle se trouve � <A
-    href="http://www.php.net">http://www.php.net</A>.</P>
-
-    <P>Pour les cas complexes, beaucoup utilisent l'interface Perl et CGI.pm ou mod_perl.</P>
-
-    <H4><A name="2.3">2.3</A>) PostgreSQL a-t-il une interface graphique&nbsp;?</H4>
-
-    <P>Oui, il y a plusieurs interfaces graphiques disponibles pour PostgreSQL,
-    dont PgAccess <a href="http://www.pgaccess.org">
-    http://www.pgaccess.org</a>), PgAdmin III (<a
-    href="http://www.pgadmin.org">http://www.pgadmin.org</a>),
-    RHDB Admin (<a
-    href="http://sources.redhat.com/rhdb/">http://sources.redhat.com/rhdb/
-    </a> et Rekall (<a href="http://www.thekompany.com/products/rekall/">
-    http://www.thekompany.com/products/rekall/</a>, propri�taire). Il y a
-    aussi PhpPgAdmin (<a href="http://phppgadmin.sourceforge.net/">
-    http://phppgadmin.sourceforge.net/ </a>), une interface Web pour
-    PostgreSQL.</P>
-
-    <P>Voir <a href="http://techdocs.postgresql.org/guides/GUITools">http://techdocs.postgresql.org/guides/GUITools</a> pour une liste plus d�taill�e.</P>
-
-    <H4><A name="2.4">2.4</A>) Quels langages sont disponibles pour
-    communiquer avec PostgreSQL&nbsp;?</H4>
-
-    <P>La plupart des langages de programmation couramment utilis�s ont
-    une interface pour PostgreSQL. V�rifiez la liste des modules de votre
-    langage.</P>
-
-    <P>Les interfaces ci-dessous sont incluses dans la distribution&nbsp;:</P>
-
-    <UL>
-      <LI>C (libpq)</LI>
-
-      <LI>Embedded C (ecpg)</LI>
-
-      <LI>Java (jdbc)</LI>
-
-      <LI>Python (PyGreSQL)</LI>
-
-      <LI>TCL (libpgtcl)</LI>
-
-    </UL>
-    <P>Interfaces suppl�mentaires disponibles sur
-    <a href="http://gborg.postgresql.org">http://gborg.postgresql.org</A>
-    dans la section <I>Drivers/Interfaces</I> 
-    </P>
-    <HR>
-
-    <H2 align="center">Questions Administratives</H2>
-
-    <H4><A name="3.1">3.1</A>) Comment installer PostgreSQL ailleurs que sous <I>/usr/local/pgsql</I>&nbsp;?</H4>
-
-    <P>Il faut sp�cifier l'option <I>--prefix</I> lors du lancement de <I>configure</I>.</P>
-
-    <H4><A name="3.2">3.2</A>) Quand je lance <I>postmaster</I>, j'obtiens un <I>Bad System Call</I> ou un message <i>core dumped</i> . Pourquoi&nbsp;?</H4>
-
-    <P>Cela peut �tre d� � une vari�t� de probl�mes mais v�rifiez d'abord que
-    vous avez les extensions System V install�es pour votre noyau. PostgreSQL
-    n�cessite le support noyau pour la m�moire partag�e et les s�maphores.</P>
-
-    <H4><A name="3.3">3.3</A>) Quand je lance <I>postmaster</I>, j'obtiens des erreurs <I>IpcMemoryCreate</I>. Pourquoi&nbsp;?</H4>
-
-    <P>Soit vous n'avez pas configur� correctement la m�moire partag�e dans
-    votre noyau, soit vous devez augmenter la m�moire partag�e disponible dans
-    le noyau. Le montant exact dont vous avez besoin d�pend de votre
-    architecture et du nombre de tampons et de processus que vous avez
-    configur� pour <I>postmaster</I>. Pour la plupart des syst�mes avec un
-    nombre par d�faut de tampons et de processus, vous aurez besoin d'un minimum
-    d'environ 1&nbsp;Mo. Voir le chapitre <A href=
-    "http://www.PostgreSQL.org/docs/view.php?version=current&amp;idoc=1&amp;file=kernel-resources.html">Administration
-    du manuel PostgreSQL</A> pour des informations plus d�taill�es sur la m�moire partag�e et les s�maphores.</P>
-
-    <H4><A name="3.4">3.4</A>) Quand je lance <I>postmaster</I>, j'obtiens des erreurs <I>IpcSemaphoreCreate</I>. Pourquoi&nbsp;?</H4>
-
-    <P>Si le message d'erreur est <I>IpcSemaphoreCreate: semget failed (No
-    space left on device)</I> alors votre noyau n'est pas configur� avec
-    suffisamment de s�maphores. PostgreSQL a besoin d'un s�maphore par processus
-    serveur potentiel. Une solution provisoire est de lancer <I>postmaster</I>
-    avec une plus petite limite sur le nombre de processus serveur. Utilisez l'option
-    <I>-N</I> avec un param�tre inf�rieur au choix par d�faut de 32. Une
-    solution permanente est d'augmenter les param�tres 
-    <SMALL>SEMMNS</SMALL> et <SMALL>SEMMNI</SMALL> de votre noyau.</P>
-
-    <P>Des s�maphores inop�rantes peuvent aussi provoquer des plantages pendant de gros acc�s � la base de donn�es.</P>
-
-    <P>Si le message d'erreur est autre chose, vous n'avez peut-�tre pas du tout le support des
-    s�maphores dans votre noyau. Voir le 
-    chapitre <A href=
-    "http://www.PostgreSQL.org/docs/view.php?version=current&amp;idoc=1&amp;file=kernel-resources.html">Administration
-    du manuel PostgreSQL</A> pour des informations plus d�taill�es sur la m�moire partag�e et les s�maphores.</P>
-
-    <H4><A name="3.5">3.5</A>) Comment contr�ler les connexions d'autres machines&nbsp;?</H4>
-
-    <p>Par d�faut, PostgreSQL autorise seulement les connexions de la machine
-    locale en utilisant les sockets de domaine Unix ou les connexions TCP/IP.
-    D'autres machines ne seront pas capables de se connecter sauf si vous modifiez
-    listen_addresses dans postgresql.conf et activez une authentification bas�e
-    sur l'h�te en modifiant le fichier <i>$PGDATA/pg_hba.conf</i> en accord.</p>
-
-    <H4><A name="3.6">3.6</A>) Comment r�gler le moteur de la base de donn�es pour de meilleures performances&nbsp;?</H4>
-
-    <P>Des index acc�l�reront les requ�tes. La commande 
-    <SMALL>EXPLAIN ANALYZE</SMALL> vous permet de voir comment PostgreSQL traite
-    votre requ�te et quels index sont utilis�s.</P>
-
-    <P>Si vous faites beaucoup d'insertions (instruction <SMALL>INSERT</SMALL>),
-    envisagez de les faire en une fois en utilisant la commande <SMALL>COPY</SMALL>. Ceci
-    est plus rapide que des commandes <SMALL>INSERTS</SMALL> individuelles. Deuxi�ment,
-    les requ�tes qui ne sont pas dans des blocs de transaction <SMALL>BEGIN WORK/COMMIT</SMALL>
-    sont consid�r�s comme �tant dans leur propre transaction. Envisagez de faire
-    plusieurs instructions dans un seul bloc de transaction. Ceci r�duira la
-    surcharge apport�e par les transactions. Aussi, envisagez d'abandonner et
-    de recr�er des index lors de grosses modifications de donn�es.</P>
-
-    <P>Il y a plusieurs options d'optimisations. Vous pouvez d�sactiver
-    <I>fsync()</I> en lan�ant <I>postmaster</I> avec l'option <I>-o -F</I>.
-    Ceci emp�chera les <I>fsync()</I>s d'�crire sur disque apr�s toute
-    transaction.</P>
-
-    <P>Vous pouvez utiliser l'option <I>-B</I> de <I>postmaster</I> pour
-    augmenter le nombre de tampons de m�moire partag�e utilis�s par les
-    processus serveurs. Si vous fixez ce param�tre trop haut,
-    <I>postmaster</I> ne se lancera pas car vous avez d�pass� la limite de
-    votre noyau sur la quantit� de m�moire partag�e. Chaque tampon fait 8&nbsp;Ko et
-    le choix par d�faut est de 64 tampons.</P>
-
-    <P>Vous pouvez utiliser l'option serveur <I>-S</I> pour augmenter la
-    quantit� maximale de m�moire utilis�e par les processus serveurs pour des
-    tris temporaires. La valeur de <I>-S</I> est mesur� en kilooctets et le
-    choix par d�faut est de 512 (c'est-�-dire 512&nbsp;Ko).</P>
-
-    <P>Vous pouvez utiliser la commande <SMALL>CLUSTER</SMALL> pour regrouper
-    vos donn�es en tables pour correspondre � un index. Voir la page de manual
-    <SMALL>CLUSTER</SMALL> pour plus de d�tails.</P>
-
-    <H4><A name="3.7">3.7</A>) Quelles fonctionalit�s de d�boguage sont disponibles&nbsp;?</H4>
-
-    <P>PostgreSQL a plusieurs fonctionalit�s qui permettent de recueillir des
-    informations de statut qui peuvent �tre utile pour des intentions de
-    d�boguage.</P>
-
-    <P>D'abord, en lan�ant <I>configure</I> avec l'option --enable-cassert,
-    beaucoup d'<I>assert()</I>s surveillent le serveur et arr�tent le programme 
-    quand quelque chose d'inattendu arrive.</P>
-
-    <P><I>Postmaster</I> et <I>postgres</I> ont tous deux plusieurs options de
-    d�boguage de disponible. D'abord, quand vous lancez <I>postmaster</I>,
-    v�rifiez que vous envoyez les sorties standard et d'erreur dans un fichier
-    de traces comme&nbsp;:</P>
-<PRE>
-    cd /usr/local/pgsql
-    ./bin/postmaster &gt;server.log 2&gt;&amp;1 &amp;
-</PRE>
-
-    <P>Ceci va cr�er un fichier server.log dans le r�pertoire racine de
-    PostgreSQL. Ce fichier contient des informations utiles sur les probl�mes
-    ou erreurs rencontr�s par le serveur. <I>Postmaster</I> dispose d'une
-    option <I>-d</I> qui permet de rapporter des informations encore plus
-    d�taill�es d'�tre rapport�es. L'option <I>-d</I> prend un num�ro qui
-    sp�cifie le niveau de d�boguage. Faites attention au fait que des valeurs
-    �l�v�es de niveau de d�boguage g�nerent des fichiers de traces volumineux.</P>
-
-    <P>Si <I>postmaster</I> ne tourne pas, vous pouvez lancer le serveur
-    <I>postgres</I> de la ligne de commande et taper votre requ�te
-    <SMALL>SQL</SMALL> directement. Ceci est recommand� <B>seulement</B> pour
-    des fonctions de d�boguage. Notez qu'un retour chariot termine la requ�te,
-    pas un point-virgule. Si vous compilez avec les symboles de d�boguage, vous
-    pouvez utiliser un d�bogueur pour voir ce qui se passe. Parce que le serveur
-    n'a pas �t� lanc� par <I>postmaster</I>, il ne tourne pas dans un environnement
-    identique et les probl�mes d'interaction de verrouillage/serveur ne peuvent
-    �tre dupliqu�s.</P>
-
-    <P>Si <I>postmaster</I> est en train de tourner, lancez <I>psql</I> dans
-    une fen�tre puis trouvez le <SMALL>PID</SMALL> du processus <I>postgres</I>
-    utilis� par <I>psql</I>. Utilisez un d�bogueur pour l'attacher au
-    <SMALL>PID</SMALL> <I>postgres</I>. Vous pouvez mettre un point d'arr�t
-    dans le d�bogueur et envoyez des requ�tes de <I>psql</I>. Si vous d�boguez
-    le d�marrage de <I>postgres</I>, vous pouvez mettre PGOPTIONS="-W n", puis
-    lancez <I>psql</I>. Ceci va retarder le d�marrage de <I>n</I> secondes
-    pour que vous puissiez attacher un d�bogueur au processus, fixer des points
-    d'arr�t et continuer la s�quence de d�marrage.</P>
-
-    <P>Le programme <I>postgres</I> a les options <I>-s, -A</I> et <I>-t</I>
-    qui peuvent �tre utile pour des mesures de d�boguage et de performance.</P>
-
-    <P>Vous pouvez compiler avec les options de performance pour voir quelles
-    fonctions prennent du temps d'ex�cution. Les fichiers de gestion du serveur
-    seront d�pos�s dans le r�pertoire <I>pgsql/data/base/nom_db</I>. Les
-    fichiers de gestion clients seront mis dans le r�pertoire actuel du client.
-    Linux requiert une compilation avec <I>-DLINUX_PROFILE</I> pour une
-    meilleure gestion.</P>
-
-    <H4><A name="3.8">3.8</A>) Pourquoi est-ce que j'obtiens des messages <I>Sorry, too many clients</I> quand je me connecte&nbsp;?</H4>
-
-    <P>Vous pouvez augmenter la limite de <I>postmaster</I> sur le nombre de
-    processus serveur concurrents qu'il peut lancer.</P>
-
-    <P>La limite par d�faut est de 32 processus. Vous pouvez l'augmenter en
-    relan�ant <I>postmaster</I> avec une valeur <I>-N</I> appropri�e ou
-    en modifiant <I>postgresql.conf</I>.</P>
-
-    <P>Tenez compte du fait que si vous fixez <I>-N</I> plus grand que 32, vous
-    devez aussi augmenter <I>-B</I> au-dela de sa valeur par d�faut 64&nbsp;;
-    <I>-B</I> doit valoir au moins deux fois <I>-N</I> et probablement plus pour
-    une meilleure performance. Pour de grand nombres de processus serveurs vous
-    aurez probablement aussi augmenter plusieurs parametres de configuration du
-    noyau Unix. Les choses a v�rifier incluent la taille maximale des blocs de
-    m�moire partag�e, <SMALL>SHMMAX</SMALL>&nbsp;; le nombre maximal de
-    s�maphores, <SMALL>SEMMNS</SMALL> et <SMALL>SEMMNI</SMALL>&nbsp;; le
-    nombre maximal de processus, <SMALL>NPROC</SMALL>&nbsp;; le nombre maximal 
-    de processus par utilisateur, <SMALL>MAXUPRC</SMALL>&nbsp;; et le nombre
-    maximal de fichiers ouverts, <SMALL>NFILE</SMALL> et <SMALL>NINODE</SMALL>.
-    La raison pour laquelle PostgreSQL a une limite sur le nombre de processus
-    serveurs autoris�s est pour que votre syst�me ne tombe pas � court de
-    ressources.</P>
-
-    <H4><A name="3.9">3.9</A>) Que contient le r�pertoire <I>pgsql_tmp</I>&nbsp;?</H4>
-
-    <P>Ce r�pertoire contient des fichiers temporaires g�n�r�s par le moteur de
-    requ�te. Par exemple, si un tri doit �tre fait pour satisfaire un
-    <SMALL>ORDER BY</SMALL> et que ce tri requiert plus de place que le param�tre
-    <I>-S</I> du serveur n'autorise, alors des fichiers temporaires seront cr��s
-    pour contenir les donn�es n�cessaires.</P>
-
-    <P>Les fichiers temporaires sont d'habitude effac�s automatiquement mais
-    peuvent rester si un serveur s'arr�te brutalement pendant un tri. Un arr�t
-    et un red�marrage de <I>postmaster</I> effacera les fichiers dans ces
-    r�pertoires.</P>
-
-    <H4><A name="3.10">3.10</A>) Pourquoi est-ce que j'ai besoin de faire une
-    sauvegarde des bases et de restaurer pour mettre a jour les versions de
-    PostgreSQL&nbsp;?</H4>
-
-    <P>L'�quipe PostgreSQL ne fait que des changements mineurs entre des
-    versions mineurs, donc mettre � jour de 7.2 vers 7.2.1 ne n�cessitera pas
-    de sauvegarde et de restauration. Par contre, les sorties majeures
-    (c'est-�-dire de 7.2 vers 7.3) changent souvent le format interne des tables
-    syst�mes et des fichiers de donn�es. Ces modifications sont souvent
-    complexes alors nous ne gardons pas de compatibilit� descendante pour les
-    fichiers de donn�es. Une sauvegarde exportera les donn�es dans un format
-    g�n�rique qui peut ensuite �tre charg� dans le nouveau format interne.</P>
-
-    <P>Dans les sorties o� le format sur disque ne change pas, le script
-    <I>pg_upgrade</I> peut �tre utilis� pour mettre � jour sans
-    sauvegarde/restauration. Les notes de sorties pr�cisent si <I>pg_upgrade</I>
-    est disponible pour la sortie.</P>
-
-    <H4><A name="3.11">3.11</A>) Quels mat�riels dois-je utiliser&nbsp;?</H4>
- 	 
-    <P>Comme le mat�riel PC est compatible en grosse partie, les gens ont
-    tendance � croire que tous les mat�riels PC sont de m�me qualit�. Ce n'est
-    pas le cas. La RAM ECC, le SCSI et les cartes-m�re de qualit� sont plus
-    fiables et ont de meilleurs performances qu'un mat�riel moins co�teux.
-    PostgreSQL fonctionnera sur � peu pr�s tout mat�riel mais si la fiabilit� et
-    la performance sont importantes pour vous, il est rus� de bien consid�rer
-    les options mat�rielles. Nos listes de diffusion peuvent �tre utilis�es pour
-    discuter des options mat�riels.</P>
-
-    <HR>
-
-    <H2 align="center">Questions fonctionnelles</H2>
-
-    <H4><A name="4.1">4.1</A>) Quelle est la diff�rence entre curseur binaire
-    et curseur normal&nbsp;?</H4>
-
-    <P>Voir la page <SMALL>DECLARE</SMALL> du manuel pour une description.</P>
-
-    <H4><A name="4.2">4.2</A>) Comment faire un <SMALL>SELECT</SMALL> seulement
-     sur les premi�res lignes d'une requ�te&nbsp;?  Sur une ligne al�atoire&nbsp;?</H4>
-
-    <P>Voir la page <SMALL>FETCH</SMALL> du manuel ou utiliser
-    <SMALL>SELECT</SMALL> ... <SMALL>LIMIT</SMALL>....</P>
-
-    <P>Il se peut que l'int�gralit� de la requ�te doive �tre �valu�e,
-    m�me si vous voulez seulement les premi�res lignes. Envisagez
-    d'utiliser une requ�te avec une clause <SMALL>ORDER
-    BY</SMALL>. S'il existe un index correspondant � l'<SMALL>ORDER
-    BY</SMALL>, PostgreSQL peut n'�valuer que les premi�res lignes, sinon
-    l'int�gralit� de la requ�te peut �tre �valu�e, jusqu'� g�n�rer les lignes
-    d�sir�es.</P>
-
-    <P>Pour faire un <SMALL>SELECT</SMALL> sur une ligne al�atoire&nbsp;:</P>
-<PRE>
-    SELECT colonne
-    FROM table
-    ORDER BY random()
-    LIMIT 1;
-</PRE>
-
-    <H4><A name="4.3">4.3</A>) Comment obtenir une liste des tables ou
-    d'autres objets que je vois dans <I>psql</I>&nbsp;?</H4>
-
-    <P>Utilisez la commande \dt pour voir les tables dans <I>psql</I>. Pour
-    une liste compl�te de commandes � l'int�rieur de psql, vous pouvez utiliser
-    \?. Autrement, vous pouvez lire le code source de <I>psql</I> dans le fichier
-    <I>pgsql/src/bin/psql/describe.c</I>. Il contient des commandes
-    <SMALL>SQL</SMALL> qui g�n�rent le contenu des commandes anti-slash de
-    psql. Vous pouvez aussi lancer <I>psql</I> avec l'option
-    <I>-E</I>, afin qu'il imprime les requ�tes qu'il utilise pour ex�cuter
-    les commandes que vous lui passez. PostgreSQL fournit aussi une interface
-    d'informations sur le sch�ma compatible avec <I>SQLi</I> que vous pouvez
-    interroger des informations sur la base de donn�es.</P>
-
-    <H4><A name="4.4">4.4</A>) Comment supprime-t-on une colonne d'une table,
-     ou comment change-t-on son type de donn�es&nbsp;?</H4>
-
-    <P>La fonction <SMALL>DROP COLUMN</SMALL> a �t� ajout�e dans la version 7.3
-    avec <SMALL>ALTER TABLE DROP COLUMN</SMALL>.  Pour les versions pr�c�dentes, 
-    vous pouvez faire&nbsp;:</P>
-<PRE>
-    BEGIN;
-    LOCK TABLE ancienne_table;
-    SELECT ...  -- s�lectionnez toutes les colonnes sauf celle � supprimer
-    INTO TABLE nouvelle_table
-    FROM ancienne_table;
-    DROP TABLE ancienne_table;
-    ALTER TABLE nouvelle_table RENAME TO ancienne_table;
-    COMMIT;
-</PRE>
-
-    <P>Pour changer le type de donn�es d'une colonne, faites&nbsp;:</P>
-
-<PRE>
-    BEGIN;
-    ALTER TABLE table ADD COLUMN nouvelle_colonne <i>nouveau_type_de_donnees</i>;
-    UPDATE table SET nouvelle_colonne = CAST(ancienne_colonne AS <i>nouveau_type_de_donnees</i>);
-    ALTER TABLE table DROP COLUMN ancienne_colonne;
-    COMMIT;
-</PRE>
-
-    <P>Apr�s, vous pouvez faire <I>VACUUM FULL tab</I> pour r�cup�rer l'espace
-    disque utilis� par les lignes expir�es.</P>
-    
-    <H4><A name="4.5">4.5</A>) Quelle est la taille maximale pour une ligne,
-    une table, une base de donn�es&nbsp;?</H4>
-
-    <P>Les limites sont&nbsp;:</P>
-<PRE>
-    Taille maximum pour une base de donn�es     illimit�e (il existe des bases de 32&nbsp;To)
-    Taille maximum pour une table               32&nbsp;To
-    Taille maximum pour une ligne               1,6&nbsp;To
-    Taille maximum pour un champ                1&nbsp;Go
-    Nombre maximum de lignes dans une table     illimit�
-    Nombre maximum de colonnes dans une table   250-1600, selon le type de colonnes
-    Nombre maximum d'index sur une table        illimit�
-</PRE>
-
-    <P>Bien s�r, ces valeurs ne sont pas vraiment illimit�e, elles sont limit�es
-    par l'espace disque disponible, ainsi que par l'espace de m�moire et de swap.
-    Les performances peuvent se d�grader si ces valeurs sont inhabituellement
-    grandes.</P>
-
-    <P>La taille maximum des tables (32&nbsp;To) ne n�cessite pas que le syst�me
-    d'exploitation supporte les grands fichiers. Les grandes tables sont stock�es
-    sous forme de fichiers multiples de 1&nbsp;Go, donc les limites de taille du
-    syst�me de fichier ne sont pas importantes.</P>
-
-    <P>La taille maximum des tables et le nombre maximum de colonnes peuvent
-    �tre quadripl�s, si la taille des blocs par d�faut est augment�e � 32&nbsp;Ko.</P>
-
-    <H4><A name="4.6">4.6</A>) Combien d'espace disque faut-il pour stocker
-    les donn�es d'un fichier texte typique&nbsp;?</H4>
-
-    <P>Une base de donn�es PostgreSQL peut utiliser jusqu'� cinq fois
-    l'espace n�cessaire pour stocker les donn�es d'un fichier texte.</P>
-
-    <P>A titre d'exemple, consid�rez un fichier de 100 000 lignes, comportant
-    un entier et une cha�ne de description sur chaque ligne. Supposons que la
-    cha�ne soit longue en moyenne de 20 octets. Le fichier texte serait de 2,8&nbsp;Mo.
-    La taille du fichier d'une base de donn�es PostgreSQL peut �tre
-    estim�e � 6,4&nbsp;Mo&nbsp;:</P>
-<PRE>
-    32 octets: chaque ligne (approximation)
-    24 octets: un champ 'entier' et un champ 'texte'
-   + 4 octets: pointeur vers le tuple sur la page
-   ----------------------------------------
-    60 octets par ligne
-
-   La taille des pages de donn�es dans PostgreSQL est de 8192 octets (8 KO), donc :
-
-   8192 octets par page
-   ----------------------   = 136 lignes par page de base de donn�es (arrondi � l'entier inf�rieur)
-     60 octets par ligne
-
-   100000 lignes de donn�es
-   -------------------------  =  735 pages de base de donn�es (arrondi � l'entier sup�rieur)
-      128 lignes par page
-
-735 pages de base de donn�es * 8192 octets par page  =  6&nbsp;021&nbsp;120&nbsp;octets (6,4&nbsp;Mo)
-</PRE>
-
-    <P>Les index utilisent moins d'espace, mais ils contiennent les donn�es index�es,
-    ils peuvent donc �galement �tre grands.</P>
-
-    <P>Les <SMALL>NULL</SMALL> sont stock�s sous forme de bitmap, aussi
-    utilisent-ils tr�s peu d'espace.</P>
-    
-    <H4><A name="4.7">4.7</A>) Comment puis-je savoir quels index, tables,
-    bases de donn�es et utilisateurs sont d�finis&nbsp;?</H4>
-
-    <P><I>psql</I> dispose de plusieurs commandes commen�ant par un anti-slash
-    pour retrouver ces informations. Utilisez \? pour les conna�tre. Il existe
-    aussi des tables syst�mes, qui commencent par <I>pg_</I> et qui les
-    d�crivent �galement. Aussi, <I>psql -l</I> liste toutes les bases de
-    donn�es.</P>
-
-    <P>Essayez �galement le fichier <I>pgsql/src/tutorial/syscat.source</I>. Il
-    illustre un grand nombre de commandes <SMALL>SELECT</SMALL> n�cessaires pour
-    r�cup�rer l'information des tables syst�me de la base de donn�es.</P>
-
-    <H4><A name="4.8">4.8</A>) Mes requ�tes sont lentes ou ne font pas usage
-    des index. Pourquoi&nbsp;?</H4>
-
-    <P>Les index ne sont pas automatiquement utilis�s par chaque requ�te. Ils
-    sont utilis�s uniquement si la table est plus grande qu'une certaine taille,
-    et si la requ�te s�lectionne seulement un faible pourcentage des lignes de la
-    table. Ceci est d� au fait qu'un acc�s disque al�atoire caus� par un parcours
-    d'index peut �tre plus lent qu'une simple lecture de la table, ou parcours
-    s�quentiel</P>
-
-    <P>Pour d�terminer si un index devrait �tre utilis�, PostgreSQL a besoin
-    des statistiques de la table. Ces statistiques sont collect�es en lan�ant
-    <SMALL>VACUUM ANALYZE</SMALL> ou simplement <SMALL>ANALYZE</SMALL>.
-    Avec les statistiques, l'optimiseur sait combien de lignes se trouvent
-    dans la table et peut mieux d�terminer s'il faut utiliser l'index.
-    Les statistiques sont �galement utiles pour d�terminer l'ordre optimal
-    des op�rations de jointure. La collecte des statistiques devrait �tre
-    effectu�e r�guli�rement lorsque le contenu de la table change.</P>
-
-    <P>Les index ne sont normalement pas utilis�s pour les clauses <SMALL>ORDER BY</SMALL>
-    ou pour les jointures. Un parcours s�quentiel suivi d'un tri explicite est
-    habituellement plus rapide qu'un parcours d'index pour une table importante.
-    Toutefois, <SMALL>LIMIT</SMALL> combin� avec <SMALL>ORDER BY</SMALL>
-    utilisera souvent un index parce que seulement une petite partie de la table est
-    renvoy�e. En fait, bien que MAX() et MIN() n'utilisent pas les index,
-    il est possible de retrouver ces valeurs en utilisant un index avec
-    ORDER BY et LIMIT&nbsp;:</P>
-
-<PRE>
-    SELECT colonne
-    FROM table
-    ORDER BY colonne [ DESC ]
-    LIMIT 1;
-</PRE>
-
-    <P>Si vous pensez que l'optimiseur choisit par erreur un parcours sequentiel,
-    utilisez <CODE>SET enable_seqscan TO 'off'</CODE> et
-    lancez des tests pour voir si le parcours d'index est effectivement plus rapide.</P>
-
-    <P>Lorsque vous utilisez des caract�res joker tels que <SMALL>LIKE</SMALL> ou
-    <I>~</I>, les index peuvent seulement �tre utilis�s dans certaines circonstances&nbsp;:</P>
-    <UL>
-    <LI>Le d�but de la cha�ne de recherche doit �tre ancr� au d�part de la cha�ne, c'est-�-dire
-    <UL>
-    <LI>Les mod�les pour <SMALL>LIKE</SMALL> ne doivent pas commencer par <I>%</I>.</LI>
-    <LI>Les mod�les d'expression r�guli�re pour <I>~</I> doivent commencer par
-    <I>^</I>.</LI>
-    </UL></LI>
-    <LI>La cha�ne de recherche ne peut pas commencer par une classe de caract�res, c'est-�-dire
-    [a-e].</LI>
-    <LI>Les recherches sans casse comme <SMALL>ILIKE</SMALL> et
-    <I>~*</I> n'utilisent pas les index. Utilisez plut�t les index fonctionnels,
-    d�crit dans la section <a href="#4.12">4.12</a>.</LI>
-    <LI>La locale <I>C</I> par d�faut doit �tre utilis�e lors de
-    <i>initdb</i>.</LI>
-    </UL>
-
-    <p>Dans les versions ant�rieures � la 8.0, les indexs ne peuvent souvent
-    pas �tre utilis�s sauf si les types de donn�es correspondent exactement au
-    type de la colonne de l'index. Ceci est particuli�rement vrai pour les
-    index de colonnes de type int2, int8 et numeric.</p>
-    
-    <H4><A name="4.9">4.9</A>) Comment puis-je savoir si l'optimiseur �value
-     mes requ�tes&nbsp;?</H4>
-
-    <P>Voir la page <SMALL>EXPLAIN</SMALL> du manuel.</P>
-
-    <H4><A name="4.10">4.10</A>) Qu'est-ce qu'un index R-tree&nbsp;?</H4>
-
-    <P>Un index R-tree est utilis� pour l'indexation des donn�es spatiales. Un
-    index de hachage ne permet pas les recherches par plage. Un index B-tree peut
-    seulement faire des recherches sur une dimension. Les index R-tree
-    peuvent traiter des donn�es multi-dimensionnelles. Par exemple, si un index
-    R-tree peut �tre construit sur un attribut de type <I>point</I>,
-    le syst�me peut plus efficacement g�rer les requ�tes du type
-    "S�lection de tous les points d'un rectangle".</P>
-
-    <P>L'article de r�f�rence qui d�crit le syst�me R-tree original est&nbsp;:</P>
-
-    <P>Guttman, A. "R-trees: A Dynamic Index Structure for Spatial
-    Searching." Proceedings of the 1984 ACM SIGMOD Int'l Conf on Mgmt
-    of Data, 45-57.</P>
-
-    <P>Vous pouvez �galement trouver ce papier dans le livre de Stonebraker
-    "Readings in Database Systems".</P>
-
-    <P>Les index R-tree int�gr�s peuvent prendre en charge les polyg�nes et les bo�tes.
-    En th�orie, les R-trees peuvent �tre �tendus � un plus grand nombre de dimensions.
-    En pratique, l'extension des R-trees requiert pas mal de travail et nous
-    n'avons pour le moment aucune documentation sur la fa�on de proc�der.</P>
-
-    <H4><A name="4.11">4.11</A>) Qu'est-ce que l'optimiseur g�n�tique de
-    requ�tes&nbsp;?</H4>
-
-    <P>Le module <SMALL>GEQO</SMALL> (acronyme de <i>GEnetic Query
-    Optimizer</i>) acc�l�re l'optimisation des requ�tes lors de jointures de
-    nombreuses tables par un algorithme g�n�tique (GA). Il permet la
-    gestion des grosses requ�tes de jointures en utilisant une recherche non
-    exhaustive.</P>
-
-    <H4><A name="4.12">4.12</A>) Comment puis-je r�aliser des recherches sur des
-    expressions rationnelles ainsi que des recherches non sensibles � la
-    casse&nbsp;? Comment puis-je utiliser un index lors de recherches non
-    sensibles � la casse&nbsp;?</H4>
-
-    <P>L'op�rateur <I>~</I> r�alise des recherches d'expressions rationnelles
-    et <I>~*</I> le fait sans tenir compte de la casse. La variante de
-    <SMALL>LIKE</SMALL> non sensible � la casse est
-    <SMALL>ILIKE</SMALL>.</P>
-
-    <P>Des comparaisons d'�galit� non sensibles � la casse sont habituellement
-    exprim�es de cette fa�on&nbsp;:</P>
-<PRE>
-    SELECT *
-    FROM table
-    WHERE lower(colonne) = 'abc';
-</PRE>
-
-    <P>Ceci n'utilisera pas un index standard. N�anmoins, si vous cr�ez un index
-    fonctionnel, celui-ci sera utilis�&nbsp;:</P>
-<PRE>
-    CREATE INDEX tableindex ON table (lower(colonne));
-</PRE>
-
-    <H4><A name="4.13">4.13</A>) Comment puis-je d�tecter si un champ est
-    <SMALL>NULL</SMALL> dans une requ�te&nbsp;?</H4>
-
-    <P>Il vous suffit de tester la colonne avec <SMALL>IS NULL</SMALL> ou <SMALL>IS
-    NOT NULL</SMALL>.</P>
-
-    <H4><A name="4.14">4.14</A>) Quelle sont les diff�rences entre les nombreux
-    types de caract�res&nbsp;?</H4>
-<PRE>
-Type            Nom interne     Notes
---------------------------------------------------
-VARCHAR(n)      varchar         n sp�cifie la taille maximum, sans remplissage
-CHAR(n)         bpchar          des espaces sont ajout�s pour obtenir la
-                                longueur fixe sp�cifi�e
-TEXT            text            pas de limite sup�rieure pour la taille
-BYTEA           bytea           tableau d'octets (accepte les octets nuls)
-"char"          char            un caract�re
-</PRE>
-
-    <P>Vous verrez le nom interne en examinant les catalogues syst�me et dans
-    quelques messages d'erreur.</P>
-
-    <P>Les quatres premiers types du dessus sont des types "varlena"
-    (c'est-�-dire que les quatre premiers octets correspondent � la taille,
-    suivi des donn�es). Donc, l'espace r�ellement utilis� est l�g�rement plus
-    grand que la taille d�clar�e. N�anmoins, ces types de donn�es sont aussi
-    sujet � la compression ou � un enregistrement en dehors de la table avec
-    <SMALL>TOAST</SMALL>, donc l'espace occup� sur disque pourrait aussi �tre
-    moindre que ce qu'on pourrait attendre.</P>
-
-    <P><SMALL>VARCHAR(n)</SMALL> est bien mieux pour enregistrer des cha�nes de
-    longueurs variables tout en limitant la taille de cette cha�ne.
-    <SMALL>TEXT</SMALL> est utile pour les cha�nes de longueur illimit�e, avec
-    malgr� tout un maximum de 1&nbsp;Go.</P>
-
-    <P><SMALL>CHAR(n)</SMALL> est int�ressant pour stocker des cha�nes de taille
-    identique. <SMALL>CHAR(n)</SMALL> compl�te avec des espaces pour arriver �
-    la taille sp�cifi�e alors que <SMALL>VARCHAR(n)</SMALL> n'enregistre que les
-    caract�res donn�s. <SMALL>BYTEA</SMALL> sert � stocker des donn�es binaires,
-    particuli�rement les donn�es incluant des octets <SMALL>NULL</SMALL>. Tous
-    les types d�crits ici ont des performances similaires.</P>
-
-    <H4><A name="4.15.1">4.15.1</A>) Comment puis-je cr�er un champ s�rie,
-    c'est-�-dire s'incr�mentant automatiquement&nbsp;?</H4>
-
-    <P>PostgreSQL supporte un type de donn�es <SMALL>SERIAL</SMALL>. Il cr�e
-    automatiquement une s�quence. Par exemple,
-    ceci&nbsp;:</P>
-<PRE>
-    CREATE TABLE personne ( 
-        id  SERIAL, 
-        nom TEXT 
-    );
-</PRE>
-
-    est automatiquement traduit en ceci&nbsp;:
-<PRE>
-    CREATE SEQUENCE personne_id_seq;
-    CREATE TABLE personne ( 
-        id  INT4 NOT NULL DEFAULT nextval('personne_id_seq'),
-        nom TEXT 
-    );
-</PRE>
-
-    Voir la page man de <I>create_sequence</I> pour plus d'informations
-    sur les s�quences. Vous pouvez aussi utiliser le champ <I>OID</I> de chaque
-    ligne comme valeur unique. N�anmoins, si vous avez besoin de sauvegarder
-    puis recharger la base de donn�es, vous devrez utiliser l'option
-    <I>-o</I> ou l'option <SMALL>COPY WITH OIDS</SMALL> de
-    <I>pg_dump</I> pour conserver les <SMALL>OID</SMALL>s. 
-
-    <H4><A name="4.15.2">4.15.2</A>) Comment puis-je obtenir la valeur d'un
-    <SMALL>SERIAL</SMALL> suite � une insertion&nbsp;?</H4>
-
-    <P>Une approche pour r�cup�rer la prochaine valeur <SMALL>SERIAL</SMALL> �
-    partir de l'objet s�quence est d'utiliser la fonction <I>nextval()</I>
-    <I>avant</I> l'insertion et de l'ins�rer ensuite explicitement. En utilisant
-    la table d'exemple de la section <A href="#4.15.1">4.15.1</A>, un exemple
-    dans un pseudo-langage ressemblerait � ceci&nbsp;:</P>
-<PRE>
-    nouvelle_id = execute("SELECT nextval('personne_id_seq')");
-    execute("INSERT INTO personne (id, nom) VALUES (nouvelle_id, 'Blaise Pascal')");
-</PRE>
-
-    Vous pourriez ensuite utiliser la nouvelle valeur stock�e dans
-    <CODE>nouvelle_id</CODE> avec d'autres requ�tes (c'est-�-dire en tant que
-    cl� �trang�re de la table <CODE>personne</CODE>). Notez que le nom de la
-    <SMALL>SEQUENCE</SMALL> automatiquement cr��e sera
-    &lt;<I>table</I>&gt;_&lt;<I>colonneserial</I>&gt;_<I>seq</I>, o�
-    <I>table</I> et <I>colonneserial</I> sont les noms respectifs de votre table
-    et de votre colonne <SMALL>SERIAL</SMALL>.
-
-    <P>Autrement, vous pouvez r�cup�rer la valeur <SMALL>SERIAL</SMALL> affect�e
-    avec la fonction <I>currval()</I> <I>apr�s</I> qu'elle ait �t� ins�r�e par
-    d�faut, c'est-�-dire,</P>
-<PRE>
-    execute("INSERT INTO personne (nom) VALUES ('Blaise Pascal')");
-    nouvelle_id = execute("SELECT currval('personne_id_seq')");
-</PRE>
-
-    Enfin, vous pouvez utiliser l'<A href="#4.16"><SMALL>OID</SMALL></A> renvoy�
-    par l'instruction <SMALL>INSERT</SMALL> pour r�cup�rer la valeur par d�faut
-    bien que cela soit l'appoche la moins portable et la valeur de l'OID se
-    r�initialisera aux environs de quatre milliards. En Perl, avec DBI et le
-    module DBD:Pg d'Edmund Mergl, l'ancienne valeur est disponible via
-    <I>$sth-&gt;{pg_oid_status}</I> apr�s un <I>$sth-&gt;execute()</I>.
-
-    <H4><A name="4.15.3">4.15.3</A>) Est-ce que <I>currval()</I> et
-     <I>nextval()</I> n'am�nent pas des probl�mes lorsque plusieurs utilisateurs
-     les lancent en m�me temps&nbsp;?</H4>
-
-    <P>Non. <I>currval()</I> renvoie la valeur actuelle affect�e par votre
-    processus, et non pas par tous les utilisateurs.</P>
-
-    <H4><A name="4.15.4">4.15.4</A>) Pourquoi mes num�ros de s�quences ne sont pas
-     r�-utilis�s lors d'une annulation de transaction&nbsp;? Pourquoi
-     existe-t'il des trous dans la num�rotation de ma colonne s�quentielle
-     (SERIAL)&nbsp;?</H4>
-
-     <P>Pour am�liorer les acc�s concurrents, les valeurs de s�quences sont
-     donn�es aux transactions qui en ont besoin et ne sont pas bloqu�es jusqu'�
-     la fin de la transaction. Ceci cr�e des trous dans le num�rotage pour les
-     transactions annul�es.</P>
-
-    <H4><A name="4.16">4.16</A>) Qu'est-ce qu'un <SMALL>OID</SMALL>&nbsp;?
-    Qu'est-ce qu'un <SMALL>TID</SMALL>&nbsp;?</H4>
-
-    <P>Les <SMALL>OID</SMALL> sont la r�ponse de PostgreSQL aux identifiants de
-    lignes uniques. Chaque ligne cr��e dans PostgreSQL obtient un
-    <SMALL>OID</SMALL> unique. Tous les <SMALL>OID</SMALL> g�n�r�s pendant
-    <I>initdb</I> sont inf�rieurs � 16384 (voir <I>include/access/transam.h</I>).
-    Tous les <SMALL>OID</SMALL> cr��s par un utilisateur sont sup�rieurs ou
-    �gaux � ceci. Par d�faut, tous ces <SMALL>OID</SMALL> sont uniques non
-    seulement dans une table ou une base mais unique � l'int�rieur d'une
-    installation PostgreSQL enti�re.</P>
-
-    <P>PostgreSQL utilise les <SMALL>OID</SMALL> dans ses tables syst�me interne
-    pour lier les lignes entre tables. Ces <SMALL>OID</SMALL> peuvent �tre
-    utilis�s pour identifier des lignes utilisateurs sp�cifiques et utilis�s dans
-    des jointures. Il est recommand� que vous utilisiez le type de colonne
-    <SMALL>OID</SMALL> pour stocker des valeurs <SMALL>OID</SMALL>.
-    Vous pouvez cr�er un index sur le champ <SMALL>OID</SMALL> pour un acc�s
-    plus rapide.</P>
-
-    <P>Les <SMALL>OID</SMALL> sont attribu�s pour toute ligne d'un endroit
-    central qui est utilis� par toutes les bases de donn�es. Si vous voulez
-    changer l'<SMALL>OID</SMALL> en quelque chose d'autre ou si vous voulez
-    faire une copie de la table avec les <SMALL>OID</SMALL> originaux, il
-    n'y a pas de raisons pour ne pas le faire&nbsp;:</P>
-<PRE>
-    CREATE TABLE nouvelle_table (macolonne int);
-    SELECT oid AS ancienne_oid, macolonne INTO table_temporaire FROM ancienne_table;
-    COPY table_temporaire FROM '/tmp/tablepg';
-    COPY nouvelle_table WITH OIDS FROM '/tmp/tablepg';
-    DROP TABLE table_temporaire;
-</PRE>
-
-    <P>Les <SMALL>OID</SMALL> sont stock�s en tant qu'entiers de quatre octets
-    et d�borderont � quatre milliards. Personne n'a jamais rapport� un tel cas
-    et nous avons pr�vu de retirer la limite avant que cela ne se produise.</P>
-
-    <P>Les <SMALL>TID</SMALL>s sont utilis�s pour identifier des lignes
-    physiques sp�cifiques avec des valeurs de bloc et d�calage. Les
-    <SMALL>TID</SMALL> changent apr�s que les lignes aient �t� modifi�s ou
-    recharg�s. Ils sont utilis�s par des entr�es d'index pour pointer vers des
-    lignes physiques.</P>
-
-    <H4><A name="4.17">4.17</A>) A quoi correspond certains termes utilis�s avec
-    PostgreSQL&nbsp;?</H4>
-
-    <P>Une partie du code source et de l'ancienne documentation utilisent des
-    termes dont l'usage est plus commun. Voici quelques exemples&nbsp;:</P>
-
-    <UL>
-      <LI>table, relation, classe</LI>
-      <LI>ligne (row), enregistrement (record), tuple</LI>
-      <LI>colonne (column), champ (field), attribut</LI>
-      <LI>r�cup�re, s�lectionne (select)</LI>
-      <LI>remplace (replace), met � jour (update)</LI>
-      <LI>ajoute (append), ins�re (insert)</LI>
-      <LI><SMALL>OID</SMALL>, valeur s�quentielle (serial value)</LI>
-      <LI>portal, curseur</LI>
-      <LI>range variable, table name, table alias</LI>
-    </UL>
-
-    <P>Une liste des termes g�n�raux pour le domaine des bases de donn�es est
-    disponible sur&nbsp;: <A href=
-    "http://hea-www.harvard.edu/MST/simul/software/docs/pkgs/pgsql/glossary/glossary.html">http://hea-www.harvard.edu/MST/simul/software/docs/pkgs/pgsql/glossary/glossary.html</A></P>
-
-    <H4><A name="4.18">4.18</A>) Pourquoi ai-je l'erreur <I>ERROR:
-    Memory exhausted in AllocSetAlloc()</I>&nbsp;?</H4>
-
-    <P>Vous manquez probablement de m�moire virtuelle sur votre syst�me ou votre
-    noyau a une limite assez basse pour certaines ressources. Essayez ceci avant
-    de lancer <I>postmaster</I>&nbsp;:</P>
-<PRE>
-    ulimit -d 262144
-    limit datasize 256m
-</PRE>
-
-    Suivant votre shell, seul un d'eux pourrait r�ussir mais cela configurera
-    d'une fa�on plus importante la taille du segment de donn�es de votre
-    processus. Cette commande s'applique au processus actuel et � tous les
-    processus lanc� par celui-ci. Si vous avez des probl�mes avec le client
-    <SMALL>SQL</SMALL> parce que le processus serveur renvoie trop de donn�es,
-    essayez �a avant de lancer le client.
-
-    <H4><A name="4.19">4.19</A>) Comment puis-je conna�tre la version de
-    PostgreSQL que j'utilise&nbsp;?</H4>
-
-    <P>A partir de <I>psql</I>, tapez <CODE>SELECT version();</CODE></P>
-
-    <H4><A name="4.20">4.20</A>) Pourquoi ai-je <I>invalid large obj
-    descriptor</I> lors d'op�rations sur des gros objects&nbsp;?</H4>
-
-    <P>Vous avez besoin de placer <CODE>BEGIN WORK</CODE> et <CODE>COMMIT</CODE>
-    autour de chaque utilisateur de gros objets, c'est-�-dire pour entourer
-    <CODE>lo_open</CODE> ... <CODE>lo_close.</CODE></P>
-
-    <P>Actuellement, PostgreSQL force cette r�gle en fermant les gros objets
-    lors de la transaction. Donc, le premier essai d'op�rations sur ces objets,
-    fonctionnant habituellement (au moins la plupart du temps) aura un
-    <I>invalid large obj descriptor</I>. Donc le code, auparavant fonctionnel
-    (au moins la plupart du temps), g�n�rera maintenant un message d'erreur si
-    vous n'utilisez pas de transaction.</P>
-
-    <P>Si vous utilisez une interface client interface comme
-    <SMALL>ODBC</SMALL>, vous aurez peut-�tre besoin de lancer
-    <CODE>auto-commit off.</CODE></P>
-
-    <H4><A name="4.21">4.21</A>) Comment puis-je cr�er une colonne qui aura par
-    d�faut l'heure actuelle comme valeur&nbsp;?</H4>
-
-    <P>Utilisez <I>CURRENT_TIMESTAMP</I>:</P>
-<PRE>
-<CODE>CREATE TABLE test (x int, heuremodif timestamp DEFAULT CURRENT_TIMESTAMP );
-</CODE>
-</PRE>
-
-    <H4><A name="4.22">4.22</A>) Pourquoi mes sous-requ�tes utilisant
-    <CODE><SMALL>IN</SMALL></CODE> sont-elles si lentes&nbsp;?</H4>
-
-    <P>Dans les versions pr�c�dant la 7.4, les sous-requ�tes ont �t� jointes avec
-    des jointures externes en parcourant s�quentiellement le r�sultat de la
-    sous-requ�te pour chaque ligne de la requ�te externe. Si la sous-requ�te
-    renvoit quelques lignes et que la requ�te externe en renvoit plein,
-    <CODE><SMALL>IN</SMALL></CODE> sera plus rapide. Pour acc�l�rer les autres
-    requ�tes, remplacez <CODE>IN</CODE> avec <CODE>EXISTS</CODE>&nbsp;:</P>
-<PRE>    SELECT *
-    FROM table
-    WHERE colonne IN (SELECT souscolonne FROM soustable);
-</PRE>
-    to:
-<PRE>    SELECT *
-    FROM table
-    WHERE EXISTS (SELECT souscolonne FROM soustable WHERE souscolonne = colonne);
-</PRE>
-
-    Pour que ceci soit rapide, <CODE>souscolonne</CODE> doit �tre une colonne
-    index�e.
-
-    <P>A partir de la version 7.4, <CODE>IN</CODE> utilise actuellement les m�mes
-    techniques sophistiqu�es de jointures comme des requ�tes normales et est
-    pr�f�r� � l'utilisation de <CODE>EXISTS</CODE>.</P>
-
-    <H4><A name="4.23">4.23</A>) Comment puis-je r�aliser une jointure
-    externe&nbsp;?</H4>
-
-    <P>PostgreSQL supporte les jointures externes en utilisant la syntaxe SQL
-    standard. Voici deux exemples&nbsp;:</P>
-<PRE>
-    SELECT *
-    FROM t1 LEFT OUTER JOIN t2 ON (t1.col = t2.col);
-</PRE>
-    or 
-<PRE>
-    SELECT *
-    FROM t1 LEFT OUTER JOIN t2 USING (col);
-</PRE>
-
-    <P>Ces requ�tes identiques joignent t1.col � t2.col et renvoient toute
-    colonne non jointe de t1 (celles sans correspondance dans t2). Une jointure
-    droite (<SMALL>RIGHT join</SMALL>) ajoutera les lignes non jointes de t2.
-    Une jointure compl�te (<SMALL>FULL join</SMALL>) renverra les lignes
-    correspondantes ainsi que les lignes non jointes de t1 et t2. Le mot cl�
-    <SMALL>OUTER</SMALL> est optionnelle et assum� dans le cas de jointure
-    <SMALL>LEFT</SMALL>, <SMALL>RIGHT</SMALL> et <SMALL>FULL</SMALL>. Les
-    jointures ordinaires sont appel�es des jointures <SMALL>INNER</SMALL>.</P>
-
-    <P>Lors des pr�c�dentes versions, les jointures externes peuvent �tre
-    simul�es en utilisant <SMALL>UNION</SMALL> et <SMALL>NOT IN</SMALL>. Par
-    exemple, lors d'une jointure de <I>tab1</I> et <I>tab2</I>, la requ�te
-    suivante r�alise une jointure externe, <I>outer</I>, des deux tables&nbsp;:<BR>
-    <BR>
-    </P>
-<PRE>
-    SELECT tab1.col1, tab2.col2
-    FROM tab1, tab2
-    WHERE tab1.col1 = tab2.col1
-    UNION ALL
-    SELECT tab1.col1, NULL
-    FROM tab1
-    WHERE tab1.col1 NOT IN (SELECT tab2.col1 FROM tab2)
-    ORDER BY col1
-</PRE>
-
-    <H4><A name="4.24">4.24</A>) Comment puis-je lancer des requ�tes utilisant
-    plusieurs bases de donn�es&nbsp;?</H4>
-
-    <P>Il n'existe pas de moyens de lancer des requ�tes sur une autre base que
-    la courante. Comme PostgreSQL charge des catalogues syst�mes sp�cifiques �
-    la base de donn�es, sa r�action aux requ�tes inter-base de donn�es est
-    incertaine.</P>
-
-    <P><I>contrib/dblink</I> permet les requ�tes entre bases de donn�es en
-    utilisant des fonctions. Bien s�r un client peut r�aliser des connexions
-    simultan�es � plusieurs bases de donn�es et joindre les r�sultats du c�t�
-    client.</P>
-
-    <H4><A name="4.25">4.25</A>) Comment puis-je renvoyer plusieurs lignes ou
-    colonnes � partir d'une fonction?</H4>
-
-    <P>A partir de la 7.3, vous pouvez facilement renvoyer plusieurs lignes ou
-    colonnes � partir d'une fonction,
-    <a href="http://techdocs.postgresql.org/guides/SetReturningFunctions">
-    http://techdocs.postgresql.org/guides/SetReturningFunctions</a>.</P>
-
-    <H4><A name="4.26">4.26</A>) Pourquoi ne puis-je pas cr�er/supprimer des
-    tables temporaires dans les fonctions PL/PgSQL de fa�on stable&nbsp;?</H4>
-    <P>PL/PgSQL cache le contenu des fonctions et un effet de bord malheureux est
-    que si une fonction PL/PgSQL acc�de � une table temporaire, que cette table
-    est ensuite supprim�e et recr��e, et que la fonction est appel�e de nouveau,
-    la fonction �chouera car le contenu de la fonction cach�e pointera toujours
-    vers l'ancienne table temporaire. La solution revient � utiliser
-    <SMALL>EXECUTE</SMALL> pour l'acc�s aux tables temporaires avec PL/PgSQL.
-    Ceci obligera l'analyse de la requ�te � chaque fois.</P>
-
-    <H4><A name="4.27">4.27</A>) Quelles options de cryptage sont
-    disponibles&nbsp;?
-    </H4>
-    <UL>
-    <LI><I>contrib/pgcrypto</I> contient de nombreuses fonctions de cryptage, �
-    utiliser dans des requ�tes <SMALL>SQL</SMALL>.</LI>
-    <LI>Pour crypter une transmission entre le client et le serveur, le serveur
-    doit avoir positionn� l'option <I>ssl</I> � <I>true</I> dans <I>postgresql.conf,
-    </I> et un enregistrement applicable <I>host</I> ou <I>hostssl</I> doit
-    exister dans <I>pg_hba.conf</I>, et le <I>sslmode</I> du client ne doit pas
-    �tre <I>d�sactiv�e</I>. Notez qu'il est aussi possible d'utiliser un
-    transport crypt� d'une troisi�me partie, tel que stunnel ou ssh, plut�t que
-    les connexions SSL natives de PostgreSQL.</LI>
-    <LI>Les mots de passe des utilisateurs sont automatiquement crypt�s depuis
-    la version 7.3. Pour les versions pr�c�dentes, vous devez activer l'option
-    <I>PASSWORD_ENCRYPTION</I> dans <I>postgresql.conf</I>.</LI>
-    <LI>Le serveur peut fonctionner avec un syst�me de fichiers crypt�s.</LI>
-    </UL>
-
-    <HR>
-
-    <H2 align="center">Etendre PostgreSQL</H2>
-
-    <H4><A name="5.1">5.1</A>) J'ai �crit une fonction utilisateur. Lorsque je l'ex�cute avec
-        <I>psql</I>, pourquoi cela finit-il avec un <I>dump core</I>&nbsp;?</H4>
-
-    <P>Il peut y avoir plusieurs raisons. Essayez tout d'abord votre fonction utilisateur
-    dans un programme de test.</P>
-
-    <H4><A name="5.2">5.2</A>) Comment puis-je ajouter de bons nouveaux
-    types ou fonctions � PostgreSQL&nbsp;?</H4>
-
-    <P>Envoyez vos extensions � la liste de diffusion <I>pgsql-hackers</I>,
-    elles atterriront �ventuellement dans le sous-r�pertoire <I>contrib/</I>.</P>
-
-    <H4><A name="5.3">5.3</A>) Comment faire pour �crire une fonction C
-    qui renvoie un tuple&nbsp;?</H4>
-
-    <P>Dans les versions de PostgreSQL � partir de 7.3, les fonctions qui
-    renvoient une table sont totalement support�es en C, PL/PgSQL, et SQL. Voir
-    le Guide du Programmeur pour plus d'information. Un exemple de fonction
-    renvoyant une table d�finie en C se trouve �
-    <I>contrib/tablefunc</I>.</P>
-
-    <H4><A name="5.4">5.4</A>) J'ai modifi� un fichier source. Pourquoi
-    ma recompilation ne voit-elle pas les modifications&nbsp;?</H4>
-
-    <P>Les <I>Makefiles</I> n'ont pas les d�pendances ad�quates pour les 
-    fichiers d'en-t�te. Il vous faut faire <I>make clean</I> puis un autre
-    <I>make</I>. Si vous utilisez <SMALL>GCC</SMALL>, vous pouvez utiliser
-    l'option <I>--enable-depend</I> de <I>configure</I> pour que le
-    compilateur calcule les d�pendances automatiquement.</P>
-  </BODY>
-</HTML>
-
diff --git a/doc/src/FAQ/FAQ_german.html b/doc/src/FAQ/FAQ_german.html
deleted file mode 100644
index bd3f868956..0000000000
--- a/doc/src/FAQ/FAQ_german.html
+++ /dev/null
@@ -1,1067 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PostgreSQL FAQ</title>
-</head>
-<body bgcolor="#FFFFFF" text="#000000" link="#FF0000" vlink="#A00000" alink="#0000FF">
-  
-    <h1>Häufig gestellte Fragen (FAQ) zu PostgreSQL</h1>
-
-    <p>Current maintainer:	Bruce Momjian (<a href="mailto:[email protected]">[email protected]</a>).</p>
-
-    <p>Deutsche Übersetzung von Ian Barwick (<a href="mailto:[email protected]">[email protected]</a>).</p>
-
-    <p>Letzte Aktualisierung der deutschen Übersetzung: Fr., den 19.10.2007, 17:00 MEZ</p>
-
-    <p>Die aktuellste Version dieses Dokuments liegt auf der PostgreSQL-Website:</p>
-    <ul>
-      <li><a href="http://www.postgresql.org/docs/faqs.FAQ.html">http://www.postgresql.org/docs/faqs.FAQ.html</a> (engl.)</li>
-      <li><a href="http://www.postgresql.org/docs/faqs.FAQ_german.html">http://www.postgresql.org/docs/faqs.FAQ_german.html</a> (dt.)</li>
-    </ul>
-    <p>Übersetzungen dieses Dokuments in anderen Sprachen sowie plattform-
-    spezifische FAQs können unter
-    <a href="http://www.postgresql.org/docs/faq/">http://www.postgresql.org/docs/faq/</a>
-    eingesehen werden.</p>
-
-<hr />
-
-<h2 align="center">Allgemeine Fragen</h2>
-
-<a href="#1.1">1.1</a>) Was ist PostgreSQL? Wie wird es ausgesprochen?<br />
-<a href="#1.2">1.2</a>) Wer kontrolliert PostgreSQL?<br />
-<a href="#1.3">1.3</a>) Welchem Copyright unterliegt PostgreSQL?<br />
-<a href="#1.4">1.4</a>) Auf welchen Plattformen läuft PostgreSQL?<br />
-<a href="#1.5">1.5</a>) Woher bekomme ich PostgreSQL?<br />
-<a href="#1.6">1.6</a>) Was ist die neueste Version von PostgreSQL?<br />
-<a href="#1.7">1.7</a>) Wo bekomme ich Support für PostgreSQL?<br />
-<a href="#1.8">1.8</a>) Wie kann ich einen Fehlerbericht abgeben?<br />
-<a href="#1.9">1.9</a>) Wie erfahre ich von bekannten Bugs oder fehlenden Features?<br />
-<a href="#1.10">1.10</a>) Welche Dokumentation ist für PostgreSQL verfügbar?<br />
-<a href="#1.11">1.11</a>) Wie kann ich SQL lernen?<br />
-<a href="#1.12">1.12</a>) Wie kann ich im Entwicklerteam mitarbeiten?<br />
-<a href="#1.13">1.13</a>) Wie läuft PostgreSQL im Vergleich zu anderen Datenbanksystemen?<br />
-<a href="#1.14">1.14</a>) Kommt PostgreSQL mit den Anpassungen der Sommerzeit in verschiedenen Ländern klar?<br />
-
-<h2 align="center">Fragen zu Benutzerprogrammen</h2>
-
-<a href="#2.1">2.1</a>) Welche Schnittstellen gibt es für PostgreSQL?<br />
-
-<a href="#2.2">2.2</a>) Wie kann man PostgreSQL mit einer Website nutzen?<br />
-<a href="#2.3">2.3</a>) Hat PostgreSQL eine grafische Benutzerschnittstelle?<br />
-
-<h2 align="center">Administrative Fragen</h2>
-
-<a href="#3.1">3.1</a>) Wie installiere ich PostgreSQL woanders als in /usr/local/pgsql?<br />
-<a href="#3.2">3.2</a>) Wie regle ich Zugriffe von anderen Rechnern?<br />
-<a href="#3.3">3.3</a>) Wie kann ich eine bessere Performanz erreichen?<br />
-<a href="#3.4">3.4</a>) Welche Debugging-Funktionen sind für PostgreSQL verfügbar?<br />
-<a href="#3.5">3.5</a>) Ich bekomme die Meldung "<em>Sorry, too many clients</em>", wenn ich eine Verbindung aufzubauen versuche. Warum?<br />
-<a href="#3.6">3.6</a>) Wie wird PostgreSQL aktualisiert?<br />
-<a href="#3.7">3.7</a>) Welche Hardware eignet sich für den Betrieb mit PostgreSQL?<br />
-
-<h2 align="center">Fragen zum Betrieb</h2>
-
-<a href="#4.1">4.1</a>) Wie wähle ich per <small>SELECT</small>-Anweisung nur die ersten paar
-     Zeilen bzw. eine beliebige Zeile in einer Abfrage aus?<br />
-<a href="#4.2">4.2</a>) Wie finde ich heraus, welche Tabellen, Indexe, Datenbanken oder 
-    Benutzer in der Datenbank definiert sind? Wie bekomme ich die von <em>psql</em> verwendeten
-    Abfragen?<br />
-<a href="#4.3">4.3</a>) Wie ändere ich den Datentyp einer Spalte?<br />
-<a href="#4.4">4.4</a>) Was ist die Maximalgröße für eine Zeile, eine Tabelle, eine Datenbank?<br />
-<a href="#4.5">4.5</a>) Wieviel Plattenplatz wird benötigt, um die Daten aus einer typischen
-    Textdatei abzuspeichern?<br />
-<a href="#4.6">4.6</a>) Meine Abfragen sind langsam oder benutzen die Indexe nicht. Warum?<br />
-<a href="#4.7">4.7</a>) Auf welche Weise kann ich sehen, wie der Abfrage-Optimierer meine
-    Abfrage auswertet?<br />
-<a href="#4.8">4.8</a>) Wie verfahre ich bei der Suche mit regulären Ausdrücken und bei einer
-    Suche, bei der Groß- und Kleinschreibweisen ignoriert werden? Wie verwende
-    ich einen Index bei solchen Suchabfragen?<br />
-<a href="#4.9">4.9</a>) Wie ermittle ich in einer Abfrage, ob ein Feld NULL ist?<br />
-<a href="#4.10">4.10</a>) Was ist der Unterschied zwischen den verschiedenen <small>CHAR</small>-Typen?<br />
-
-<a href="#4.11.1">4.11.1</a>) Wie erzeuge ich ein serielles Feld mit automatischer Erhöhung des Wertes?<br />
-<a href="#4.11.2">4.11.2</a>) Wie bekomme ich den Wert einer SERIAL-Sequenz?<br />
-<a href="#4.11.3">4.11.3</a>) Führt currval() zu einer Race-Condition mit anderen Nutzern?<br />
-<a href="#4.11.4">4.11.4</a>) Warum werden die Sequenzwerte nach einem Transaktionsabbruch nicht
-     zurückgesetzt? Warum gibt es Lücken in der Nummerierung meiner
-     Sequenz-/<small>SERIAL</small>-Spalte?<br />
-<a href="#4.12">4.12</a>) Was ist ein <small>OID</small>? Was ist ein <small>CTID</small>?<br />
-<a href="#4.13">4.13</a>) Wieso bekomme ich den Fehler: "<em>FATAL: Memory exhausted in AllocSetAlloc()</em>"?<br />
-<a href="#4.14">4.14</a>) Wie kann ich feststellen, welche PostgreSQL-Version bei mir läuft?<br />
-<a href="#4.15">4.15</a>) Wie kann ich eine Spalte erstellen, deren Default-Wert immer
-    die aktuelle Uhrzeit enthalten soll?<br />
-<a href="#4.16">4.16</a>) Wie führe ich eine <small>OUTER JOIN</small> durch?<br />
-<a href="#4.17">4.17</a>) Wie kann ich Abfragen über mehrere Datenbanken hinweg ausführen?<br />
-<a href="#4.18">4.18</a>) Wie kann ich mehrere Zeilen bzw. Spalten von einer Funktion
-    zurückgeben lassen?<br />
-<a href="#4.19">4.19</a>) Warum bekomme ich eine Fehlermeldung wie <br />
-    "relation with OID ##### does not exist" wenn ich temporäre Tabellen in<br />
-    PL/PgSQL-Funktionen benutze?<br />
-<a href="#4.20">4.20</a>) Welche Replikationslösungen gibt es?<br />
-<a href="#4.21">4.21</a>) Warum werden die Tabellen- und Spaltennamen in meiner
-    Abfrage nicht erkannt? Warum werden Großbuchstaben umgewandelt?<br />
-
-<hr />
-
-    <h2 align="center">Allgemeine Fragen</h2>
-    <h3><a name="1.1">1.1</a>)	Was ist PostgreSQL? Wie wird es ausgesprochen?</h3>
-    <p>Die (englische) Aussprache ist "Post-Gres-Q-L". Im allgemeinen
-    Sprachgebrauch hat sich die Kurzform "Postgres" auch durchgesetzt.
-    (Für diejenigen, die es interessiert: eine MP3-Datei mit der amerikanischen
-    Aussprache befindet sich hier:
-    <a href="http://www.postgresql.org/files/postgresql.mp3">http://www.postgresql.org/files/postgresql.mp3</a>
-    </p>
-
-    <p>PostgreSQL ist ein objektrelationales Datenbanksystem, das die
-    Vorzüge von kommerziellen Datenbanksystemen mit zukunftsweisenden
-    Innovationen kombiniert. PostgreSQL ist freie Software und dessen
-    kompletter Quellcode ist öffentlich verfügbar.</p>
-
-    <p>Die PostgreSQL-Entwicklung wird von einem Team von meist freiwilligen
-    Entwicklern durchgeführt.
-    Dieses Team ist für die Gesamtentwicklung von PostgreSQL
-    verantwortlich. Es handelt sich um ein Gemeinschaftsprojekt, das nicht
-    von einer bestimmten Firma kontrolliert wird. Lesen Sie die Entwickler-FAQ:
-    <a href="http://www.postgresql.org/docs/faqs.FAQ_DEV.html">http://www.postgresql.org/docs/faqs.FAQ_DEV.html</a>
-    wenn Sie an einer Mitarbeit interessiert sind.</p>
-
-
-    <h3><a name="1.2">1.2</a>) Wer kontrolliert PostgreSQL?</h3>
-
-    <p>Falls Sie nach dem Namen eines etwaigen Inhabers bzw. nach einem
-    allmächtigen Zentralkommittee suchen - sparen Sie sich die Mühe, sowas
-    existiert  gar nicht. Es gibt zwar das "Core Committee" sowie Entwickler,
-    die CVS-Schreibberechtigung haben, jedoch haben diese Gruppen eher nur eine
-    administrative Rolle. Das Projekt wird durch die Community gesteuert, die 
-    aus den Entwicklern sowie natürlich auch den Nutzern besteht - jeder
-    kann daran teilnehmen. (Lesen Sie die Entwickler-FAQ:
-    <a href="http://www.postgresql.org/docs/faqs.FAQ_DEV.html">http://www.postgresql.org/docs/faqs.FAQ_DEV.html</a>
-    wenn Sie an der PostgreSQL-Entwicklung teilnehmen möchten).</p>
-
-    <h3><a name="1.3">1.3</a>) Welchem Copyright unterliegt PostgreSQL?</h3>
-
-    <p>PostgreSQL wird unter der klassischen BSD-Lizenz herausgegeben. Im Grunde
-    genommen erlaubt diese den Nutzern, beliebig mit dem Code umzugehen, 
-    auch der Weiterverkauf von Binärversionen ohne Quellcode ist erlaubt.
-    Die einzige Einschränkung besteht darin, dass PostgreSQL auf keinen Fall
-    für etwaige Probleme mit der Software haftet. Außerdem muß der Copyright-
-    Text in allen Kopien der Software enthalten sein. Dies ist der Originaltext
-    der BSD-Lizenz:</p>
-
-    <p>PostgreSQL Data Base Management System</p>
-
-    <P>Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
-    Portions Copyright (c) 1994-6 Regents of the University of California</P>
-
-    <p>Permission to use, copy, modify, and distribute this software
-    and its documentation for any purpose, without fee, and without a
-    written agreement is hereby granted, provided that the above
-    copyright notice and this paragraph and the following two
-    paragraphs appear in all copies.</P>
-
-    <p>IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY
-    PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
-    DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS
-    SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
-    CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>
-
-    <p>THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
-    SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE
-    UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,
-    SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.</P>
-
-    <p>Es gilt die Copyright-Klausel im Original!</p>
-
-    <h3><a name="1.4">1.4</a>) Auf welchen Plattformen läuft PostgreSQL?</h3>
-
-    <p>Normalerweise kann PostgreSQL auf jeder modernen UNIX-kompatiblen
-    Plattform eingesetzt werden. Diejenigen Plattformen, die bei der
-    jeweiligen Versionsfreigabe getestet wurden, sind in den
-    Installationsanleitungen aufgelistet.</p>
-
-    <p>PostgreSQL läuft auch auf Microsoft NT-basierten Betriebssystemen
-    wie Windows 2000 SP4, XP und Server 2003. Ein vorgefertigtes Installationspaket
-    kann von <a href="http://pgfoundry.org/projects/pginstaller">http://pgfoundry.org/projects/pginstaller</a> heruntergeladen werden.
-    DOS-basierte Windows-Versionen (Win95, Win98, WinMe) können PostgreSQL nur mit
-    Hilfe der Cygwin-Umgebung ausführen.</p>
-
-    <p>Eine Portierung für Novell Netware 6 gibt es unter <a href="http://forge.novell.com">http://forge.novell.com</a> sowie eine OS/2 (eComStation) version unter
-    <a href="http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&amp;button=Search&amp;key=postgreSQL&amp;stype=all&amp;sort=type&amp;dir=%2F">http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&button=Search&key=postgreSQL&stype=all&sort=type&dir=%2F</a>.</p>
-
-    <h3><a name="1.5">1.5</a>) Woher bekomme ich PostgreSQL?</h3>
-
-    <p>Per Web-Browser hier:  <a href="http://www.postgresql.org/ftp/">http://www.postgresql.org/ftp/</a>
-    und per FTP hier: <a href="ftp://ftp.postgresql.org/pub/">ftp://ftp.postgresql.org/pub/</a>.</p>
-
-    <h3><a name="1.6">1.6</a>) Was ist die neueste Version von PostgreSQL?</h3>
-
-    <p>Die neueste Version von PostgreSQL ist 8.2.5.</p>
-
-    <p>Die Freigabe einer neuen Hauptversion erfolgt in der Regel jährlich, kleinere
-    Korrekturversionen alle paar Monaten.</p>
-
-
-    <h3><a name="1.7">1.7</a>) Wo bekomme ich Support für PostgreSQL?</h3>
-
-    <p>Die PostgreSQL-Community bietet Unterstützung per Mailing-Liste. Die Web-Seite
-    <a href="http://www.postgresql.org/community/lists/">http://www.postgresql.org/community/lists/</a> bietet einen Überblick.
-    Die Listen <i>general</i> und <i>bugs</i> bieten einen guten Einstieg.</p>
-
-    <p>Eine deutschsprachige Mailing-Liste gibt es hier:
-    <a href="http://archives.postgresql.org/pgsql-de-allgemein/">http://archives.postgresql.org/pgsql-de-allgemein/</a>.</p>
-
-    <p>Der wichtigsten IRC-Channel ist <em>#postgresql</em> auf Freenode
-    (<em>irc.freenode.net</em>). Unter UNIX/Linux können Sie mit z.B.
-    <small>irc -c '#postgresql' "$USER" irc.freenode.net.</small>
-    daran teilnehmen. Auf Freenode gibt es einen spanischsprachigen Channel 
-    <em>#postgresql-es</em>, einen französischen, <em>#postgresqlfr</em> sowie einen brasilianischen, <em>#postgresql-br</em> .
-    Es gibt außerdem einen PostgreSQL-Channel bei EFNet.</p>
-
-    <p>Eine Liste von Unternehmen, die Support für PostgreSQL auf kommerzieller
-    Basis leisten, kann unter
-      <a href="http://www.postgresql.org/support/professional_support">http://www.postgresql.org/support/professional_support</a>
-    eingesehen werden.</p>
-
-
-    <h3><a name="1.8">1.8</a>) Wie kann ich einen Fehlerbericht abgeben?</h3>
-
-    <p>Nutzen Sie das Formular unter <a href="http://www.postgresql.org/support/submitbug">http://www.postgresql.org/support/submitbug</a>.
-    Schauen Sie aber vorher unter <a href="ftp://ftp.postgresql.org/pub/">ftp://ftp.postgresql.org/pub/</a> nach, 
-    ob es mittlerweile eine neuere PostgreSQL-Version gibt, in der der Fehler behoben wurde.</p>
-
-    <p>Bugs, die über das Formular bzw. eine der Mailing-Listen bekanntgegeben wurden,
-    erhalten typischerweise einer der folgenden Reaktionen:</p>
-
-    <ul>
-    <li>es ist kein Bug, der Grund wird benannt</li>
-    <li>es ist ein bereits bekannter Bug, der bereits auf der
-    <a href="http://www.postgresql.org/docs/faqs.TODO.html">TODO</a>-Liste aufgenommen wurde</li>
-    <li>der Bug wurde in der aktuellen Version behoben</li>
-
-    <li>der Bug wurde bereits behoben, befindet sich aber noch nicht in
-    einer offiziell veröffentlichten Version</li>
-    <li>es wird um eingehendere Informationen gebeten, z.B.:
-        <ul>
-	<li>Betriebssystem</li>
-	<li>PostgreSQL-Version</li>
-	<li>reproduzierbarer Fallbeispiel</li>
-	<li>Debugging-Information</li>
-	<li>Debugger-Backtrace-Ausgabe</li>
-	</ul>
-    </li>
-    <li>der Bug ist neu. Folgendes könnte passieren:
-        <ul>
-	<li>ein Patch wird erstellt und in der nächsten Version 
-        eingebaut;</li>
-	<li>oder der Bug kann nicht sofort behoben werden und wird auf die
-	<a href="http://www.postgresql.org/docs/faqs.TODO.html">TODO</a>-Liste gesetzt</li>
-	</ul>
-    </li>
-    </ul>
-
-    <h3><a name="1.9">1.9</a>) Wie erfahre ich von bekannten Bugs oder fehlenden Features?</h3>
-
-    <p>PostgreSQL unterstützt eine erweiterte Teilmenge von SQL:2003. Siehe
-    unsere TODO-Liste unter <a href="http://www.postgresql.org/docs/faqs.TODO.html">http://www.postgresql.org/docs/faqs.TODO.html</a> für eine Auflistung 
-    der bekannten Bugs, fehlenden Features und zukünftigen Pläne.</p>
-
-    <p>Eine Anfrage nach einem neuen Feature führt normalerweise zu einer der
-    folgenden Antworten:</p>
-    <ul>
-    <li>das Feature ist bereits auf der <a href="http://www.postgresql.org/docs/faqs.TODO.html">TODO</a>-Liste</li>
-    <li>das Feature ist nicht wünschenswert, weil:
-     <ul>
-        <li>es vorhandene Funktionalität dupliziert, welche bereits dem 
-        SQL-Standard folgt</li>
-        <li>es würde die Komplexität der Code-Basis erhöhen, ohne nennenswerte
-        Vorteile zu bringen</li>
-        <li>es wäre unsicher bzw. unzuverlässig</li>
-      </ul>
-    </li>
-    <li>das neue Feature wird der <a href="http://www.postgresql.org/docs/faqs.TODO.html">TODO</A>-Liste hinzugefügt</li>
-
-    </ul>
-
-    <p>PostgreSQL verwendet kein Bugtracking-System, da es sich als effizienter
-    erwiesen hat, E-Mails direkt zu beantworten und die <a href="http://www.postgresql.org/docs/faqs.TODO.html">TODO</a>-Liste
-    aktuell zu halten. In der Praxis werden Bugs sehr schnell beseitigt, und
-    diejenigen Bugs, die Auswirkungen auf eine große Anzahl von Nutzern haben,
-    werden meist kurzfristig korrigiert. Der einzige Überblick über alle Änderungen,
-    Verbesserungen und Korrekturen in einer PostgreSQL-Version befindet sich in
-    den <a href="http://www.postgresql.org/developer/sourcecode/">CVS</a>-Log-Meldungen.
-    Auch die Release-Notes listen nicht jede Änderung in der Software auf.</p>
-
-    <h3><a name="1.10">1.10</a>) Welche Dokumentation ist für PostgreSQL verfügbar?</h3>
-
-    <p>PostgreSQL bietet umfangreiche Dokumentation, darunter ein großes 
-    Handbuch, man-Pages und einige kleine Testprogramme. Siehe das <em>/doc</em>-
-    Verzeichnis. Ausserdem sind alle Handbücher online unter <a href="http://www.postgresql.org/docs/">http://www.postgresql.org/docs/</a>
-    verfügbar.</p>
-
-    <p>Zwei Bücher zu PostgreSQL sind online verfügbar unter
-    <a href="http://www.postgresql.org/docs/books/awbook.html">http://www.postgresql.org/docs/books/awbook.html</a> und
-    <a href="http://www.commandprompt.com/ppbook/">http://www.commandprompt.com/ppbook/</a> .</p>
-
-    <p>Eine Liste lieferbarer PostgreSQL-Bücher befindet sich unter
-      <a href="http://www.postgresql.org/docs/books">http://www.postgresql.org/docs/books</a>
-    Diverse technische Artikel befinden sich unter
-    <a href="http://www.postgresql.org/docs/techdocs">http://www.postgresql.org/docs/techdocs</a> .</p>
-
-    <p><em>psql</em> hat einige nützliche <em>\d</em>-Befehle, um Informationen über Typen,
-    Operatoren, Funktionen, Aggregate, usw. zu zeigen. </p>
-
-    <p>Die PostgreSQL-Website enthält noch mehr Dokumentation.</p>
-
-
-    <h3><a name="1.11">1.11</a>) Wie kann ich <small>SQL</small> lernen?</h3>
-   
-    <p>Die oben erwähnten PostgreSQL-spezifische Bücher bieten einen guten Einstieg.
-    Viele PostgreSQL-Anwender mögen "The Practical SQL Handbook" (Bowman
-    et al., Addison Wesley). Andere dagegen mögen "The Complete Reference SQL"
-    (Groff et al., McGraw-Hill).</p>
-
-    <p>Es gibt ausserdem einige nützliche Online-Tutorials:</p>
-    <ul>
-    <li><a href="http://www.intermedia.net/support/sql/sqltut.shtm">http://www.intermedia.net/support/sql/sqltut.shtm</a></li>
-    <li><a href="http://sqlcourse.com/">http://sqlcourse.com</a></li>
-    <li><a href="http://www.w3schools.com/sql/default.asp">http://www.w3schools.com/sql/default.asp</a></li>
-    <li><a href="http://mysite.verizon.net/Graeme_Birchall/id1.html">http://mysite.verizon.net/Graeme_Birchall/id1.html</a></li>
-    </ul>
-
-    <h3><a name="1.12">1.12</a>) Wie kann ich im Entwicklerteam mitarbeiten?</h3>
-
-    <p>Lesen Sie in der Entwickler-FAQ unter <a href="http://www.postgresql.org/docs/faqs.FAQ_DEV.html">http://www.postgresql.org/docs/faqs.FAQ_DEV.html</a> nach.
-
-    <h3><a name="1.13">1.13</a>) Wie läuft PostgreSQL im Vergleich zu anderen Datenbanksystemen?</h3>
-
-    <p>Es gibt verschiedene Methoden, Software zu messen: Eigenschaften,
-    Performanz, Zuverlässigkeit, Support und Preis.</p>
-
-    <dl>
-      <dt><b>Eigenschaften</b></dt>
-      <dd><p>PostgreSQL besitzt die meisten Eigenschaften - wie Transaktionen,
-          Unterabfragen (Subqueries), Trigger, Views, referenzielle Integrität bei Fremdschlüsseln und verfeinertes Locking -
-          die bei großen kommerziellen DBMS vorhanden sind. Es bietet außerdem
-          einige anderen Eigenschaften, die diese nicht immer haben, wie
-          benutzerbestimmte Typen, Vererbung, Regeln, und die 
-          Multi-Versionen-Steuerung zum Verringern konkurrierender Locks.</p>
-      </dd>
-
-      <dt><b>Performanz</b></dt>
-
-      <dd><p>Die Performanz von PostgreSQL ist  mit der von kommerziellen
-          und anderen Open-Source-Datenbanken vergleichbar. In manchen
-          Bereichen ist es schneller, in anderen langsamer. In der Regel
-          beträgt der Unterschied +/-10%.</p>
-      </dd>
-
-      <dt><b>Zuverlässigkeit</b></dt>
-      <dd><p>Es ist selbstredend, dass ein DBMS wertlos ist, wenn es nicht
-          zuverlässig arbeitet. Daher bemühen wir uns, nur streng geprüften und
-          beständigen Code freizugeben, der nur ein Minimum an Programmfehlern
-          aufweist. Jede Freigabe hat mindestens einen Monat Betatest-Phase
-          hinter sich, und unsere Freigabehistorie beweist, dass wir stabile und
-          solide Versionen freigeben, die im Produktionsbetrieb genutzt werden
-          können. Wir glauben, dass wir im Vergleich mit anderer
-          Datenbanksoftware vorteilhaft dastehen.</p>
-      </dd>
-
-      <dt><b>Support</b></dt>
-
-      <dd><p>Unsere Mailinglisten bieten die Möglichkeit, gemeinsam mit einer
-          großen Gruppe von Entwicklern und Benutzern mögliche Probleme
-          zu lösen. Wir können nicht immer eine Fehlerbehebung
-          garantieren, kommerzielle DBMS tun dies aber auch nicht.
-          Der direkte Kontakt zur Entwickler- und Benutzergemeinschaft und der
-          Zugriff auf die Handbücher und den Quellcode ermöglicht einen
-          im Vergleich zu anderen DBMS höherwertigeren Support. Es gibt jedoch auch
-          Anbieter von kommerziellen Support-Leistungen (siehe FAQ-Punkt <a href="#1.7">1.7</a>).</p>
-      </dd>
-      <dt><b>Preis</b></dt>
-      <dd><p>PostgreSQL ist frei verfügbar, sowohl für die kommerzielle wie
-          auch für die nicht-kommerzielle Nutzung. Sie können den PostgreSQL-Code
-          ohne Einschränkungen (außer denjenigen, die in der oben angegebene
-          BSD-artigen Lizenz erwähnt werden) in Ihr Produkt integrieren.</p>
-      </dd>
-    </dl>
-
-    <h3><a name="1.14">1.14</a>) Kommt PostgreSQL mit den Anpassungen der Sommerzeit in verschiedenen Ländern klar?</h3>
-
-    <p>Änderungen bei der US-Sommerzeit sind ab PostgreSQL Version 8.0.4
-    berücksichtigt. Änderungen in Canada und Western Australia sind ab 8.0.10
-    bzw. 8.1.6 berücksichtigt. PostgreSQL-Versionen vor 8.0 nutzen die
-    Zeitzonendatenbank des Betriebssystems, um die Sommerzeit zu berechnen.</p>
-
-    <h2 align="center">Fragen zu Benutzerprogrammen</h2>
-
-    <h3><a name="2.1">2.1</a>) Welche Schnittstellen gibt es für PostgreSQL?</h3>
-
-    <p>Die PostgreSQL-Installation stellt nur Schnittstellen für <code>C</code> und
-    <code>Embedded C</code> bereit. Alle weitere Schnittstellen sind unabhängige
-    Projekte, die einzeln heruntergeladen werden werden müssen. Diese Trennung
-    ermöglicht individuelle Entwickler-Teams und Entwicklungszyklen für die
-    jeweiligen Projekte.</p>
-
-    <p>Einige Programmiersprachen wie <code>PHP</code> haben eine PostgreSQL-
-    Schnittstelle bereits eingebaut. Schnittstellen für Sprachen wie <code>Perl</code>, <code>TCL</code>,
-    <code>Python</code> und viele anderen sind unter <a href="http://gborg.postgresql.org">http://gborg.postgresql.org</a>
-    im Bereich <em>Drivers/Interfaces</em> verfügbar sowie per Internet-Suche.</p>
-
-
-    <h3><a name="2.2">2.2)</a> Wie kann man PostgreSQL in einer Website nutzen?</H3>
-    <p>Eine nette Einführung zu datenbank-gestützten Webseiten kann unter
-    <a href="http://www.webreview.com"> http://www.webreview.com</a> (engl.) eingesehen werden.</p>
-
-    <p>Für die Web-Integration ist PHP eine ausgezeichnete Schnittstelle.
-    PHP gibt es bei <a href="http://www.php.net">http://www.php.net</a></p>
-
-    <p>Für komplexere Aufgaben bietet sich die Perl-Schnittstelle mit CGI.pm
-    oder mod_perl.</p>
-
-    <h3><a name="2.3">2.3</a>) Hat PostgreSQL eine grafische Benutzerschnittstelle?</h3>
-   
-    <p>Es gibt eine große Anzahl von GUI-Programmen für PostgreSQL -
-    sowohl kommerziell als auch Open-Source. Eine ausführliche Liste
-    befindet sich unter <a href="http://www.postgresql.org/docs/techdocs.54">http://www.postgresql.org/docs/techdocs.54</a> .</p>
-
-    <hr />
-
-    <h2 align="center">Administrative Fragen</h2>
-
-    <h3><a name="3.1">3.1</a>) Wie installiere ich PostgreSQL woanders als in /usr/local/pgsql?</h3>
-
-    <p>Bei der Ausführung von <em>configure</em> die Option <em>--prefix</em> mit dem Zielverzeichnis
-    angeben.</p>
-
-    <h3><a name="3.2">3.2</a>) Wie regle ich Zugriffe von anderen Rechnern?</h3>
-
-    <p>PostgreSQL ist standardmäßig so eingestellt, dass Verbindungen nur vom
-    lokalen Rechner über Unix Domain Sockets bzw. TCP/IP möglich sind.
-    Verbindungen von anderen Rechnern werden erst dann ermöglicht, wenn Sie
-    in der Datei <em>postgresql.conf</em> die Einstellung <tt>listen_addresses</tt>
-    anpassen, in der Datei <em>$PGDATA/pg_hba.conf</em> host-basierte
-    Authentifizierung einschalten und den Server neu starten.</p>
-
-    <h3><a name="3.3">3.3</a>) Wie kann ich eine bessere Performanz erreichen?</h3>
-
-    <p>Es gibt drei große Bereiche, in denen Performanzverbesserungen
-    erzielt werden können:</p>
-    
-    <dl>
-    <dt><b>Abfrageoptimierung</b></dt>
-
-    <dd>Die Modifizierung von Abfragen kann eine bessere Performanz
-    erzielen:
-    <ul>
-
-    <li>Erstellung von Indexen, einschliesslich partieller Indexe
-    sowie Expressionsindexe</li>
-    <li>Einsatz von <tt>COPY</tt> anstelle multipler <tt>INSERT</tt>-Anweisungen</li>
-    <li>Gruppierung von mehreren Abfragen innerhalb einer Transaktion,
-    um Aufwand beim Abschluss von Transaktionen einzusparen</li>
-    <li>Einsatz von <tt>CLUSTER</tt> beim Holen von einer großen Anzahl
-    von Datenreihen aus einem Index</li>
-    <li>Einsatz von <tt>LIMIT</tt>, um eine Untermenge der Abfragen-
-    ergebnisse zurückzuliefern</li>
-    <li>Einsatz von vorbereiteten Befehlen (prepared queries)</li>
-    <li>Einsatz von <tt>ANALYZE</tt>, um die Datenbankstatistik für
-    den Abfragenplaner aktuell zu halten</li>
-    <li>Regelmäßiger Einsatz von <tt>VACUUM</tt> bzw. <em>pg_autovacuum</em></li>
-    <li>Bei großen Datenveränderungen die Löschung von Indexen</li>
-    </ul><br/>
-
-    <br/>
-    </dd>
-
-    <dt><b>Server-Konfiguration</b></dt>
-
-    <dd>Einige Einstellungen in der Datei <em>postgresql.conf</em>
-
-    wirken auf die Performanz aus. Das Handbuch enthält unter
-    <a href="http://www.postgresql.org/docs/current/static/runtime-config.html">http://www.postgresql.org/docs/current/static/runtime-config.html</a> eine 
-    komplette Auflistung. Kommentare zu den jeweiligen Einstellungen 
-    gibt es unter
-    <a href="http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_conf_e.html">http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_conf_e.html</a>
-    und <a href="http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html">http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html</a>.
-    <br/>
-    <br/>
-    </dd>
-
-    <dt><b>Hardware-Auswahl</b></dt>
-
-    <dd>Die Auswirkung von Hardware auf Performanz wird unter
-    <a href="http://momjian.us/main/writings/pgsql/hw_performance/index.html">http://momjian.us/main/writings/pgsql/hw_performance/index.html</a> und
-    <a href="http://www.powerpostgresql.com/PerfList/">http://www.powerpostgresql.com/PerfList/</a> erläutert.
-    <br/>
-    <br/>
-    </dd>
-
-    </dl>
-
-    <h3><a name="3.4">3.4</a>)	Welche Debugging-Funktionen sind für PostgreSQL verfügbar?</h3>
-
-    <p>Unter den Optionen für die Server-Konfigurierung gibt es zahlreiche
-    <tt>log_*</tt>-Variablen, die die Ausgabe von Abfrage- und Prozessstatistiken
-    ermöglichen. Diese können für Debugging-Zwecke sowie Performanz-Tests sehr
-    nützlich sein.</p>
-
-    <h3><a name="3.5">3.5</a>) Ich bekomme die Meldung "<em>Sorry, too many clients</em>", wenn ich eine 
-    Verbindung aufzubauen versuche. Warum?</h3>
-   
-    <p>Ihr System hat die maximal zulässige Anzahl von Datenbankverbindungen
-    erreicht (Voreinstellung 100). Sie müssen die maximale Anzahl der 
-    gleichzeitig ausführbaren Backend-Prozesse hochsetzen, indem Sie in
-    <em>postgresql.conf</em> den Wert <tt>max_connections</tt> ändern und
-    den Server neustarten.</p>
-
-
-    <h3><a name="3.6">3.6</a>) Wie wird PostgreSQL aktualisiert?</h3>
-
-    <p>Allgemeine Informationen zur Aktualisierung von PostgreSQL gibt es auf der 
-    Seite <a href="http://www.postgresql.org/support/versioning">http://www.postgresql.org/support/versioning</a>.
-    Detaillierte technische Informationen gibt es auf der Seite
-    <a href="http://www.postgresql.org/docs/current/static/install-upgrading.html">http://www.postgresql.org/docs/current/static/install-upgrading.html</a>
-    </p>
-
-<!--
-    <p>Zwischen "kleinen" PostgreSQL-Versionsänderungen (z.B. zwischen
-    7.4.8 und 7.4.9) werden nur Bugs behoben, wodurch ein erneutes Aus-
-    und Einlesen der Daten nicht erforderlich ist. Es müssen lediglich die
-    neue Software installiert sowie der Server neugestartet werden.</p>
-
-    <p>Alle Nutzer sollten sobald wie möglich die neueste "kleine"
-    Version installieren. Zwar birgt eine Server-Aktualisierung immer
-    einige Risiken, doch die "kleinen" Versionsänderungen zielen darauf,
-    mit dem kleinsten Risiko die häufigsten Bugs zu beheben. Allgemein
-    wird es als riskanter betrachtet, <em>nicht</em> zu aktualisieren
-    als zu aktualisieren.</p>
-
-    <p>Bei "großen" Versionsänderungen (z.B. zwischen 7.3 und 7.4) wird
-    oft das interne Format der Systemtabellen und Datendateien
-    angepasst. Diese Änderungen sind oft sehr komplex, wodurch die
-    Rückwärtskompatibilität der Datendateien nicht gewährleistet werden kann.
-    Bei der Aktualisierung zwischen "großen" Versionen muss die 
-    Datenbank exportiert und neu importiert werden.</p>
--->
-    <h3><a name="3.7">3.7</a>) Welche Hardware eignet sich für den Betrieb mit PostgreSQL?</h3>
-
-    <p>PostgreSQL läuft auf fast jeder Hardware-Kombination. Im PC-Bereich
-    gibt es allerdings sehr große Abweichungen in der Qualität. Für einen
-    Arbeitsplatz- oder Entwicklungsrechner mag dies nicht so bedeutend sein,
-    im Server-Betrieb jedoch lohnt sich auf jeden Fall die Investition
-    in teurere Bestandteile (Stichwörter ECC-Speicher, SCSI, Hauptplatinen
-    und Netzteile von namhaften Herstellern). Nutzen Sie unsere Mailing-Listen,
-    um Hardware-Optionen zu diskutieren.
-    </p>
-
-    <hr />
-
-    <h2 align="center">Fragen zum Betrieb</h2>
-
-    <h3><a name="4.1">4.1</a>) Wie wähle ich per <small>SELECT</small>-Anweisung nur die ersten paar
-    Zeilen bzw. eine beliebige Zeile in einer Abfrage aus?</h3>
-
-    <p>Wenn Sie bei der Ausführung der Abfrage die Anzahl der anzufordenden 
-    Reihen bereits kennen, nutzen Sie <tt>LIMIT</tt>. Wenn die <tt>ORDER BY</tt>-
-    Anweisung mit einem Index verwendet wird, ist es möglich, dass die
-    gesamte Abfrage nicht ausgeführt werden muss. Wenn Sie die Anzahl der
-    der anzufordenden Reihen nicht kennen, verwenden Sie einen Cursor
-    und <tt>FETCH</tt>.
-
-    <p>Um eine beliebige Zeile auszuwählen, nutzen Sie <small>ORDER BY random()</small>:</p>
-    <pre>
-       SELECT spalte
-         FROM tabelle
-     ORDER BY random()
-        LIMIT 1
-    </pre>
-
-    <h3><a name="4.2">4.2</a>) Wie finde ich heraus, welche Tabellen, Indexe, Datenbanken oder 
-    Benutzer in der Datenbank definiert sind? Wie bekomme ich die von <em>psql</em> verwendeten Abfragen?</h3>
-
-    <p>In psql zeigt der Befehl \dt eine Liste der Datenbanktabellen. Weitere psql-Befehle
-    lassen sich mit \? anzeigen. Sie können sich die Datei <em>pgsql/src/bin/psql/describe.c</em> 
-    mit dem Quellcode für <em>psql</em> ansehen. Sie enthält die <small>SQL</small>-Abfragen, die die
-    Backslash-Kommandos (\) ausführen. Sie können <em>psql</em> auch mit der <em>-E</em>
-    Option starten. Danach gibt <em>psql</em> die Abfragen aus, die es bei der Ausführung der Befehle
-    benutzt. Außerdem biete PostgreSQL ein <small>SQL</small>-kompatibles INFORMATION SCHEMA,
-    das Metainformation über die Datenbank zur Verfügung stellt.</p>
-
-    <p>Mit <tt>psql -l</tt> können Sie alle Datenbanken anzeigen lassen.</p>
-
-    <p>Die Datei <em>pgsql/src/tutorial/syscat.source</em> enthält außerdem viele <small>SELECT</small>-
-    Abfragen, mit deren Hilfe man Information über die Systemtabellen erhalten kann.</p>
-
-    <h3><a name="4.3">4.3</a>) Wie ändere ich den Datentyp einer Spalte?</h3>
-
-    <p>Ab Version 8.0 kann der Datentyp einer Spalte mit <tt>ALTER TABLE ALTER COLUMN TYPE</tt>
-    geändert werden, sofern der neue Datentyp die Werte des alten Datentype aufnehmen
-    kann.</p>
-
-    <p>Bei früheren Versionen gehen Sie wie folgt vor:</p>
-
-     <pre>
-       BEGIN;
-       ALTER TABLE <em>tabelle</em> ADD COLUMN <em>neue_spalte</em> <em>neuer_datentyp</em>;
-       UPDATE <em>tabelle</em> SET <em>neue_spalte</em> = CAST(<em>alte_spalte</em> AS <em>neuer_datentyp</em>);
-       ALTER TABLE <em>tabelle</em> DROP COLUMN <em>alte_spalte</em>;
-       COMMIT;
-    </pre>
-
-    <p>Um den Speicherplatz freizugeben, der von der gelöschten Spalte verwendet 
-    wurde, führen Sie <small>VACUUM FULL</small> aus.</p>
-
-    <h3><a name="4.4">4.4</a>) Was ist die Maximalgröße für eine Zeile, eine Tabelle, eine Datenbank?</h3>
-
-    <p>Es bestehen folgende Obergrenzen:</p>
-<pre>
-    Maximale Größe eine Datenbank?           unbeschränkt (es existieren
-                                               Datenbanken mit 32 TB)
-    Maximale Größe einer Tabelle?            32 TB
-    Maximale Größe einer Zeile?              400 GB
-    Maximale Größe einer Spalte?             1 GB
-    Maximale Anzahl von Zeilen in einer Tabelle?
-                                             unbeschränkt
-    Maximale Anzahl von Spalten in einer Tabelle?
-                                             250-1600 je nach Spaltentyp
-    Maximale Anzahl von Indexen für eine Tabelle?
-                                             unbeschränkt
-
-</pre>
-    <p>Selbstverständlich sind dies theoretische Werte, die oft durch die
-    verfügbaren Platten- und Speicherressourcen beschränkt werden.
-    Extreme Größen können zu Leistungseinbußen führen.</p>
-
-    <p>Die maximale Tabellengröße von 32 TB benötigt keine Large-File-Unterstützung
-    im Betriebssystem. Große Tabellen werden in Dateien mit einer Größe von
-    je 1 GB aufgeteilt, wodurch etwaige dateisystem-bedingte Beschränkungen nicht
-    relevant sind.</p>
-
-    <p>Die maximale Tabellengröße und die maximale Anzahl von Spalten können
-    vervierfacht werden, indem man die Default-Blockgröße auf 32 KB heraufsetzt.
-    Die Tabellengröße kann auch durch Tabellenpartitionierung vergrößert
-    werden.</p>
-
-    <p>Eine Einschränkung ist, dass Indexe nur auf Spalten erstellt werden
-    können, die bis etwa 2.000 Zeichen groß sind. Um auf größere Spalten 
-    eine <small>UNIQUE</small>-Constraint setzen zu können, nutzen
-    Sie einen funktionalen Index mit dem MD5-Hash-Wert der Spalte. 
-    Um innerhalb einer großen, mit Text belegten Spalte suchen zu können,
-    verwenden Sie einen Volltext-Index.</p>
-
-    <h3><a name="4.5">4.5</a>) Wieviel Plattenplatz wird benötigt, um die Daten aus einer typischen
-    Textdatei abzuspeichern? </h3>
- 
-    <p>Eine PostgreSQL-Datenbank kann beim Abspeichern einer einfachen Textdatei
-    bis zu fünfmal mehr Platz gegenüber der eigentlichen Größe der Datei
-    beanspruchen.</p>
-
-    <p>Betrachten wir eine Datei mit 100.000 Zeilen mit einem Integer und einer
-    Textbeschreibung pro Zeile. Gehen wir davon aus, dass die durchschnittliche
-    Länge der Textbeschreibung 20 Byte beträgt. Die einfache Datei würde 2,8 MB
-    groß sein. Die Größe der PostgreSQL-Datenbankdatei, die diese Daten enthält,
-    liegt ungefähr bei 5,2 MB:</p>
-<pre>
-    24 Bytes: jeder Zeilenkopf (ungefähr)
-   +24 Bytes: ein Integer-Feld und ein Textfeld
-   + 4 Bytes: Zeiger auf der Datenseite auf den Tupel
-   -----------------------------------------------
-    52 Bytes pro Zeile
-</pre>
-    <p>Die Größe einer Datenseite in PostgreSQL beträgt 8192 Bytes (8 KB), also:</p>
-
-<pre>
-   8192 Bytes pro Seite
-   ---------------------   =  146 Zeilen pro Seite (abgerundet)
-     52 Bytes pro Zeile
-
-   100.000 Datenzeilen
-   ------------------------  =  685 Datenbankseiten (aufgerundet)
-       158 Zeilen pro Seite
-
-   633 Datenbankseiten * 8192 Bytes pro Seite  =  5,185,536 bytes (5,2 MB)
-</pre>
-    <p>Indexe beanspruchen nicht so viel Platz. Da sie jedoch die
-    Daten beinhalten, die sie indizieren, können auch sie sehr groß werden.</p>
-
-    <p>NULL-Werte werden als Bitmaps gespeichert, wodurch sie sehr wenig
-    Platz in Anspruch nehmen.</p>
-
-    <h3><a name="4.6">4.6</a>) Meine Abfragen sind langsam oder benutzen die Indexe nicht. Warum?</h3>
-
-    <p>Indexe werden nicht automatisch bei jeder Abfrage verwendet. Indexe werden
-    nur dann verwendet, wenn die abzufragende Tabelle eine bestimmte Größe
-    übersteigt, und die Abfrage nur eine kleine Prozentzahl der Tabellenzeilen
-    abfragt. Der Grund hierfür ist der, dass die durch einen Index verursachten
-    Festplattenzugriffe manchmal länger dauern würden als ein einfaches Auslesen
-    aller Tabellenzeilen (sequentieller Scan).</p>
-
-    <p>Um festzustellen, ob ein Index verwendet werden soll, braucht PostgreSQL
-    Statistiken über die Tabelle. Diese Statistiken werden durch die Anweisungen
-    <small>VACUUM ANALYZE</small> bzw. <small>ANALYZE</small> berechnet. Anhand der Statistiken kennt der
-    Abfragenoptimierer die Anzahl der Tabellenzeilen und kann besser
-    entscheiden, ob Indexe verwendet werden sollen. Statistiken sind auch
-    bei der Ermittlung der optimalen <small>JOIN</small>-Reihenfolgen und
-    -Methoden wertvoll. Daher sollten diese regelmässig durchgeführt werden, da
-    sich der Inhalt einer Tabelle ja auch verändert.</p>
-
-    <p>Indexe werden normalerweise nicht in <small>ORDER BY</small>-Abfrage oder in JOINs
-    verwendet. Ein sequentieller Scan mit anschließendem explizitem
-    Sortiervorgang ist normalerweise schneller als ein Index-Scan einer
-    großen Tabelle. Jedoch wird bei einer Abfrage, in der <small>LIMIT</small> zusammen mit
-    <small>ORDER BY</small> verwendet wird, oftmals ein Index verwendet, da nur ein
-    kleiner Abschnitt der Tabelle zurückgeliefert wird.</p>
-
-    <p>Sollte es danach aussehen, also ob der Optimierer irrtümlich einen sequentiellen 
-    Scan ausführt, führen Sie <small>SET enable_seqscan TO 'off'</small> aus und prüfen
-    Sie, ob die Indexabfrage dadurch scheller geworden ist.</p>
-
-    <p>Bei der Nutzung von Wildcard-Operatoren wie <small>LIKE</small> oder <small>~</small>, können
-    Indexe nur unter bestimmten Umständen verwendet werden:</p>
-  <ul>
-
-    <li>Das Suchmuster muss sich an Anfang des Strings befinden, d.h.:
-      <ul>
-        <li><small>LIKE</small>-Suchmuster dürfen nicht mit <em>%</em> anfangen;</li>
-        <li><small>~</small> (reguläre Ausdrücke) müssen mit <em>^</em> anfangen.</li>
-      </ul>
-    </li>
-    <li>Das Suchmuster darf nicht mit einer Zeichenklasse (z.B. <em>[a-e]</em>)
-    beginnen.</li>
-    <li>Suchmuster, die Gross- und Kleinschreibung nicht berücksichtigen (z.B.
-    <small>ILIKE</small> bzw. <small>~*</small>), verwenden keine Indexe. Stattdessen können
-    funktionale Indexe verwendet werden, die im Punkt <a href="#4.8">4.8</a> beschrieben werden.</li>
-    <li>Die Standard-Locale "C" muss während der Datenbank-Initialisierung mit <em>initdb</em>
-    verwendet worden sein, da andere <em>locales</em> den nächstgrößten Wert nicht
-    ermitteln können. Es ist allerdings möglich, einen besonderen <small>text_pattern_ops</small>-Index 
-    für solche Fälle zu erstellen.</li>
-  </ul>
-    <p>In Versionen vor 8.0 werden Indexe oft nicht benutzt, wenn die
-    jeweiligen Datentypen nicht genau übereinstimmen. Dies gilt besonders für 
-    Indexe auf Spalten mit den Datentypen <small>INT2</small>, <small>INT8</small> und <small>NUMERIC</small></p>
-
-
-    <h3><a name="4.7">4.7</a>) Auf welche Weise kann ich sehen, wie der Abfrage-Optimierer meine
-    Abfrage auswertet?</h3>
-
-    <p>Vgl. die <em>EXPLAIN</em> Man-Page.</p>
-
-    <h3><a name="4.8">4.8</a>) Wie verfahre ich bei der Suche mit regulären Ausdrücken und bei einer
-    Suche, bei der Groß- und Kleinschreibweisen ignoriert werden? Wie verwende
-    ich einen Index bei solchen Suchabfragen?</h3>
-
-    <p>Der Operator <em>~</em> wendet einen regulären Ausdruck an und <em>~*</em> wendet ihn an, ohne die Groß- und Kleinschreibung zu beachten.
-     Ebenso beachtet <small>LIKE</small> die Groß- und Kleinschreibung, und <small>ILIKE</small> nicht.</p> 
-
-    <p>Gleichheitsvergleiche, die Groß- und Kleinschreibung ignorieren, werden
-    in der Regel so ausgedruckt:</p>
-
-<pre>
-      SELECT *
-        FROM tabelle
-       WHERE LOWER(spalte) = 'abc'
-</pre>
-    <p>Hier wird kein normaler Index benutzt. Legt man hingegen einen funktionalen
-    Index an, so wird er auf jeden Fall verwendet:</p>
-<pre>
-      CREATE INDEX tabelle_index ON tabelle (LOWER(spalte))
-</pre>
-    <p>Falls der obige Index als einen <small>UNIQUE</small>-Index angelegt
-    wird, können keine Werte in die Spalte eingefügt werden, die sich nur
-    durch ihre Groß- und Kleinschreibung unterscheiden. Um Fehler zu
-    vermeiden muß ein <small>CHECK</small>-Constraint oder ein Trigger
-    eingesetzt werden.</p>
-
-    <h3><a name="4.9">4.9</a>) Wie ermittle ich in einer Abfrage, ob ein Feld NULL ist?
-    Kann nach der NULL-Belegung sortiert werden?</h3>
-
-    <p>Testen Sie die Spalte mit <small>IS NULL</small> bzw. <small>IS NOT NULL</small>.</p>
-<pre>
-      SELECT *
-        FROM tabelle
-       WHERE spalte IS NULL
-</pre>
-    <p>Um die Spalte danach zu sortieren, ob sie mit NULL belegt ist oder nicht,
-    verwenden Sie die Bedingungen <small>IS NULL</small> bzw. <small>IS NOT NULL</small>
-    in der <small>ORDER BY</small>-Klausel. Da Bedingungen, die wahr sind, höher
-    als das Gegenteil sortiert werden, bewirkt die folgende Abfrage, dass die 
-    <small>NULL</small>-Spalten zuerst gelistet werden:</p>
-<pre>
-      SELECT *
-        FROM tabelle
-    ORDER BY (spalte IS NOT NULL)
-
-</pre>
-
-    <h3><a name="4.10">4.10</a>) Was ist der Unterschied zwischen den verschiedenen <small>CHAR</small>-Typen?</h3><pre>
-Typ           interner Name   Bemerkungen
--------------------------------------------------
-VARCHAR(n)    varchar         die Größe legt die Maximallänge fest; kein
-                              Auffüllen mit Leerzeichen
-CHAR(n)       bpchar          mit Leerzeichen gefüllt bis zur angegebenen Länge
-TEXT          text            keine obere Schranke für die Länge
-BYTEA         bytea           Bytearray mit variabler Länge (auch für
-                              '\0'-Bytes geeignet)
-"char"        char            1 Zeichen
-</pre>
-    <p>Der <em>interne Name</em> kommt vor allem in den Systemkatalogen und in manchen
-    Fehlermeldungen vor.</p>
-
-    <p>Die ersten vier Typen sind "<em>varlena</em>"-Typen (d.h. die ersten vier
-    Bytes geben die Länge an, gefolgt von den Daten). Daher ist der tatsächlich
-    belegte Platz immer etwas mehr als die deklarierte Feldgröße. Allerdings
-    wird unter Umständen auf diese Datentypen Datenkompression durch das <small>TOAST</small>-
-    Verfahren angewendet, womit der tatsächlich belegte Platz auch geringer
-    als erwartet ausfallen kann.</p>
-
-    <p>Für die Speicherung von Zeichenketten variabler Länge empfiehlt sich <small>VARCHAR(n)</small>. 
-    Die maximale Länge eines <small>VARCHAR(n)</small>-Felds wird bei der Tabellendefinition
-    festgelegt. <small>TEXT</small> setzt keine Längengrenze, allerdings gibt es
-    eine systembedingte Obergrenze von 1 GB. </p>
-
-    <p><small>CHAR(n)</small> ist geeignet für die Speicherung von Zeichenketten, die alle 
-    die gleiche Länge haben. Bitte beachten Sie, dass <small>CHAR(n)</small> automatisch Zeichenketten
-    bis zur definierten Feldlänge mit Leerzeichen ausfüllt, während bei <small>VARCHAR(n)</small> nur
-    die tatsächlich eingegebene Zeichenkette gespeichert wird.</p>
-
-    <p><small>BYTEA</small> ist für binäre Daten, besonders für Werte, die <small>NULL</small>-Bytes haben. </p>
-
-    <p>Alle der hier erwähnten Typen weisen ähnliche Performanzeigenschaften auf.</p>
-
-    <h3><a name="4.11.1">4.11.1</a>) Wie erzeuge ich ein serielles Feld mit automatischer Erhöhung des
-    Wert?</h3>
-
-    <p>PostgreSQL bietet einen <small>SERIAL</small>-Datentyp. Dieser erzeugt automatisch
-    eine Sequenz auf die angegebene Spalte. Zum Beispiel:</p>
-<pre>
-      CREATE TABLE person (
-          id   SERIAL,
-          name TEXT
-      )</pre>
-
-    <p>wird automatisch in:</p>
-<pre>
-      CREATE SEQUENCE person_id_seq;
-      CREATE TABLE person (
-        id   INT4 NOT NULL DEFAULT nextval('person_id_seq'),
-        name TEXT
-      );
-</pre><p>umgewandelt.</p>
-
-    <p>Die <em>create_sequence</em> Man-Page liefert weitere Informationen über Sequenzen.</p>
-
-    <h3><a name="4.11.2">4.11.2</a>) Wie bekomme ich den Wert einer <small>SERIAL</small>-Sequenz?</h3>
-
-    <p>Eine Möglichkeit wäre, mit der <em>nextval()</em>-Funktion den nächsten <small>SERIAL</small>-Wert
-    von dem Sequenzobjekt vor der Auszuführung einer <small>INSERT</small>-Anweisung anzufordern und ihn 
-    dann explizit in die <small>INSERT</small>-Anweisung einzubinden. Anhand der Beispieltabelle in
-    <a href="#4.11.1">4.11.1</a> könnte dieser Vorgang in einer Pseudosprache so aussehen:</p>
-
-<pre>
-    new_id = output of execute("SELECT nextval('person_id_seq')");
-    execute("INSERT INTO person (id, name) VALUES (new_id, 'Blaise Pascal')");
-</pre>
-    <p>Danach stünde der neue Wert in der Variablen <em>new_id</em> für die Verwendung in
-    weiteren Abfragen zur Verfügung, zum Beispiel als Fremdschlüssel zur
-    Tabelle 'person'). Bitte beachten Sie, dass der Name des automatisch
-    erstellten <small>SEQUENCE</small>-Objektes folgenden Name hat:
-    <em>«table»_«serialcolumn»_seq</em>
-    wobei '<em>table</em>' und '<em>serialcolumn</em>' die Namen der jeweils betreffenden
-    Tabelle / Spalte darstellen.</p>
-
-    <p>Als weitere Möglichkeit können Sie nach einer <small>INSERT</small>-Anweisung den
-    automatisch eingefügten <small>SERIAL</small>-Wert mit der <em>currval()</em>-Funktion zurückgeben
-    lassen:</p>
-<pre>
-    execute("INSERT INTO person (id, name) VALUES (new_id, 'Blaise Pascal')");
-    new_id = output of execute("SELECT currval('person_id_seq')");
-</pre>
-
-    <h3><a name="4.11.3">4.11.3</a>) Führt <em>currval()</em> zu einer Race-Condition mit anderen
-     Nutzern?</h3>
-
-    <p>Nein. <em>currval()</em> liefert einen Wert zurück, der von Ihrer 
-    Datenbank-Session bestimmt wird, und der anderen Sessionen nicht zur Verfügung
-    steht.</p>
-
-    <h3><a name="4.11.4">4.11.4</a>) Warum werden die Sequenzwerte nach einem Transaktionsabbruch nicht
-     zurückgesetzt? Warum gibt es Lücken in der Nummerierung meiner
-     Sequenz-/<small>SERIAL</small>-Spalte?</h3>
-
-    <p>Um die gleichzeitige Abarbeitung von Transaktionen zu verbessern, werden
-    Sequenzen gerade nicht für andere Transaktionen gesperrt, sondern die
-    Sequenznummern werden den laufenden Transaktionen sofort zugeteilt. Lücken in 
-    der Sequenznummerierung werden durch abgebrochene Transaktionen verursacht.</p>
-
-    <h3><a name="4.12">4.12</a>) Was ist ein <small>OID</small>? Was ist ein <small>CTID</small>?</h3>
-
-    <p>Jede Zeile, die in PostgreSQL erzeugt wird, bekommt eine eindeutige <small>OID</small>,
-    sofern die Tabelle nicht mit der Option <small>WITHOUT OIDS</small> angelegt wurde.
-    <small>OID</small>s sind automatisch zugewiesene 4-Byte-Integer, die innerhalb
-    der gesamten Datenbank einmalig sind. Allerdings laufen sie bei einem Wert von
-    ungefähr 4 Milliarden über.  PostgreSQL verwendet <small>OID</small>s, um seine
-    interne Systemtabellen zu verbinden.</p>
-
-    <p>Um einmalige Idenfikatoren in Datentabellen zu erstellen, wird allerdings
-    empfohlen, statt <small>OID</small>s Werte zu verwenden, die von<small>SERIAL</small>-
-    Sequenzen erzeugt werden. <small>SERIAL</small>-Sequenzen sind innerhalb einer
-    Tabelle einmalig und daher weniger anfällig für Überläufe. Außerdem können
-    8-Byte-Sequenzwerte mit <small>SERIAL8</small> erzeugt werden.</p>
-   
-    <p><small>CTID</small>s werden benutzt, um bestimmte physikalische Zeilen
-    durch Block und Offset Werte zu identifizieren. <small>CTID</small>s
-    verändern sich, sobald Zeilen verändert oder zurückgeladen werden. Sie
-    werden in Indexeinträgen benutzt um auf die physikalischen Zeilen zu
-    zeigen.</p>
-
-    <h3><a name="4.13">4.13</a>) Wieso bekomme ich einen Fehler: "<em>ERROR: Memory exhausted in
-    AllocSetAlloc()</em>"?</h3>
-
-    <p>Wahrscheinlich gibt es keinen virtuellen Speicher mehr in Ihrem System
-    oder Ihr Kernel hat niedrige Höchstgrenzen für bestimmte Ressourcen.
-    Probieren Sie vor dem Start von <em>postmaster</em> folgendes:</p>
-<pre>
-      ulimit -d 262144
-      limit datasize 256m
-
-</pre>
-    <p>Je nach benutzter Shell wird nur einer dieser Befehle erfolgreich
-    ausgeführt werden. Auf jedem Fall wird die Grenze des Datensegments für
-    Prozesse erhöht werden und eventuell die erfolgreiche Ausführung der
-    Abfrage ermöglichen. Falls Sie ein Problem mit dem SQL-CLient haben,
-    weil das Backend zu viele Daten zurückliefert, versuchen Sie dies vor dem
-    Start des SQL-Clients.</p>
-
-    <h3><a name="4.14">4.14</a>) Wie kann ich feststellen, welche PostgreSQL-Version bei mir läuft?</h3>
-
-    <p>Geben Sie in <em>psql</em> <small>SELECT VERSION();</small> ein.</p>
-
-    <h3><a name="4.15">4.15</a>) Wie kann ich eine Spalte erstellen, deren Default-Wert immer
-    die aktuelle Uhrzeit enthalten soll?</h3>
-
-    <p>Dazu verwenden Sie <small>CURRENT_TIMESTAMP</small>:</p>
-<pre>
-      CREATE TABLE test (x INT, modtime TIMESTAMP DEFAULT CURRENT_TIMESTAMP );
-</pre>
-
-    <h3><a name="4.16">4.16</a>) Wie führe ich eine <small>OUTER JOIN</small> durch?</h3>
-
-    <p>PostgreSQL unterstützt <small>OUTER JOIN</small>s nach dem SQL-
-    Standardsyntax. Hier zwei Beispiele:</p>
-<pre>
-      SELECT *
-        FROM tabelle_1 t1
-             LEFT OUTER JOIN tabelle_2 t2 ON (t1.spalte = t2.spalte)
-</pre>
-    <p>bzw.:</p>
-<pre>
-      SELECT *
-        FROM tabelle_1 t1
-             LEFT OUTER JOIN tabelle_2 t2 USING (spalte)
-</pre>
-
-    <p>
-    Diese identischen Abfragen verknüpfen <em>tabelle_1</em> mit <em>tabelle_2</em> über die
-    Spalte '<em>spalte</em>' und geben außerdem alle unverknüpften Zeilen in tabelle_1
-    (diejenigen, die keine Entsprechung in <em>tabelle_2</em> haben) zurück.
-    Ein <small>RIGHT JOIN</small> würde hingegen alle unverknüpften Zeilen in tabelle_2 hinzufügen und
-    ein <small>FULL JOIN</small> würde alle verknüpften Zeilen sowie jeweils alle
-    unverknüpften Zeilen aus den beiden Tabellen zurückliefern. Die Angabe von
-    <small>OUTER</small> ist nicht zwingend und kann in <small>LEFT</small>, <small>RIGHT</small> und <small>FULL</small>-Verknüpfungen
-    weggelassen werden. Normale Verknüpfungen sind <small>INNER JOIN</small>s.</p>
-
-    <h3><a name="4.17">4.17</a>) Wie kann ich Abfragen über mehrere Datenbanken hinweg ausführen?</h3>
-
-    <p>Es gibt keinen Weg, innerhalb einer Abfrage auf mehr als eine Datenbank
-    zuzugreifen. Da PostgreSQL datenbank-spezifische Systemkataloge lädt, ist
-    eine datenbankübergreifende Abfrage nicht möglich.</p>
-
-    <p><em>contrib/dblink</em> ist eine Erweiterung, die datenbankübergreifende Abfragen über
-    Funktionsaufrufe ermöglicht.</p>
-
-    <h3><a name="4.18">4.18</a>) Wie kann ich mehrere Zeilen bzw. Spalten von einer Funktion
-    zurückgeben lassen?</h3>
-
-    <p>Funktionen können mehrere Zeilen und Spalten zurückgeben, vgl.:
-    <a href="http://www.postgresql.org/docs/techdocs.17">http://www.postgresql.org/docs/techdocs.17</a>.</p>
-
-    <h3><a name="4.19">4.19</a>) Warum bekomme ich eine Fehlermeldung wie 
-    "relation with OID ##### does not exist" wenn ich temporäre Tabellen in 
-    PL/PgSQL-Funktionen benutze?</h3>
-
-    <p>In PostgreSQL-Versionen vor 8.3 verarbeitet PL/PgSQL Funktionen in einer
-    Cache. Dies hat eine unangenehme Nebenwirkung, nämlich dass wenn eine
-    PL/PgSQL-Funktion auf eine temporäre Tabelle zugreift, und diese Tabelle
-    anschließend gelöscht bzw. neu erstellt wird, die Funktion fehlschlagen
-    wird, da die gecachten Funktionsinhalte noch auf die alte temporäre Tabelle
-    zeigen. Die Lösung für diese Probleme besteht darin, in der PL/PgSQL-
-    Funktion mittels <small>EXECUTE</small> auf temporäre Tabellen zuzugreifen.
-    Dies bewirkt, dass bei jedem Funktionsruf die betreffende Abfrage neu
-    geparst wird.</p>
-
-    <p>Dieses Problem taucht in PostgreSQL 8.3 und späteren Versionen nicht
-    mehr auf.</p>
-
-    <h3><a name="4.20">4.20</a>) Welche Replikationslösungen gibt es?</h3>
-
-    <p>Der Begriff "replikation" umfasst mehrere verschiedene Technologien, 
-    jede mit eigenen Vor- und Nachteilen.</p>
-
-    <p>Mit "Master/slave"-Replikation werden Änderungen in einer Hauptdatenbank
-    durchgeführt und an "Sklaven" verteilt, die im Nur-Lese-Modus arbeiten. 
-    Die populärste Lösung für PostgreSQL ist <a href="http://main.slony.info/">Slony-I</a>.</p>
-
-    <p>"Multi-master replication" ermöglicht sowohl lesende als auch schreibende
-    Zugriffe über mehrere Datenbank-Server hinweg. Allerdings hat diese Art von
-    Replikation eine negative Auswirkung auf die Performanz durch die 
-    Notwendigkeit, Änderungen zwischen Servern zu synchronisieren. <a href="http://pgfoundry.org/projects/pgcluster/">Pgcluster</a> 
-    ist die populärste freie Lösung für PostgreSQL.</p>
-
-    <p>Es gibt auch einige kommerzielle und hardware-basierte Replikationslösungen
-    für verschiedene Arten der Replikation.</p>
-
-    <h3><a name="4.21">4.21</a>) Warum werden die Tabellen- und Spaltennamen in meiner
-    Abfrage nicht erkannt? Warum werden Großbuchstaben umgewandelt?</h3>
-
-    <p>Die häufigste Ursache ist die Verwendung von Gänsefüßchen
-    bei der Anlegung von Tabellen, z.B.:</p>
-<pre>
-       CREATE TABLE "Tabelle"
-                   ("SPALTE1" INT)
-</pre>
-    <p>Dadurch werden Tabellen- und Spaltennamen (sog. Identifikatoren) 
-    in genau der Schreibweise gespeichert (vgl. <a
-    href="http://www.postgresql.org/docs/current/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS"> 
-    Dokumentation</a>), was dazu führt, dass man sie danach immer
-    in Gänsefüßchen angeben muss. Im obigen Beispiel muss man also immer
-    etwa <small>SELECT * FROM "Tabelle"</small> verwenden. Um
-    dieses Problem zu vermeiden, müssen Sie immer eines der folgenden
-    Punkte beachten:</p>
-
-    <ul>
-    <li>bei der Tabellenanlegung keine Gänsefüßchen verwenden;</li>
-    <li>in Identifikatoren nur Kleinschreibung verwenden;</li>
-    <li>immer Identifikatoren mit Gänsefüßchen versehen</li>
-    </ul>
-
-    <hr />
-
-    <h3>Anmerkungen des Übersetzers</h3>
-
-    <p>Die englische Vorlage dieser FAQ wird ständig überarbeitet. Daher liegt
-    die Übersetzung nicht immer auf dem aktuellsten Stand.</p>
-
-    <p>Die aktuellste Version der deutschen Übersetzung befindet sich immer unter
-    <a href="http://sql-info.de/de/postgresql/FAQ_german.html">http://sql-info.de/de/postgresql/FAQ_german.html</a>.
-    Diese "Arbeitsversion" enthält eventuell Änderungen, die noch nicht auf der 
-    PostgreSQL-Website eingebunden worden sind.</p>
-
-    <p>Über Verbesserungshinweise und Korrekturvorschläge sowie Verständnisfragen
-    zum Inhalt der FAQ freue ich mich. Ich nehme auch allgemeine Fragen zu PostgreSQL gerne
-    entgegen, verweise jedoch auf die Mailing-Listen als schnelle und zuverlässige
-    Anlaufstellen.</p>
-</body>
-</html>
diff --git a/doc/src/FAQ/FAQ_hungarian.html b/doc/src/FAQ/FAQ_hungarian.html
deleted file mode 100644
index af03d0cbbc..0000000000
--- a/doc/src/FAQ/FAQ_hungarian.html
+++ /dev/null
@@ -1,1668 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta content="text/html; charset=ISO-8859-1"
- http-equiv="content-type">
-  <title>PostgreSQL GYIK</title>
-</head>
-<body>
-<br>
-<div style="text-align: center;">
-<h1>PostgreSQL GyIK</h1>
-<br>
-</div>
-<br>
-<pre>Utols&oacute; m&oacute;dos&iacute;t&aacute;s d&aacute;tuma: 2005 m&aacute;jus 9.</pre>
-<pre>Ford&iacute;t&aacute;s aktualiz&aacute;l&aacute;sa: 2005 j&uacute;nius</pre>
-<pre><br>
-A GyIK karbantart&oacute;ja: Bruce Momjian (<a
- href="mailto:[email protected]">[email protected]</a>)</pre>
-<pre>Ford&iacute;t&oacute;: Horny&aacute;k L&aacute;szl&oacute;<br>(<a
- href="mailto:[email protected]">[email protected]</a>)</pre>
-<pre><br>
-A legfrissebb verzi&oacute; itt &eacute;rhet&otilde; el (angol):</pre>
-<pre><a href="http://www.PostgreSQL.org/docs/faq-english.html">http://www.PostgreSQL.org/docs/faq-english.html</a>.</pre>
-<pre><br>
-Legfrissebb magyar nyelv&ucirc; verzi&oacute;:</pre>
-<pre><a href="http://hackers.forgeahead.hu/space/PostgreSQL/GYIK">http://hackers.forgeahead.hu/space/PostgreSQL/GYIK</a></pre>
-<pre><br>
-Platform specifikus k&eacute;rd&eacute;sek:</pre>
-<pre><a href="http://www.PostgreSQL.org/users-lounge/docs/faq.htm">http://www.PostgreSQL.org/users-lounge/docs/faq.htm</a>l.</pre>
-<hr style="width: 100%; height: 2px;">
-<div style="text-align: center;">
-<h2>&Aacute;ltal&aacute;nos k&eacute;rd&eacute;sek</h2>
-</div>
-<a href="#1.1">1.1</a> Mi a PostgreSQL? Hogy kell kimondani?<br>
-<a href="#1.2">1.2</a> Mik a PostgreSQL felhaszn&aacute;l&aacute;si
-felt&eacute;telei?<br>
-<a href="#1.3">1.3</a> Milyen UNIX oper&aacute;ci&oacute;s
-rendszereken fut PostgreSQL?<br>
-<a href="#1.4">1.4</a> Milyen nem UNIX oper&aacute;ci&oacute;s
-rendszerek el&eacute;rhet&otilde;ek?<br>
-<a href="#1.5">1.5</a> Hogyan tudok PostgreSQL-t szerezni?<br>
-<a href="#1.6">1.6</a> Hogyan kapok
-term&eacute;kt&aacute;mogat&aacute;st?<br>
-<a href="#1.7">1.7</a> Melyik a legfrissebb kiad&aacute;s?<br>
-<a href="#1.8">1.8</a> Milyen dokument&aacute;ci&oacute; &aacute;ll
-rendelkez&eacute;sre?<br>
-<a href="#1.9">1.9</a> Hogyan tal&aacute;lok inform&aacute;ci&oacute;t
-hib&aacute;kr&oacute;l vagy hi&aacute;nyz&oacute;
-funkcional&iacute;t&aacute;sr&oacute;l?<br>
-<a href="#1.10">1.10</a> Hogy tanuljam meg az SQL nyelvet?<br>
-<a href="#1.11">1.11</a> A PostgreSQL 2000. &eacute;v kompatibilis?<br>
-<a href="#1.12">1.12</a> Hogyan lehet csatlakozni a fejleszt&otilde;
-csapathoz?<br>
-<a href="#1.13">1.13</a> Hogyan k&uuml;ldjek hibajelent&eacute;st?<br>
-<a href="#1.14">1.14</a> Milyen a PostgreSQL m&aacute;s DBMS-ekkel
-&ouml;sszehasonl&iacute;tva?<br>
-<a href="#1.15">1.15</a> Hogyan tudom &uuml;zletileg segiteni a
-PostgreSQL-t?<br>
-<a href="#1.16">1.16</a> Ki ir&aacute;ny&iacute;tja a PostgreSQL-t?<br>
-<br>
-<div style="text-align: center;">
-<h2>Felhaszn&aacute;l&oacute;i kliens k&eacute;rd&eacute;sek</h2>
-</div>
-<br>
-<a href="#2.1">2.1</a> Van ODBC meghajt&oacute; PostgreSQL-hez?<br>
-<a href="#2.2">2.2</a> Milyen eszk&ouml;z&ouml;k &aacute;llnak
-rendelkez&eacute;sre PostgreSQL Web fejleszt&eacute;sekhez?<br>
-<a href="#2.3">2.3</a> Van a PostgreSQL-hez grafikus
-felhaszn&aacute;l&oacute;i fel&uuml;let ? Riport gener&aacute;tor?
-Be&aacute;gyazott lek&eacute;rdez&otilde; nyelv fel&uuml;let?<br>
-<a href="#2.4">2.4</a> Milyen programoz&aacute;si nyelvekkel lehet
-el&eacute;rni a PostgreSQL szervert?<br>
-<br>
-<div style="text-align: center;">
-<h2>Adminisztr&aacute;ci&oacute;s k&eacute;rd&eacute;sek</h2>
-</div>
-<br>
-<a href="#3.1">3.1</a> Hogyan tudom a PostgreSQL-t /usr/local/pgsql
--t&otilde;l elt&eacute;r&otilde; helyre install&aacute;lni?<br>
-<a href="#3.2">3.2</a> AMikor elind&iacute;tom a postmaster-t, egy
-"Bad System Call"-t vagy core dump-ot kapok. Mi&eacute;rt?<br>
-<a href="#3.3">3.3</a> Amikor megpr&oacute;b&aacute;lom inditani a
-postmaster-t, "IpcMemoryCreate" hib&aacute;kat kapok. Mi&eacute;rt?<br>
-<a href="#3.4">3.4</a> Amikor megpr&oacute;b&aacute;lom inditani a
-postmaster-t, "IpcSemaphoreCreate" hib&aacute;kat kapok. Mi&eacute;rt?<br>
-<a href="#3.5">3.5</a> Hogyan tudom kontroll&aacute;lni a m&aacute;s
-g&eacute;pekr&otilde;l &eacute;rkez&otilde; kapcsolat
-k&eacute;r&eacute;seket?<br>
-<a href="#3.6">3.6</a> Hogyan tudom nagyobb
-teljes&iacute;tm&eacute;nyre hangolni az
-adatb&aacute;zisomat?<br>
-<a href="#3.7">3.7</a> Milyen hibakeres&otilde;
-lehet&otilde;s&eacute;gek
-&eacute;rhet&otilde;ek el?<br>
-<a href="#3.8">3.8</a> Mi&eacute;rt kapok "Sorry, too many clients"
-hib&aacute;t
-csatlakoz&aacute;sn&aacute;l?<br>
-<a href="#3.9">3.9</a> Mi van pgsql_tmp k&ouml;nyvt&aacute;rban?<br>
-<a href="#3.10">3.10</a> Mi&eacute;rt kell dumpolni &eacute;s
-&uacute;jrat&ouml;lteni
-PostgreSQL kiad&aacute;s v&aacute;lt&aacute;s&aacute;n&aacute;l?<br>
-<br>
-<div style="text-align: center;">
-<h2>M&ucirc;k&ouml;dtet&eacute;si k&eacute;rd&eacute;sek</h2>
-</div>
-<br>
-<a href="#4.1">4.1</a> Mi a k&uuml;l&ouml;nbs&eacute;g a bin&aacute;ris
-&eacute;s a
-norm&aacute;l kurzorok k&ouml;z&ouml;tt?<br>
-<a href="#4.2">4.2</a> Hogyan tudom select-elni a
-lek&eacute;rdez&eacute;s els&otilde;
-p&aacute;r sor&aacute;t?<br>
-<a href="#4.3">4.3</a> Hogy tudom kilist&aacute;zni a
-t&aacute;bl&aacute;kat vagy
-m&aacute;s dolgokat a PostgreSQL-ben?<br>
-<a href="#4.4">4.4</a> Hogyan tudok elt&aacute;vol&iacute;tani egy
-oszlopot egy
-t&aacute;bl&aacute;b&oacute;l?<br>
-<a href="#4.5">4.5</a> Mi a maxim&aacute;lis m&eacute;rete egy sornak,
-egy
-t&aacute;bl&aacute;nak vagy egy adatb&aacute;zisnak?<br>
-<a href="#4.6">4.6</a> Mekkora adatb&aacute;zis lemez ter&uuml;let
-sz&uuml;ks&eacute;ges
-egy tipikus sz&ouml;veg &aacute;llom&aacute;ny
-t&aacute;rol&aacute;s&aacute;hoz?<br>
-<a href="#4.7">4.7</a> Hogy tudhatom meg milyen t&aacute;bl&aacute;k,
-indexek,
-adatb&aacute;zisok vagy felhaszn&aacute;l&oacute;k vannak
-defini&aacute;lva?<br>
-<a href="#4.8">4.8</a> A lek&eacute;rdez&eacute;seim lass&uacute;ak,
-vagy nem
-haszn&aacute;lj&aacute;k az indexeket. Mi&eacute;rt?<br>
-<a href="#4.9">4.9</a> Hogy tudom ellen&otilde;rizni, hogy
-optimaliz&aacute;lta a
-lek&eacute;rdez&eacute;s optimaliz&aacute;l&oacute; a
-lek&eacute;rdez&eacute;sem?<br>
-<a href="#4.10">4.10</a> Mi az R-tree index?<br>
-<a href="#4.11">4.11</a> Mi a Genetic Query Optimizer?<br>
-<a href="4.12">4.12</a> Hogyan tudok regexp keres&eacute;st &eacute;s
-case-insensitive
-regexp keres&eacute;st haszn&aacute;lni? Hogyan tudok indexet
-haszn&aacute;lni case-insensitive keres&eacute;shez?<br>
-<a href="4.13">4.13</a> Hogyan tudom &eacute;szlelni egy
-lek&eacute;rdez&eacute;sban, ha
-egy mez&otilde; NULL?<br>
-<a href="#4.14">4.14</a> Mi a k&uuml;l&ouml;nbs&eacute;g a
-k&uuml;l&ouml;nb&ouml;z&otilde;
-karaktert&iacute;pusok k&ouml;z&ouml;tt?<br>
-<a href="#4.15.1">4.15.1</a> Hogyan tudok l&eacute;trehozni
-automatikusan
-n&ouml;vekv&otilde; &eacute;rt&eacute;k&ucirc; mez&otilde;t?<br>
-<a href="#4.15.2">4.15.2</a> Hogyan kaphatom meg egy SERIAL
-besz&uacute;r&aacute;s
-&eacute;rt&eacute;k&eacute;t?<br>
-<a href="#4.15.3">4.15.3</a> A currval() &eacute;s a nextval() nem
-teremt holtpont
-vesz&eacute;lyes helyzetet a felhaszn&aacute;l&oacute;k
-k&ouml;z&ouml;tt?<br>
-<a href="#4.15.4">4.15.4</a> Mi&eacute;rt nem
-haszn&aacute;l&oacute;dnak fel &uacute;jra a
-sequence sz&aacute;mok tranzakci&oacute; abort eset&eacute;n?
-Mi&eacute;rt vannak probl&eacute;m&aacute;k a serial oszlopok
-sz&aacute;moz&aacute;s&aacute;val?<br>
-<a href="#4.16">4.16</a> Mi a OID? Mi a TID?<br>
-<a href="#4.17">4.17</a> Mi a PostgreSQL-ben haszn&aacute;lt
-kifejez&eacute;sek
-jelent&eacute;se?<br>
-<a href="#4.18">4.18</a> Mi&eacute;rt kapom ezt a hib&aacute;t: "ERROR:
-Memory exhausted
-in AllocSetAlloc()"?<br>
-<a href="#4.19">4.19</a> Hogyan tudhatom meg PostgreSQL, milyen
-verzi&oacute;t futtatok?<br>
-<a href="#4.20">4.20</a> Mi&eacute;rt kapok "invalid large obj
-descriptor" hib&aacute;t
-nagy objektumok kezel&eacute;s&eacute;n&eacute;l?<br>
-<a href="#4.21">4.21</a> Hogy hozhatok l&eacute;tre olyan oszlopot,
-aminek
-alap&eacute;rtelmezett &eacute;r&eacute;tke a jelenlegi id&otilde;?<br>
-<a href="#4.22">4.22</a> Mi&eacute;rt olyan lass&uacute;ak az
-al-lek&eacute;rdez&eacute;seim IN-nel?<br>
-<a href="#4.23">4.23</a> Hogyan tudok outer join-t v&eacute;grehajtani?<br>
-<a href="#4.24">4.24</a> Hogyan tudok t&ouml;bb adatb&aacute;zison
-v&eacute;grehajtani
-lek&eacute;rdez&eacute;st?<br>
-<a href="#4.25">4.25</a> Hogy tudok t&ouml;bb soros vagy oszlopos
-eredm&eacute;nyt
-visszaadni egy funkci&oacute;b&oacute;l?<br>
-<a href="#4.26">4.26</a> Mi&eacute;rt nem tudom megbizhat&oacute;an
-l&eacute;trehozni
-&eacute;s t&ouml;r&ouml;lni az &aacute;tmeneti t&aacute;bl&aacute;kat a
-PL/pgSQL funkci&oacute;kban?<br>
-<a href="#4.27">4.27</a> Milyen replik&aacute;ci&oacute;s
-lehet&otilde;s&eacute;gek vannak?<br>
-<a href="#4.28">4.28</a> Milyen k&oacute;dol&aacute;si
-lehet&otilde;s&eacute;gek vannak?<br>
-<br>
-<div style="text-align: center;">
-<h2>A PostgreSQL kiterjeszt&eacute;se</h2>
-</div>
-<br>
-<a href="#5.1">5.1</a>) &Iacute;rtam egy felhaszn&aacute;l&oacute;i
-funkci&oacute;t.
-Mi&eacute;rt core dumpol az adatb&aacute;zis amikor haszn&aacute;lom?<br>
-<a href="#5.1">5.2</a>) Hogyan lehet &uacute;j adatt&iacute;pusokat
-&eacute;s
-funkci&oacute;kat hozz&aacute;adni a PostgreSQL
-disztrib&uacute;ci&oacute;hoz?<br>
-<a href="#5.3">5.3</a>) Hogyan lehet olyan C funkci&oacute;t
-&iacute;rni, ami Tuple-t ad
-vissza? (t&ouml;bb soros t&ouml;bb oszlopos eredm&eacute;nyek)<br>
-<a href="#5.4">5.4</a>) Megv&aacute;ltoztattam egy forr&aacute;s
-&aacute;llom&aacute;nyt.
-Mi&eacute;rt nem v&aacute;ltozik a bin&aacute;ris
-&uacute;jraford&iacute;t&aacute;s ut&aacute;n?<br>
-<hr style="width: 100%; height: 2px;">
-<h2 style="text-align: center;"> &Aacute;ltal&aacute;nos
-k&eacute;rd&eacute;sek</h2>
-<br>
-<a name="1.1"></a><big style="text-decoration: underline;">1.1 Mi a
-PostgreSQL? Hogy kell kimondani?</big><br>
-<p>&Iacute;gy ejstd ki: Post-Gres-Q-L.</p>
-<p>(Vagy tal&aacute;n ink&aacute;bb t&ouml;ltsd le a kis mp3-at a
-PostgreSQL homepage-r&otilde;l)</p>
-<p>A PostgreSQL a POSTGRES adatb&aacute;zis management rendszer egy
-kieg&eacute;sz&iacute;t&eacute;se, ami egy k&ouml;vetkez&otilde;
-gener&aacute;ci&oacute;s DBMS kutat&aacute;si protot&iacute;pus.
-Megtartja a POSTGRES adatmodell&eacute;t &eacute;s gazdag
-adatt&iacute;pus v&aacute;laszt&eacute;k&aacute;t, de a PostQuel
-lek&eacute;rdez&otilde; nyelvet az SQL egy kiterjesztett
-verzi&oacute;j&aacute;val helyettes&iacute;ti. A PostgreSQL szabad
-&eacute;s a teljes forr&aacute;sk&oacute;d
-hozz&aacute;f&eacute;rhet&otilde;.</p>
-<p>A PostgreSQL fejleszt&eacute;s&eacute;t egy csapat v&eacute;gzi,
-amelynek minden tagja megtal&aacute;lhat&oacute; a PostgreSQL
-fejleszt&otilde;i levelez&eacute;si list&aacute;n. A jelenlegi
-koordin&aacute;tor
-Marc G. Fournier ([email protected]). Ez a csapat felel&otilde;s
-minden fejleszt&eacute;s&eacute;rt. &lt;&gt;A PostgreSQL 1.01
-alkot&oacute;i
-Andrew Yu &eacute;s Jolly Chen voltak. Sokan j&aacute;rultak
-hozz&aacute; portol&aacute;ssal, tesztel&eacute;ssel,
-hibakeres&eacute;ssel &eacute;s fejleszt&eacute;ssel. Az eredeti
-Postgres k&oacute;d, amib&otilde;l a PostgreSQL sz&aacute;rmazik
-Michael Stonebraker professzor ir&aacute;ny&iacute;t&aacute;sa alatt
-fejlesztettek az egyetem programoz&oacute;i, tanul&oacute;i &eacute;s
-v&eacute;gzett tanul&oacute;i. &lt;&gt;</p>
-<p>A szoftver eredeti neve Postgres volt. Amikor SQL
-funkcional&iacute;t&aacute;ssal eg&eacute;sz&iacute;tett&eacute;k ki
-1995-ben, a nev&eacute;t Postgres95-re v&aacute;ltoztatt&aacute;k. 1996
-v&eacute;g&eacute;n kapta mai nev&eacute;t. </p>
-<br>
-<a name="1.2"></a> <big style="text-decoration: underline;">1.2 Mik a
-PostgreSQL felhaszn&aacute;l&aacute;si
-felt&eacute;telei?</big><br>
-<br>
-<pre>   Az eredeti angol copyright sz&ouml;veg: </pre>
-<pre>   -------------------- </pre>
-<pre>   PostgreSQL is subject to the following COPYRIGHT:</pre>
-<pre><br>   PostgreSQL Data Base Management System</pre>
-<pre><br>   Portions copyright (c) 1996-2002, PostgreSQL Global Development Group</pre>
-<pre>   Portions Copyright (c) 1994-6 Regents of the University of California</pre>
-<pre><br>   Permission to use, copy, modify, and distribute this software and its</pre>
-<pre>   documentation for any purpose, without fee, and without a written</pre>
-<pre>   agreement is hereby granted, provided that the above copyright notice</pre>
-<pre>   and this paragraph and the following two paragraphs appear in all</pre>
-<pre>   copies.</pre>
-<pre><br>   IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY</pre>
-<pre>   FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,</pre>
-<pre>   INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND</pre>
-<pre>   ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN</pre>
-<pre>   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</pre>
-<pre><br>   THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,</pre>
-<pre>   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF</pre>
-<pre>   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE</pre>
-<pre>   PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF</pre>
-<pre>   CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,</pre>
-<pre>   UPDATES, ENHANCEMENTS, OR MODIFICATIONS.</pre>
-<pre>   --------------------</pre>
-<p><br>
-</p>
-Ami nagyon leegyszer&ucirc;s&iacute;tve azt jelenti, hogy jogod van
-haszn&aacute;lni a szoftvert mindenf&eacute;le
-ellenszolg&aacute;ltat&aacute;s (p&eacute;nz, stb) n&eacute;lk&uuml;l,
-a forr&aacute;s k&oacute;dot m&oacute;dos&iacute;thatod, &eacute;s
-tov&aacute;bbadhatod, DE semmilyen, a szoftver
-haszn&aacute;lat&aacute;b&oacute;l k&ouml;vetkez&otilde;
-k&aacute;rosod&aacute;s&eacute;rt nem v&aacute;llal garanci&aacute;t a
-fejleszt&otilde;. A fenti a BSD licensz, egy klasszikus
-nyilt-forr&aacute;sk&oacute;d licensz. Nem tartalmaz
-megszor&iacute;t&aacute;sokat arra, hogy a forr&aacute;sk&oacute;dot
-hogyan haszn&aacute;lod fel.
-<p> Kedvelj&uuml;k ezt a licensz form&aacute;t &eacute;s nem &aacute;ll
-sz&aacute;nd&eacute;kunkban megv&aacute;ltoztatni.</p>
-<a name="1.3"></a> <big><span style="text-decoration: underline;">1.3
-Milyen UNIX oper&aacute;ci&oacute;s
-rendszereken fut PostgreSQL?</span></big><br>
-<p>&Aacute;ltal&aacute;ban minden UNIX-kompatibilis
-oper&aacute;ci&oacute;s rendszer k&eacute;pes arra hogy futtassa a
-PostgreSQL-t. Azokat a platformokat, amiken tesztelt&eacute;k a
-kiad&aacute;st
-megtal&aacute;lhatod a install&aacute;ci&oacute;s
-utas&iacute;t&aacute;sok k&ouml;z&ouml;tt. </p>
-<a name="1.4"></a> <big><span style="text-decoration: underline;">1.4
-Milyen nem UNIX oper&aacute;ci&oacute;s
-rendszerek el&eacute;rhet&otilde;ek?</span></big><br>
-<br>
-<p>Kliens<br>
-</p>
-<p>A libpq C f&uuml;ggv&eacute;nyk&ouml;nyvt&aacute;rat, a psql-t
-&eacute;s m&aacute;s fel&uuml;leteket le lehet &uacute;gy
-ford&iacute;tani, hogy fussanak MS Windows oper&aacute;ci&oacute;s
-rendszereken. Ebben az esetben a kliens MS Windows-on fut &eacute;s
-TCP/IP seg&iacute;ts&eacute;g&eacute;vel kommunik&aacute;l a Unixon
-fut&oacute; szerverrel. A "win32.mak" &aacute;llom&aacute;ny a
-kiad&aacute;s r&eacute;sze, ennek seg&iacute;ts&eacute;g&eacute;vel
-lehet Win32 platformokra leford&iacute;tani a libpq-t &eacute;s a
-psql-t. A PostgreSQL ODBC kliensekkel is k&eacute;pes
-kommunik&aacute;lni.</p>
-<p>
-Szerver</p>
-&lt;&gt;Az adatb&aacute;zis szerver Cygwin
-seg&iacute;ts&eacute;g&eacute;vel
-fut Windows NT &eacute;s Win2k rendszereken. Tov&aacute;bbi
-inform&aacute;ci&oacute;
-tal&aacute;lhat&oacute; a pgsql/doc/FAQ_MSWIN &aacute;llom&aacute;nyban
-&eacute;s a MS Windows FAQ-ban a k&ouml;vetkez&otilde; helyen: <a
- href="http://www.PostgreSQL.org/docs/faq-mswin.html">http://www.PostgreSQL.org/docs/faq-mswin.html</a>.&nbsp;
-Nat&iacute;v MS Windows NT/2000/XP portok jelenleg fejleszt&eacute;s
-alatt &aacute;llnak.<br>
-<br>
-<a name="1.5"></a> <big style="text-decoration: underline;">1.5 Hogyan
-tudok PostgreSQL-t szerezni?</big><br>
-<p>Az els&otilde;dleges anonim ftp oldal: <a
- href="ftp://ftp.PostgreSQL.org/pub">ftp://ftp.PostgreSQL.org/pub</a>. </p>
-<p>A t&uuml;k&ouml;r oldalak list&aacute;ja megtal&aacute;lhat&oacute;
-a
-f&otilde; weboldalunkon.</p>
-<a name="1.6"></a> <big style="text-decoration: underline;">1.6 Hogyan
-kapok
-term&eacute;kt&aacute;mogat&aacute;st?</big><br>
-<br>
-<p>Az els&otilde;dleges lista a <a
- href="mailto:[email protected]">[email protected]</a>.
-Ez
-haszn&aacute;lhat&oacute; a PostgreSQL-lel kapcsolatos
-p&aacute;rbesz&eacute;dekre. Ha fel
-szeretn&eacute;l &iacute;ratkozni, k&uuml;ldj egy levelet a
-k&ouml;vetkez&otilde; tartalommal (nem
-t&aacute;rggyal) a<a
- href="mailto:%[email protected]">
[email protected]</a> c&iacute;mre:</p>
-<pre>
-subscribe</pre>
-<pre>
-end </pre>
-<br>
-Van egy hib&aacute;kkal kapcsolatos levelez&eacute;si lista is:
[email protected] a k&ouml;vetkez&otilde; tartalommal:<br>
-<br>
-<pre>
-subscribe</pre>
-<pre>
-end
-</pre>
-<p>A fejleszt&#337;i levelez&eacute;si lista:<a
- href="mailto:[email protected]">
[email protected]</a> a k&ouml;vetkez&otilde;
-tartalommal:</p>
-<pre>
-subscribe</pre>
-<pre>
-end</pre>
-<br>
-Egy&eacute;b levelez&eacute;si list&aacute;k
-tal&aacute;lhat&oacute;ak
-a weboldalunkon: <a href="http://www.PostgreSQL.org">http://www.PostgreSQL.org</a>
-<p>Van egy IRC csatorna is <a href="irc://irc.freenode.net/#postgresql">#PostgreSQL</a>
-n&eacute;ven ahol felteheted
-k&eacute;r&eacute;dseid. A k&ouml;vetkez&otilde; unix paranccsal
-csatlakozhatsz:
-</p>
-<p>irc -c '#PostgreSQL' "$USER" irc.phoenix.net.</p>
-<p>
-A kereskedelmi term&eacute;kt&aacute;mogat&aacute;st
-ny&uacute;jt&oacute; c&eacute;gek list&aacute;ja el&eacute;rhet&ouml;
-itt:<a
- href="http://www.PostgreSQL.org/users-lounge/commercial-support.html">
-http://www.PostgreSQL.org/users-lounge/commercial-support.html</a><br>
-</p>
-<p>Magyar nyelv&#369; levelez&eacute;si lista nincs, de ha tudok segiteni a
-fenit e-mail cimemen el&eacute;rhet&#337; vagyok.</p>
-<a name="1.7"></a> <big style="text-decoration: underline;">1.7 Melyik
-a legfrissebb kiad&aacute;s?</big><br>
-<p>A legfrissebb PostgreSQL kiad&aacute;s a 8.0.</p>
-<p>A tervek szerint minden &eacute;vben lesz egy nagyobb
-fejleszt&eacute;seket tartalmaz&oacute; kiad&aacute;s, m&iacute;g a
-kisebb fejleszt&eacute;seket n&eacute;h&aacute;ny havonta adjuk ki.<br>
-</p>
-<a name="1.8"></a> <big style="text-decoration: underline;">1.8 Milyen
-dokument&aacute;ci&oacute; &aacute;ll
-rendelkez&eacute;sre?</big><br>
-<p>Sz&aacute;mos k&eacute;zik&ouml;nyv, man oldalak &eacute;s kis teszt
-p&eacute;ld&aacute;k tal&aacute;lhat&oacute;ak a kiad&aacute;sban a
-doc/ k&ouml;nyvt&aacute;r alatt. Az interneten is olvashatod a
-dokument&aacute;ci&oacute;t a k&ouml;vetkez&otilde; c&iacute;men:</p>
-<p><a href="http://www.PostgreSQL.org/users-lounge/docs/">http://www.PostgreSQL.org/users-lounge/docs/</a>.</p>
-<p>K&eacute;t PostgreSQL k&ouml;nyv &eacute;rhet&otilde; el az
-interneten
-a <a href="http://www.PostgreSQL.org/docs/awbook.html">http://www.PostgreSQL.org/docs/awbook.html</a>
-&eacute;s a <a href="http://www.commandprompt.com/ppbook/">http://www.commandprompt.com/ppbook/</a>
-c&iacute;meken. A megv&aacute;s&aacute;rolhat&oacute; k&ouml;nyvek
-list&aacute;ja itt
-tal&aacute;lhat&oacute;: <a href="http://www.ca.PostgreSQL.org/books/">http://www.ca.PostgreSQL.org/books/</a>.
-A PostgreSQL-lel kapcsolatos technikai jelleg&ucirc; cikkek
-gy&ucirc;jtem&eacute;nye: <a href="http://techdocs.PostgreSQL.org/">http://techdocs.PostgreSQL.org/</a>.</p>
-<p>A psql parancs rendelkezik n&eacute;h&aacute;ny \d
-utas&iacute;t&aacute;ssal, amellyekkel list&aacute;zhat&oacute;ak az
-oper&aacute;torok, a funkci&oacute;k, stb.</p>
-<p>A website is tartalmaz tov&aacute;bbi dokument&aacute;ci&oacute;kat.</p>
-<a name="1.9"></a> <big style="text-decoration: underline;">1.9 Hogyan
-tal&aacute;lok inform&aacute;ci&oacute;t
-hib&aacute;kr&oacute;l vagy hi&aacute;nyz&oacute;
-funkcional&iacute;t&aacute;sr&oacute;l?</big><br>
-<p>A PostgreSQLaz SQL-92 szabv&aacute;ny egy
-kieg&eacute;sz&iacute;t&eacute;se. N&eacute;zd meg a TODO
-list&aacute;kat ha &eacute;rdekelnek az ismert hib&aacute;k.</p>
-<a name="1.10"></a> <big style="text-decoration: underline;">1.10 Hogy
-tanuljam meg az SQL nyelvet?</big><br>
-<br>
-<p>A PostgreSQL k&ouml;nyv a
-<a href="http://www.PostgreSQL.org/docs/awbook.html">http://www.PostgreSQL.org/docs/awbook.html</a>
-c&iacute;men tartalmaz SQL
-alapokat. El&eacute;rhet&otilde; egy
-m&aacute;sik SQL k&ouml;nyv is a <a
- href="http://www.commandprompt.com/ppbook">http://www.commandprompt.com/ppbook</a>
-c&iacute;men. Egy sz&eacute;p
-oktat&oacute; anyag tal&aacute;lhat&oacute; a
-<a href="http://www.intermedia.net/support/sql/sqltut.shtm">http://www.intermedia.net/support/sql/sqltut.shtm</a>,
-a
-<a
- href="http://ourworld.compuserve.com/homepages/graeme_birchall/HTM_COOK.HTM">http://ourworld.compuserve.com/homepages/graeme_birchall/HTM_COOK.HTM</a>
-&eacute;s a <a href="http://sqlcourse.com">http://sqlcourse.com</a>
-oldalakon.
-</p>
-<p>Egy m&aacute;sik lehet&otilde;s&eacute;g a "Tan&iacute;tsd magad 21
-nap
-alatt SQL-re, m&aacute;sodik kiad&aacute;s" a
-<a href="http://members.tripod.com/er4ebus/sql/index.htm">http://members.tripod.com/er4ebus/sql/index.htm</a>.</p>
-<p>
-Sok felhaszn&aacute;l&oacute;nak tetszett a gyakorlati SQL k&ouml;nyv
-("The Practical SQL Handbook"). </p>
-<br>
-<a name="1.11"></a> <big style="text-decoration: underline;">1.11 A
-PostgreSQL 2000. &eacute;v kompatibilis?</big><br>
-<br>
-<p>Igen, k&ouml;nnyed&eacute;n kezeli a 2000 ut&aacute;ni &eacute;s
-id&otilde;sz&aacute;m&iacute;t&aacute;sunk el&ouml;tt 2000 el&ouml;tti
-d&aacute;tumokat is. </p>
-<br>
-<a name="1.12"></a> <big style="text-decoration: underline;">1.12
-Hogyan lehet csatlakozni a fejleszt&otilde;
-csapathoz?</big><br>
-<br>
-El&ouml;ssz&ouml;r is t&ouml;ltsd le a forr&aacute;sk&oacute;dot,
-&eacute;s olvasd el a PostgreSQL<br>
-fejleszt&otilde;i dokumnet&aacute;ci&oacute;t a web oldalunkon vagy a
-kiad&aacute;sban. Ezut&aacute;n<br>
-&iacute;ratkozz fel a pgsql-hackers &eacute;s a pgsql-patches
-levelez&eacute;si list&aacute;kra.<br>
-V&eacute;g&uuml;l pedig k&uuml;ldj be magas szinvonal&uacute;
-patch-eket a pgsql-patches list&aacute;ra.<br>
-<br>
-Van egy p&aacute;r ember, akiknek commit privil&eacute;giumuk a
-PostgreSQL CVS f&aacute;n.<br>
-&Otilde;k olyan sok magas szinvonal&uacute; patch-et k&uuml;ldtek be,
-hogy az addigi <br>
-csapat m&aacute;r nem tudta k&ouml;vetni, &eacute;s nem volt
-k&eacute;ts&eacute;g&uuml;nk arr&oacute;l, hogy a<br>
-patch-ek amiket &otilde;k k&uuml;ldenek j&oacute;
-min&otilde;s&eacute;g&ucirc;.<br>
-<br>
-<a name="1.13"></a> <big style="text-decoration: underline;">1.13
-Hogyan k&uuml;ldjek hibajelent&eacute;st?</big><br>
-<br>
-L&aacute;togass el a BugTool oldalra: <br>
-<a href="http://www.PostgreSQL.org/bugs/bugs.php">http://www.PostgreSQL.org/bugs/bugs.php</a><br>
-Itt megtal&aacute;lod k&ouml;vetend&otilde; utas&iacute;t&aacute;sokat.<br>
-<br>
-Ellen&otilde;rizd az ftp oldalunkon is, hogy nincs-e &uacute;jabb
-verzi&oacute; vagy folt.<br>
-<a href="ftp://ftp.PostgreSQL.org/pub">ftp://ftp.PostgreSQL.org/pub </a><br>
-<br>
-<a name="1.14"></a><big style="text-decoration: underline;">1.14 Milyen
-a PostgreSQL m&aacute;s DBMS-ekkel
-&ouml;sszehasonl&iacute;tva?</big><br>
-<p>Sz&aacute;mos n&eacute;z&otilde;pontb&oacute;l lehet
-vizsg&aacute;lni
-a
-szoftvert: k&eacute;pess&eacute;gek, teljes&iacute;tm&eacute;ny
-megb&iacute;zhat&oacute;s&aacute;g, t&aacute;mogatotts&aacute;g
-&eacute;s &aacute;r.</p>
-<span style="text-decoration: underline;">K&eacute;pess&eacute;gek:</span>
-A PostgreSQL rendelkezik a nagy, kereskedelmi DBMS-ek
-k&eacute;pess&eacute;geivel: tranzakci&oacute;k,
-al-lek&eacute;rdez&eacute;sek, triggerek,
-n&eacute;zetek, k&uuml;ls&otilde; kulcsok, integr&iacute;t&aacute;s
-&eacute;s kifinoult z&aacute;rmechanizmusok.
-Van n&eacute;h&aacute;ny k&eacute;pess&eacute;ge, ami a kereskedelmi
-adatb&aacute;zisokb&oacute;l hi&aacute;nyzik, mint
-p&eacute;ld&aacute;ul a felhaszn&aacute;l&oacute; &aacute;ltal
-defini&aacute;lt t&iacute;pusok,
-&ouml;r&ouml;kl&otilde;d&eacute;s, szab&aacute;lyok &eacute;s
-verzi&oacute; kontroll a z&aacute;rol&aacute;si vit&aacute;k
-reduk&aacute;l&aacute;s&aacute;&eacute;rt.
-<p><span style="text-decoration: underline;">Teljes&iacute;tm&eacute;ny:</span>
-A PostgreSQL teljes&iacute;tm&eacute;nye hasonl&iacute;t a
-kereskedelmi
-&eacute;s m&aacute;s ny&iacute;lt adatb&aacute;zis
-szerverek&eacute;hez. Lehet bizonyos esetekben
-lassabb, m&aacute;sokban gyorsabb. A MySQL nev&ucirc; tanul&oacute;
-RDBMS p&eacute;ld&aacute;ul gyorsabban hajt v&eacute;gre insert/update
-m&ucirc;veleteket, mivel a tranzakci&oacute;kat
-elsum&aacute;kolja. Persze a MySQL nem rendelkezik a
-k&eacute;pess&eacute;gek
-r&eacute;szben felsoroltak nagy r&eacute;sz&eacute;vel. Mi a
-megb&iacute;zhat&oacute;s&aacute;gra
-&eacute;s a k&eacute;pess&eacute;gekre &eacute;p&iacute;t&uuml;nk,
-b&aacute;r a teljes&iacute;tm&eacute;ny is n&otilde; minden
-kiad&aacute;ssal. Van
-egy &eacute;rdekes oldal a MySQL &eacute;s a PostgreSQL
-&ouml;sszehasonl&iacute;t&aacute;s&aacute;val a
-<a href="http://openacs.org/philosophy/why-not-mysql.html">http://openacs.org/philosophy/why-not-mysql.html
-</a>c&iacute;men.
-</p>
-<p><span style="text-decoration: underline;">Megb&iacute;zhat&oacute;s&aacute;g:</span>
-Tudjuk hogy ha egy DBMS nem megb&iacute;zhat&oacute;, akkor
-teljesen
-haszontalan. Igyeksz&uuml;nk j&oacute;l tesztelt, stabil k&oacute;dot
-kiadni, amiben
-a lehet&otilde; legkevesebb hiba van. Minden kiad&aacute;s
-el&ouml;tt eltellik
-legal&aacute;bb 1 h&oacute;nap b&eacute;ta teszt, &eacute;s a
-kiad&aacute;si
-t&ouml;rt&eacute;net is azt mutatja, hogy stabil k&oacute;dot adunk ki,
-ami k&eacute;szen &aacute;ll a
-produkt&iacute;v felhaszn&aacute;l&aacute;sra. &Uacute;gy gondoljuk,
-fel&uuml;lm&uacute;lunk m&aacute;s
-adatb&aacute;zis szoftvereket ezen a t&eacute;ren.
-</p>
-<p></p>
-<p><span style="text-decoration: underline;">T&aacute;mogat&aacute;s:</span>
-A levelez&eacute;si list&aacute;ink kapcsolatot teremtenek a
-fejleszt&otilde;k &eacute;s felhaszn&aacute;l&oacute;k
-csoportj&aacute;val , akik
-seg&iacute;tenek a probl&eacute;m&aacute;k megold&aacute;s&aacute;ban.
-B&aacute;r nem tudjuk garant&aacute;lni
-hogy ki tudjuk jav&iacute;tani a hib&aacute;t, m&aacute;s, kereskedelmi
-adatb&aacute;zis c&eacute;gek sem tudj&aacute;k. A fejleszt&otilde;
-csoport k&ouml;zvetlen el&eacute;r&eacute;si
-lehet&otilde;s&eacute;ge, a k&ouml;z&ouml;ss&eacute;g, a
-dokument&aacute;ci&oacute; &eacute;s a forr&aacute;sk&oacute;d
-gyakran t&aacute;mogat&aacute;st biztos&iacute;t, mint m&aacute;s
-adatb&aacute;zisokn&aacute;l. Van kereskedelmi, alkalmi
-t&aacute;mogat&aacute;s azoknak, akiknek sz&uuml;ks&eacute;ge van
-r&aacute; (l&aacute;sd: 1.6).
-</p>
-<p></p>
-<p><span style="text-decoration: underline;">&Aacute;r:</span> A
-PostgreSQL szabad b&aacute;rmilyen
-felhaszn&aacute;l&aacute;sra,
-ak&aacute;r kereskedelmire is. A term&eacute;khez hozz&aacute;adhatod a
-saj&aacute;t
-forr&aacute;sk&oacute;djaidat korl&aacute;toz&aacute;s
-n&eacute;lk&uuml;l.</p>
-<a name="1.15"></a> <big style="text-decoration: underline;">1.15
-Hogyan tudom &uuml;zletileg segiteni a
-PostgreSQL-t?</big><br>
-<p>A PostgreSQL els&otilde; oszt&aacute;ly&uacute;
-infrastrukt&uacute;r&aacute;val rendelkezik, amit 1996-ban
-ind&iacute;tottunk el. Mindent Marc Fourniernek
-k&ouml;sz&ouml;nhet&uuml;nk, aki l&eacute;trehozta &eacute;s
-karbantartja a rendszert.
-</p>
-<p>A min&otilde;s&eacute;gi infrastrukt&uacute;ra nagyon fontos egy
-nyilt
-forr&aacute;s&uacute; szoftver eset&eacute;ben. Megv&eacute;d az olyan
-fennakad&aacute;sokt&oacute;l,
-amelyek komoly k&eacute;s&eacute;seket okoznak a
-fejleszt&eacute;sekben. Term&eacute;szetesen ez az
-infrastrukt&uacute;ra nem olcs&oacute;.
-Sz&aacute;mos havi &eacute;s &aacute;lland&oacute; kiad&aacute;sunk
-van. Ha a c&eacute;gednek van p&eacute;nze, amivel
-t&aacute;mogatn&aacute; er&otilde;fesz&iacute;t&eacute;seinket,
-k&eacute;rlek l&aacute;togass el a <a
- href="http://store.pgsql.com/shopping/">http://store.pgsql.com/shopping/</a>
-oldalra.</p>
-<p>
-B&aacute;r a weboldal "PostgreSQL, Inc"-k&eacute;nt
-eml&iacute;ti, a
-hozz&aacute;j&aacute;rul&aacute;sok kiz&aacute;r&oacute;lag a
-PostgreSQL fejleszt&eacute;sre &eacute;rtend&oacute;ek, &eacute;s nem
-egy meghat&aacute;rozott c&eacute;gnek. Ha jobban tetszik,
-k&uuml;ldhetsz csekket is a kapcsolati c&iacute;mek
-b&aacute;rmelyik&eacute;re.</p>
-<p><big style="text-decoration: underline;"><a name="1.16"></a>1.16 Ki
-ir&aacute;ny&iacute;tja a PostgreSQL-t?<br>
-</big></p>
-<p><big style="text-decoration: underline;"><small><span
- style="text-decoration: underline;"></span></small></big><big><small>Ha
-k&ouml;zponti bizotts&aacute;got, ellen&ouml;rz&#337; c&eacute;get keresel a
-PostgreSQL m&ouml;g&ouml;tt, add fel, nincs ilyesmi. L&eacute;tezik egy
-mag &eacute;s CVS commiter csoport, de ez ink&aacute;b adminisztrativ
-mint ellen&ouml;rz&#337; c&eacute;l&uacute;. A projectet fejleszt&#337;k
-&eacute;s felhaszn&aacute;l&oacute;k k&ouml;z&ouml;ss&eacute;ge
-ir&aacute;ny&iacute;tja, amihez b&aacute;rki csatlakozhat.
-Csup&aacute;n annyit kell tenned hogy fel&iacute;ratkozol a
-levelez&#337;list&eacute;kra &eacute;s r&eacute;szt veszel a
-besz&eacute;lget&eacute;sekben.</small></big><big
- style="text-decoration: underline;"><small><span
- style="text-decoration: underline;"></span></small></big></p>
-<p></p>
-<hr style="width: 100%; height: 2px;">
-<h2 style="text-align: center;">Felhaszn&aacute;l&oacute;i kliens
-k&eacute;rd&eacute;sek</h2>
-<br>
-<a name="2.1"></a> <big style="text-decoration: underline;">2.1 Van
-ODBC meghajt&oacute; PostgreSQL-hez?</big><br>
-<p>K&eacute;t ODBC meghajt&oacute; &eacute;rhet&otilde; el: PsqlODBC
-&eacute;s a OpenLink ODBC.</p>
-<p>A PsqlODBC a PostgreSQL kiad&aacute;s r&eacute;sze. Tov&aacute;bbi
-inform&aacute;ci&oacute; tal&aacute;lhat&oacute; a&nbsp;
-ftp://ftp.PostgreSQL.org/pub/odbc/ oldalon.</p>
-<p>Az OpenLink ODBC-t a <a href="http://www.openlinksw.com">http://www.openlinksw.com</a>
-c&iacute;mr&otilde;l
-t&ouml;ltheted le. Ez az &otilde; szabv&aacute;nyos ODBC kliens
-szoftver&uuml;kkel
-m&ucirc;k&ouml;dik, &iacute;gy minden</p>
-<p>&aacute;ltaluk t&aacute;mogatott platformon (Win, Mac, Unix, VMS)
-el&eacute;rhet&otilde; lesz&nbsp; a PostgreSQL szerver.</p>
-<p>Tal&aacute;n olyan vev&otilde;knek fogj&aacute;k eladni, akik
-kereskedelmi min&otilde;s&eacute;g&ucirc; term&eacute;ket
-szeretn&eacute;nek kapni, de a freeware verzi&oacute; mindig
-el&eacute;rhet&otilde; lesz. K&eacute;rd&eacute;seidet a
-term&eacute;kkel kapcsolatban a [email protected]
-c&iacute;men teheted fel.</p>
-<p>Olvasd el az ODBC fejezetet is a programoz&oacute;k
-k&eacute;zik&ouml;nyv&eacute;ben!</p>
-<p><a name="2.2"></a><big style="text-decoration: underline;">2.2
-Milyen
-eszk&ouml;z&ouml;k &aacute;llnak
-rendelkez&eacute;sre PostgreSQL Web fejleszt&eacute;sekhez?</big></p>
-<p>Egy sz&eacute;p bemutat&oacute; olvashat&oacute; az
-adatb&aacute;zissal
-t&aacute;mogatott web oldalanr&oacute;l a http://www.webreview.com
-weboldalon.</p>
-<p>A web integr&aacute;ci&oacute;hoz a PHP egy kiv&aacute;ll&oacute;
-szoftver. Let&ouml;lthet&otilde; a <a href="http://www.php.net">http://www.php.net</a>
-c&iacute;mr&otilde;l. </p>
-<p>Komplexebb esetekre sokan haszn&aacute;lj&aacute;k a Perl
-fel&uuml;letet &eacute;s a CGI.pm vagy a mod_perl-t.</p>
-<p><a name="2.3"></a><big style="text-decoration: underline;">2.3 Van a
-PostgreSQL-hez grafikus
-felhaszn&aacute;l&oacute;i fel&uuml;let?</big></p>
-<p>Van egy sz&eacute;p PgAccess nev&ucirc; grafikus
-fel&uuml;let&uuml;nk,
-ami riport gener&aacute;tork&eacute;nt is haszn&aacute;lhat&oacute;. A
-weboldal&aacute;t megtal&aacute;lod a
-<a href="http://www.pgaccess.org/">http://www.pgaccess.org/</a>
-c&iacute;men.</p>
-<p>A <a href="http://techdocs.postgresql.org/guides/GUITools">http://techdocs.postgresql.org/guides/GUITools</a>
-oldalon tal&aacute;lhatsz egy pontos &eacute;s r&eacute;szltes
-list&aacute;t.<br>
-</p>
-<p><a name="2.4"></a><big style="text-decoration: underline;">2.4
-Milyen
-programoz&aacute;si nyelvekkel lehet
-el&eacute;rni a PostgreSQL szervert?</big></p>
-<p>A k&ouml;vetkez&ouml;k: </p>
-<ul>
-  <li>C (libpq)</li>
-  <li>C++ (libpq++)</li>
-  <li>Embedded C (ecpg)</li>
-  <li>Java (jdbc)</li>
-  <li>Perl (DBD::Pg and perl5)</li>
-  <li>ODBC (odbc)</li>
-  <li>Python (PyGreSQL)</li>
-  <li>TCL (libpgtcl)</li>
-  <li>C Easy API (libpgeasy)</li>
-  <li>PHP ('pg_' functions, Pear::DB)</li>
-</ul>
-<br>
-Tov&aacute;bbi programoz&aacute;si fel&uuml;letek
-&eacute;rhet&otilde;ek el a <br>
-<a href="http://www.PostgreSQL.org/interfaces.html">
-http://www.PostgreSQL.org/interfaces.html</a> &eacute;s a<br>
-<a href="http://gborg.PostgreSQL.org"> http://gborg.PostgreSQL.org</a>
-oldalakon.<br>
-<br>
-<hr style="width: 100%; height: 2px;">
-<h2 style="text-align: center;">Adminisztr&aacute;ci&oacute;s
-k&eacute;rd&eacute;sek</h2>
-<br>
-<a name="3.1"></a> <big><span style="text-decoration: underline;">3.1
-Hogyan tudom a PostgreSQL-t /usr/local/pgsql
--t&otilde;l elt&eacute;r&otilde; helyre install&aacute;lni?</span></big><br>
-<p>A configure script --prefix param&eacute;ter&eacute;nek
-haszn&aacute;lat&aacute;val.</p>
-<a name="3.2"></a> <big style="text-decoration: underline;">3.2 AMikor
-elind&iacute;tom a postmaster-t, egy
-"Bad System Call"-t vagy core dump-ot kapok. Mi&eacute;rt?</big><br>
-<p>Sz&aacute;mos probl&eacute;ma lehet, de legel&ouml;ssz&ouml;r
-ellen&otilde;rizd le, hogy a kerneled System V
-kieg&eacute;sz&iacute;t&eacute;sekkel rendelkezik-e. A
-PostgreSQL haszn&aacute;lja a kernel osztott mem&oacute;ria &eacute;s
-szemafor API-j&aacute;t. </p>
-<p><a name="3.3"></a><big style="text-decoration: underline;">3.3
-Amikor
-megpr&oacute;b&aacute;lom inditani a
-postmaster-t, "IpcMemoryCreate" hib&aacute;kat kapok. Mi&eacute;rt?</big></p>
-<p>
-Vagy nincs megfelel&otilde;en konfigur&aacute;lva a kerneled osztott
-mem&oacute;ria t&aacute;mogat&aacute;sa vagy meg kell
-nagyobb&iacute;tanod a maxim&aacute;lis osztott
-mem&oacute;ria m&eacute;retet.</p>
-<p>A pontos m&eacute;ret sz&uuml;ks&eacute;glet f&uuml;gg az
-architekt&uacute;r&aacute;dt&oacute;l &eacute;s att&oacute;l hogy
-h&aacute;ny buffert &eacute;s processzt konfigur&aacute;lsz a
-postmasternek.
-Legal&aacute;bb 1 MB ter&uuml;letre sz&uuml;ks&eacute;ged van. A
-PostgreSQL
-Adminisztr&aacute;ci&oacute; k&eacute;zik&ouml;nyvben olvashatsz
-r&eacute;szletesebb inform&aacute;ci&oacute;kat az osztott
-mem&oacute;ri&aacute;r&oacute;l &eacute;s a szemaforokr&oacute;l.</p>
-<a name="3.4"></a><big style="text-decoration: underline;">3.4) Amikor
-megpr&oacute;b&aacute;lom inditani a
-postmaster-t, "IpcSemaphoreCreate" <br>
-hib&aacute;kat kapok. Mi&eacute;rt?</big><br>
-<p>Ha a hiba&uuml;zenet ez: " IpcSemaphoreCreate: semget failed (No
-space left on device)", akkor a kerneled konfigur&aacute;ci&oacute;ja
-nem
-tesz lehet&otilde;v&eacute; elegend&otilde; szemafort. A PostgreSQL
-szerver processzenk&eacute;nt 1
-szemafort ig&eacute;nyel. Egy &aacute;tmeneti megold&aacute;s lehet az
-hogy a
-postmastert kevesebb maxim&aacute;lis processz sz&aacute;mmal inditod
-el. Haszn&aacute;ld a
--D param&eacute;tert. Egy sokkal megfelel&otilde;bb megold&aacute;s az
-ha n&ouml;veled a
-kerneled SEMMNS &eacute;s SEMMNI param&eacute;tereit.</p>
-<p>A hib&aacute;s szemaforok is adat&aacute;zis
-lerobban&aacute;s&aacute;hoz is vezethet nagy terhel&eacute;s
-eset&eacute;n.Ha a hiba&uuml;zenet valami m&aacute;s, lehet hogy nincs
-szemaforok
-t&aacute;mogat&aacute;s</p>
-<p>forditva a kerneledbe. Olvasd el a PostgreSQL
-adminisztr&aacute;torok k&eacute;zik&ouml;nyv&eacute;ben az osztott
-mem&oacute;ri&aacute;r&oacute;l &eacute;s a szemaforokr&oacute;l
-sz&oacute;l&oacute; fejezetet.</p>
-<p><a name="3.5"></a><big style="text-decoration: underline;">3.5)
-Hogyan tudom kontroll&aacute;lni a m&aacute;s
-g&eacute;pekr&otilde;l &eacute;rkez&otilde; kapcsolat
-k&eacute;r&eacute;seket?</big></p>
-<p>Alap&eacute;rtelmez&eacute;sben a PostgreSQL a helyi kapcsolatokat
-Unix
-socketekkel val&oacute;s&iacute;tja meg. M&aacute;s g&eacute;pek nem
-lesznek
-k&eacute;pesek csatlakozni, ha nem enged&eacute;lyezed azt -i
-opci&oacute;val a postmasternek, &eacute;s
-nem &aacute;ll&iacute;tod be host a alap&uacute;
-azonos&iacute;t&aacute;st a pg_hba.conf
-&aacute;llom&aacute;nyban. Ezzel v&aacute;lnak lehet&otilde;v&eacute; a
-TCP/IP kapcsolatok.</p>
-<p><a name="3.6"></a><big style="text-decoration: underline;">3.6)
-Hogyan tudom nagyobb
-teljes&iacute;tm&eacute;nyre hangolni az adatb&aacute;zisomat?</big></p>
-<p>Az indexel&eacute;s felt&eacute;tlen&uuml;l gyors&iacute;tja a
-lek&eacute;rdez&eacute;seket. Az EXPLAIN parancs lehet&otilde;v&eacute;
-teszi hogy l&aacute;sd, hogy a
-PostgreSQL mik&eacute;nt interpret&aacute;lja a
-lek&eacute;rdez&eacute;st &eacute;s melyik indexet haszn&aacute;lja.</p>
-<p>Ha sok INSERT m&ucirc;veletet hajtassz v&eacute;gre, csin&aacute;ld
-nagy k&ouml;tegekben a COPY paranccsal. Ez sokkal gyorsabb mint az
-egyedi INSERT parancsok.
-M&aacute;sodszor: Azok a m&ucirc;veletek, amelyek nincsenek
-tranzakci&oacute; blokkon
-bel&uuml;l, azok saj&aacute;t tranzakci&oacute;t ind&iacute;tanak. Sok
-m&ucirc;veletet &eacute;rdemes
-egy tranzakci&oacute;n bel&uuml;l v&eacute;grehajtani. Ez
-cs&ouml;kkenti a tranzakci&oacute;
-kezel&eacute;s t&ouml;bbletidej&eacute;t. Az indexeket javasolt a nagy
-adatv&aacute;ltoz&aacute;sok el&ouml;tt
-elt&aacute;vol&iacute;tani, majd &uacute;jra l&eacute;trehozni.</p>
-<p>Sz&aacute;mos teljes&iacute;tm&eacute;ny jav&iacute;t&oacute;
-lehet&otilde;s&eacute;g van. Kikapcsolhatod az fsync() m&ucirc;veletet
-a postmaster -o -F opci&oacute;kval val&oacute;
-ind&iacute;t&aacute;sakor. &Iacute;gy nem fog az amugy lass&uacute;
-fsync() f&uuml;ggv&eacute;ny
-megh&iacute;v&oacute;dni minden tranzakci&oacute; v&eacute;g&eacute;n.</p>
-<p>Haszn&aacute;lhatod a postmaster -B opci&oacute;j&aacute;t is az
-osztott mem&oacute;ria szegmens m&eacute;ret&eacute;nek
-n&ouml;vel&eacute;s&eacute;hez. Ha az
-&eacute;rt&eacute;ket t&uacute;l magasra &aacute;ll&iacute;tod, lehet
-hogy a postmaster nem indul el, mert t&uacute;ll&eacute;pted az
-oper&aacute;ci&oacute;s rendszer &aacute;ltal&nbsp; megengedett
-m&eacute;retet. Minden buffer 8K m&eacute;ret&ucirc;
-&eacute;s alap&eacute;rtelmez&eacute;sban 64 buffer van.</p>
-<p>A -S opci&oacute;val n&ouml;velheted a szerver &aacute;tmeneti
-rendez&eacute;sekre fenntartott mem&oacute;ria ter&uuml;let&eacute;t.
-Az &eacute;rt&eacute;ket
-kilobyteban add meg. Az alap&eacute;rtelmezett &eacute;rt&eacute;k
-512K. </p>
-<p>Haszn&aacute;lhatod a CLUSTER utas&iacute;t&aacute;st is, hogy a
-t&aacute;bl&aacute;kat egy indexnek megfelel&otilde;en
-csoportos&iacute;tsd. Olvasd el a CLUSTER
-k&eacute;zik&ouml;nyv oldalt tov&aacute;bbi r&eacute;szletek&eacute;rt.<br>
-</p>
-<p>Hardver kiv&aacute;laszt&aacute;s&aacute;ban seg&iacute;thet: <a
- href="http://candle.pha.pa.us/main/writings/pgsql/hw_performance/index.html">http://candle.pha.pa.us/main/writings/pgsql/hw_performance/index.html</a>
-&eacute;s <a href="http://www.powerpostgresql.com/PerfList/">http://www.powerpostgresql.com/PerfList/</a>.<br>
-</p>
-<p>A postgresql.conf be&aacute;llit&aacute;saival kapcsolatos
-tudnival&oacute;k: <a
- href="http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_conf_e.html">http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_conf_e.html</a>
-&eacute;s <a
- href="http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html">http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html</a>.</p>
-<p></p>
-<p><a name="3.7"></a> <big style="text-decoration: underline;">3.7)
-Milyen hibakeres&otilde;
-lehet&otilde;s&eacute;gek &eacute;rhet&otilde;ek el?</big></p>
-<p>A PostgreSQL sz&aacute;mos lehet&ouml;s&eacute;ggel rendelkezik ami
-&eacute;rt&eacute;kes lehet a hibakeres&eacute;sn&eacute;l.</p>
-El&ouml;ssz&ouml;r is, futtathatod a configure scriptet
---enable-cassert opci&oacute;val, sok assert()
-funkci&oacute;hiv&aacute;s ellen&ouml;rzi
-a program fut&aacute;s&aacute;t &eacute;s meg&aacute;llitja ha valami
-v&eacute;ratlan hiba t&ouml;rt&eacute;nik.<br>
-<p>Mind a postmaster &eacute;s a postgres sz&aacute;mos hibakeres&ouml;
-lehet&uuml;s&eacute;ggel rendelkezik. Mindig amikor elinditod a
-postmastert, gy&ouml;z&ouml;dj meg
-r&oacute;la, hogy a kimenetet log &aacute;llom&aacute;nyba
-k&uuml;ld&ouml;d. Igy:</p>
-<p>cd /usr/local/pgsql</p>
-<p>./bin/postmaster &gt;server.log 2&gt;&amp;1 &amp;</p>
-<p>Ez egy server.log &aacute;llom&aacute;nyt hoz l&eacute;tre a
-fels&ouml;
-PostgreSQL k&ouml;nyvt&aacute;rban. Ez az &aacute;llom&aacute;ny
-tartlamaz majd sz&aacute;mos hasznos
-inform&aacute;ci&oacute;t a szerverrel kapcsolatos
-probl&eacute;m&aacute;kr&oacute;l &eacute;s
-hib&aacute;kr&oacute;l. A postmaster -d opci&oacute;j&aacute;val lehet
-r&eacute;szletesebb hibakeres&ouml; inform&aacute;ci&oacute;t kapni. A
--d opci&oacute;hoz meg kell hat&aacute;rozni egy hiba szintet.
-Vigy&aacute;zz, a magas
-hibakeres&ouml; szint nagy log &aacute;llom&aacute;nyt okozhat.</p>
-<p>Ha a postmaster nem fut, akkor futtathatod a postgres szervert
-parancssorb&oacute;l is, &eacute;s az SQL kifejez&eacute;st
-k&ouml;zvetlen&uuml;l ennek adhatod &aacute;t. Ez csak
-hibakeres&eacute;s eset&eacute;ben javasolt. Az &uacute;j sor a
-kifejez&eacute;s v&eacute;g&eacute;t jelenti, nem a pontosvessz&ouml;.
-Ha hibakeres&ouml; opci&oacute;kkal
-forditottad a szervert, haszn&aacute;lhatsz egy debuggert is hogy
-l&aacute;sd hogy mi
-t&ouml;rt&eacute;nik. Mivel igy a szervert nem a postmaster inditotta,
-nem
-t&ouml;bbfelhaszn&aacute;l&oacute;s k&ouml;rnyezetk&eacute;nt fut, igy
-a z&aacute;rol&aacute;si &eacute;s a szerverek
-k&ouml;z&ouml;tti kommunik&aacute;ci&oacute;s hiba jelens&eacute;gek
-nem jelentkeznek.</p>
-<p>Ha m&aacute;r fut a postmaster, indits egy psql-t, &eacute;s
-n&eacute;zd meg a szerver processz PID-j&eacute;t! Egy debuggert
-haszn&aacute;lhatsz a processzhez
-csatlakoz&aacute;shoz. Be&aacute;llithatsz t&ouml;r&eacute;spontokat
-&eacute;s elindithatsz
-lek&eacute;rdez&eacute;seket. Ha a postgres indit&aacute;sban keresel
-hib&aacute;t, a PGOPTIONS k&ouml;rnyezeti
-v&aacute;ltoz&oacute;t &aacute;llitsd be "-W n" &eacute;rt&eacute;kre.
-Ez n m&aacute;sodperc v&aacute;rakoz&aacute;st
-id&eacute;z el&ouml;, igy tudsz csatlakozni a processzhez, el tdsz
-hejezni t&ouml;r&eacute;spontokat, majd
-folytathatod a ind&iacute;t&aacute;st.</p>
-<p>A postgres program -s, -A &eacute;s -t opci&oacute;i is nagyon
-hasznosak lehetnek hibakeres&eacute;sn&eacute;l &eacute;s
-teljes&iacute;tm&eacute;ny
-m&eacute;r&eacute;sn&eacute;l.</p>
-<p>Profiling leht&ouml;s&eacute;ggel is fordithatod a szervert, hogy
-l&aacute;sd melyik funkci&oacute;k foglalj&aacute;k el a fut&aacute;si
-id&otilde;t. A
-szerver profile &aacute;llom&aacute;nyai a pgsql/data/base/dbname
-k&ouml;nzvt&aacute;rba ker&uuml;lnek, a kliens
-profile &aacute;llom&aacute;nyok az aktu&aacute;lis
-k&ouml;nyvt&aacute;rba.
-Linuxon ehhez sz&uuml;ks&eacute;ges a -DLINUX_PROFILE
-ford&iacute;t&aacute;si direktiva.</p>
-<a name="3.8"></a> <big style="text-decoration: underline;">3.8)
-Mi&eacute;rt kapok "Sorry, too many clients"
-(T&uacute;l sok kliens) <br>
-hib&aacute;t csatlakoz&aacute;sn&aacute;l?</big><br>
-<p>N&ouml;velned kell a postmaster egyidej&ucirc;leg futtatott szerver
-processz sz&aacute;m korl&aacute;tj&aacute;t.</p>
-<p>Az alap&eacute;rtelmezett korl&aacute;t 32 processz. Ezt
-n&ouml;velhetjed &uacute;gy, hogy &uacute;jrainditod a postmastert
-&eacute;s -N opci&oacute;val
-meghat&aacute;rotod az &uacute;j &eacute;rt&eacute;ket, vagy
-m&oacute;dositod a postgresql.conf-ot.</p>
-<p>Ne felejtsd el, hogy ha n&ouml;veled a szerver processzek
-maxim&aacute;lis sz&aacute;m&aacute;t, akkor bufferek
-sz&aacute;m&aacute;t is n&ouml;velned kell,
-legal&aacute;bb a processzek sz&aacute;m&aacute;nak
-k&eacute;tszeres&eacute;re. Nagy processz sz&aacute;mokeset&eacute;ben
-val&oacute;szin&uuml;leg a Unix konfigur&aacute;ci&oacute;s
-param&eacute;tereken is n&ouml;velni kell.
-Ellen&ouml;rizd a SHMMAX (az osztott mem&oacute;ria szegmensek
-maxim&aacute;lis m&eacute;rete),
-a SEMMNS &eacute;s a SEMMNI (a szemaforok maxim&aacute;lis
-sz&aacute;ma), az NPROC (a processzek
-maxim&aacute;lis sz&aacute;ma), a MAXUPRC
-(felhaszn&aacute;l&oacute;nk&eacute;nti maxim&aacute;lis
-processz sz&aacute;m) &eacute;s a NFILE &eacute;s NINODE (a megnzitott
-&aacute;llom&aacute;nzok maxim&aacute;lis sz&aacute;ma)
-param&eacute;tereket. A PostgreSQL az&eacute;rt korl&aacute;tozza
-k&uuml;l&ouml;n a processz
-sz&aacute;mot, hogy a rendszeredet ne terhelhesse meg
-t&uacute;ls&aacute;gosan.</p>
-<p>A PostgreSQL 6.5 verzi&oacute;ban a maxim&aacute;lis szerver
-processz
-sz&aacute;m 64 volt &eacute;s a m&oacute;dosit&aacute;shoz bele kellett
-irni a
-include/storage/sinvaladt.h &aacute;llom&aacute;nyba &eacute;s
-&uacute;jra kellett forditani a servert. <a name="3.9"></a></p>
-<big style="text-decoration: underline;">3.9) Mi van pgsql_tmp
-k&ouml;nyvt&aacute;rban?</big><br>
-<p>Ez a k&ouml;nyvt&aacute;r a lek&eacute;rdez&eacute;s
-v&eacute;grehajt&oacute; &aacute;ltal l&eacute;trehezott
-&aacute;tmeneti &aacute;llom&aacute;nyokat tartalmazza.
-P&eacute;ld&aacute;ul ha egy
-rendez&eacute;st kell v&eacute;grehajtani egy ORDER BY kifejez&eacute;s
-miatt &eacute;s a m?velet t&ouml;bb
-mem&oacute;ri&aacute;t vesz ig&eacute;nybe, mint amennyit a -S
-param&eacute;ter megenged, akkor az
-&aacute;tmeneti k&ouml;nyvt&aacute;rban hoz l&eacute;tre egy
-&aacute;llom&aacute;nyt a
-fennmarad&oacute; adat t&aacute;rol&aacute;s&aacute;ra.</p>
-<p>Az &aacute;tmeneti &aacute;llom&aacute;nyok t&ouml;bbnyire
-t&ouml;rl?dnek, de meg is maradhat ha p&eacute;ld&aacute;ul
-v&aacute;ratlan hib&aacute;val le&aacute;ll a
-szerver egy rendez&eacute;s k&ouml;zben. Indit&aacute;skor &eacute;s
-le&aacute;llit&aacute;skor ezeket az
-&aacute;llom&aacute;nyokat t&ouml;rli a postmaster.</p>
-<a name="3.10"></a> <big style="text-decoration: underline;">3.10)
-Mi&eacute;rt kell dumpolni &eacute;s
-&uacute;jrat&ouml;lteni PostgreSQL kiad&aacute;s
-v&aacute;lt&aacute;s&aacute;n&aacute;l?</big><br>
-<p>A PostgreSQL csapat csak apr&oacute;bb
-v&aacute;ltoztat&aacute;sokat
-hajt v&eacute;gre a kisebb kiad&aacute;sok k&ouml;z&ouml;tt, igy ha 7.2
-verzi&oacute;r&oacute;l
-&aacute;llsz &aacute;t 7.2.1 verzi&oacute;ra, akkor nem
-sz&uuml;ks&eacute;ges kidumplonod az adatb&aacute;zist. A nagy
-kiad&aacute;sok eset&eacute;ben (p&eacute;ld&aacute;ul
-verzi&oacute;r&oacute;l 7.3-ra &aacute;tt&eacute;r&eacute;sn&eacute;l)
-v&aacute;ltozik a belsi&otilde; adatstrukt&uacute;r&aacute;k &eacute;s
-adat&aacute;llom&aacute;nyok form&aacute;tuma. Ezek a
-v&aacute;ltoz&aacute;sok gyakran nagyon &ouml;sszetettek, ez&eacute;rt
-ink&aacute;b nem tartunk fenn visszafel&eacute;
-kompatibilit&aacute;st. A dump az adatot &aacute;ltal&aacute;nos
-form&aacute;tumban irja ki, majd az
-&uacute;j form&aacute;tumban lehet azt visszat&ouml;leni.
-</p>
-Azokban a kiad&aacute;sokban, amelyek k&ouml;z&ouml;tt az adat
-form&aacute;tum nem v&aacute;ltozik, a pg_upgrade program
-haszn&aacute;lhat&oacute; dumpol&aacute;s
-&eacute;s helyre&aacute;llit&aacute;s n&eacute;lk&uuml;l.
-<hr style="width: 100%; height: 2px;"><br>
-<h2 style="text-align: center;"> M&ucirc;k&ouml;dtet&eacute;si
-k&eacute;rd&eacute;sek</h2>
-<br>
-<a name="4.1"></a> <big style="text-decoration: underline;">4.1) Mi a
-k&uuml;l&ouml;nbs&eacute;g a
-bin&aacute;ris &eacute;s a norm&aacute;l kurzorok k&ouml;z&ouml;tt?</big><br>
-<p>N&eacute;zd meg a DECLARE dokument&aacute;ci&oacute;j&aacute;t.</p>
-<a name="4.2"></a> <big style="text-decoration: underline;">4.2)
-Hogyan tudom select-elni a
-lek&eacute;rdez&eacute;s els&otilde; p&aacute;r sor&aacute;t?</big><br>
-<p>Olvasd el a FETCH dokument&aacute;ci&oacute;j&aacute;t, vagy
-haszn&aacute;ld a SELECT LIMIT-et.</p>
-<p>Az eg&eacute;sz lek&eacute;rdez&eacute;st v&eacute;gre kell
-hajtani,
-m&eacute;g akkor is, ha csak az els&otilde; p&aacute;r sort akarod
-megkapni. Gondolj arra, hogy a
-lek&eacute;rdez&eacute;sben lehet ORDER BY is. Ha van olyan index, ami
-megfelel az ORDER BY kifejez&eacute;sednek,
-a PostgreSQL k&eacute;pes lehet az els&ouml; n&eacute;h&aacute;ny
-rekord
-visszaad&aacute;s&aacute;ra, vagy a teljes lek&eacute;rdez&eacute;snek
-le kell futnia, amig a k&eacute;rt rekordok
-le nem gener&aacute;l&oacute;dnak.
-<a name="4.3"></a><big style="text-decoration: underline;"><br>
-</big></p>
-<p><big style="text-decoration: underline;">4.3) Hogy tudom
-kilist&aacute;zni a
-t&aacute;bl&aacute;kat vagy m&aacute;s dolgokat a PostgreSQL-ben?</big></p>
-<p>Elolvashatod a psql forr&aacute;s k&oacute;dj&aacute;ban a
-pgsql/src/bin/psql/describe.c &aacute;llom&aacute;nyban. Ez SQL
-parancsokat tartalmaz, amelyek azokat
-a kimeneteket &aacute;llitj&aacute;k el&ouml;, amiket a per jellel
-kezd&ouml;d&ouml;
-parancsok adnak vissza.</p>
-<a name="4.4"></a> <big style="text-decoration: underline;">4.4)
-Hogyan tudok elt&aacute;vol&iacute;tani egy
-oszlopot egy t&aacute;bl&aacute;b&oacute;l?</big><br>
-<br>
-<p>Ez a funkcionalit&aacute;s a 7.3 verzi&oacute;t&uuml;l kezdve
-&eacute;rhet&ouml; el az ALTER TABLE DROP COLUMN -nal. A r&eacute;gebbi
-verti&oacute;kban igy lehet
-v&eacute;grehajtani:</p>
-<pre>BEGIN;</pre>
-<pre>LOCK TABLE old_table;</pre>
-<pre>SELECT ... -- minden oszlopot, kiv&eacute;tel amit t&ouml;r&ouml;lni szeretn&eacute;l<br></pre>
-<pre>INTO TABLE new_table</pre>
-<pre>FROM old_table;</pre>
-<pre>DROP TABLE old_table;</pre>
-<pre>ALTER TABLE new_table RENAME TO old_table;</pre>
-<pre>COMMIT;</pre>
-<pre><br></pre>
-<h4><a name="4.5"></a><big
- style="text-decoration: underline; font-weight: normal;">4.5) Mi a
-maxim&aacute;lis m&eacute;rete egy sornak,
-egy t&aacute;bl&aacute;nak vagy egy adatb&aacute;zisnak?</big></h4>
-<br>
-<p>A korl&aacute;tok:</p>
-<ul>
-  <li>
-    <p>adatb&aacute;zis: korl&aacute;tlan (1 TB az &aacute;ltalunk
-ismert
-lagnagyobb)</p>
-  </li>
-  <li>
-    <p>t&aacute;bla: 16 TB</p>
-  </li>
-  <li>
-    <p>rekord/sor 1.6TB</p>
-  </li>
-  <li>
-    <p>mez&ouml; 1 GB</p>
-  </li>
-  <li>
-    <p>a t&aacute;bla sorainak sz&aacute;ma: korl&aacute;tlan</p>
-  </li>
-  <li>
-    <p>a t&aacute;bla oszlopainak sz&aacute;ma: 250-1600 az oszlop
-nevekt&otilde;l f&uuml;gg&ouml;en</p>
-  </li>
-  <li>
-    <p>A t&aacute;bla indexeinek sz&aacute;ma: korl&aacute;tlan</p>
-  </li>
-</ul>
-<p>Term&eacute;szetesen nem igaz&aacute;n korl&aacute;tlan, de a
-t&aacute;rter&uuml;let, mem&oacute;ria &eacute;s egy&eacute;b
-k&uuml;ls&ouml; t&eacute;nyez&ouml;k korl&aacute;tozz&aacute;k. A
-teljesitm&eacute;ny romolhat, ha ezek az &eacute;rt&eacute;kek
-szokatlanul nagyok.</p>
-<p>A 16 TB-os legnagyobb t&aacute;bla m&eacute;ret nem ig&eacute;nyel
-nagy
-&aacute;llom&aacute;ny t&aacute;mogat&aacute;st. A nagy
-t&aacute;bl&aacute;k t&ouml;bb 1 GB m&eacute;ret&uuml;
-&aacute;llom&aacute;nyba ker&ouml;lnek, igy az &aacute;llom&aacute;ny
-rendszer korl&aacute;tai nem l&eacute;nyegesek.</p>
-<p>A maxim&aacute;lis t&aacute;bla m&eacute;ret &eacute;s az oszlopok
-maxim&aacute;lis oszlop sz&aacute;m n&ouml;velhet&ouml;, ha az
-alap&eacute;rtelmezett blokkm&eacute;retet 32k-ra n&ouml;veled.</p>
-<a name="4.6"></a> <big style="text-decoration: underline;">4.6)
-Mekkora adatb&aacute;zis lemez ter&uuml;let
-sz&uuml;ks&eacute;ges egy tipikus sz&ouml;veg &aacute;llom&aacute;ny <br>
-t&aacute;rol&aacute;s&aacute;hoz?</big><br>
-<p>A PostgreSQL ak&aacute;r a sz&ouml;veg &aacute;llom&aacute;ny
-helyig&eacute;ny&eacute;nek &ouml;tsz&ouml;r&ouml;s&eacute;t is
-elfoglalhatja.</p>
-<p>K&eacute;pzelj el p&eacute;ld&aacute;ul, egy 100.000 soros
-sz&ouml;veget, aminek minde sora egy sz&aacute;mb&oacute;l &eacute;s
-egy sz&ouml;vegb&otilde;l
-&aacute;ll. Tegy&uuml;k el, hogy &aacute;tlagosan 20 byte hossz&uacute;
-sz&ouml;vegek. Ez a sz&ouml;veg&aacute;llom&aacute;ny
-k&ouml;r&uuml;lbel&uuml;l 2.8 MB helyet foglalna el. A t&aacute;bla ami
-a fenti adatszerkezetet elt&aacute;roln&aacute;,
-k&ouml;r&uuml;lbel&uuml;l 6.4 MB-os lenne. Ezt a
-k&ouml;vetkez&ouml;k&eacute;ppen sz&aacute;molhatjuk ki:</p>
-<p>36 byte: sor fejl&eacute;c</p>
-<pre>24 byte: egy int mez&ouml; + egy sz&ouml;veg mez&ouml;</pre>
-<pre>4 byte: mutato</pre>
-<pre>---------------------------------------</pre>
-<pre>64 byte soronkent.</pre>
-<p>Az adat oldal m&eacute;rete a PostgreSQL-ben 8192 byte, igy 8192 /
-64 = 128 rekord adatb&aacute;zis oldalank&eacute;nt
-(lefel&eacute; kerekitve).</p>
-<pre>100000 rekord / 128 rekord oldalank&eacute;nt = 782 adat oldal<br>(felel&eacute; kerekitve).</pre>
-<pre>782 adatb&aacute;zis oldal * 8192 byte olalank&eacute;nt = 6,406,144<br>byte (6.4 MB)</pre>
-<p>Az indexek nem foglalnak t&uacute;l sokat, de tartalmazz&aacute;k az
-indexelt adatot, igy ezek is lehetnek nagyok.</p>
-<p>A NULL &eacute;rt&eacute;kek bitt&eacute;rk&eacute;pben vannak
-t&aacute;rolva, igy kev&eacute;s helyet foglanak.</p>
-<p><a name="4.7"></a><big style="text-decoration: underline;">4.7) Hogy
-tudhatom meg milyen t&aacute;bl&aacute;k,
-indexek, adatb&aacute;zisok vagy felhaszn&aacute;l&oacute;k</big></p>
-<big style="text-decoration: underline;">vannak defini&aacute;lva?<br>
-</big>
-<p>A psql-ben tal&aacute;lsz sz&aacute;mos '\' karakterrel
-kezd&ouml;d&ouml; utas&iacute;t&aacute;st az ilyen
-inform&aacute;ci&oacute;k list&aacute;z&aacute;s&aacute;ra. A '\?'
-segits&eacute;g&eacute;vel tudot kilist&aacute;zni ezeketa parancsokat.
-Ezen kiv&uuml;l vannak rendszer t&aacute;bl&aacute;k,
-amelyek nevei 'pg_'-vel kezd&ouml;dnek.</p>
-<p>Pr&oacute;b&aacute;ld ki a pgsql/src/tutorial/syscat.source
-&aacute;llom&aacute;nyt is. Ez sok p&eacute;ld&aacute;t tartalmaz az
-rendszert&aacute;bl&aacute;kon
-v&eacute;grehajtott SELECT-ekr&ouml;l.</p>
-<p><a name="4.8"></a><big style="text-decoration: underline;">4.8) A
-lek&eacute;rdez&eacute;seim lass&uacute;ak,
-vagy nem haszn&aacute;lj&aacute;k az indexeket. Mi&eacute;rt?</big></p>
-<p><big style="text-decoration: underline;"></big></p>
-<p>Az indexeket nem haszn&aacute;lja a szerver minden
-lek&eacute;rdez&eacute;sn&eacute;l automatikusan. Csak akkor
-haszn&aacute;l indexet, ha a t&aacute;bla m&eacute;rete egy
-megadott als&oacute; hat&aacute;r felett van, &eacute;s a
-lek&eacute;rdez&eacute;s csak a sorok egy kis
-r&eacute;sz&eacute;t &eacute;rinti. Ez az&eacute;rt van, mert a
-v&eacute;letlen hozz&aacute;f&eacute;r&eacute;s m&eacute;g
-mindig lassabb lehet mint az t&aacute;bla szekvenci&aacute;lis
-olvas&aacute;sa.</p>
-<p>Hogy a PostgreSQL meg tudja hat&aacute;rozni hogy kell-e indexet
-haszn&aacute;lni, l&eacute;teznie kell egy statisztik&aacute;nak a
-t&aacute;bl&aacute;r&oacute;l. Ez a statisztikai adatok a VAACUM
-ANALYZE vagy az egyszer&ucirc; ANALYZE m&ucirc;veletek
-sor&aacute;n j&ouml;nnek l&eacute;tre. A statisztikai adatok
-felhaszn&aacute;l&aacute;s&aacute;val az optimaliz&aacute;l&oacute; meg
-tudja hat&aacute;rozni, hogy h&aacute;ny sor van a
-t&aacute;bl&aacute;ban, &eacute;s el tudja d&ouml;nteni, hogy
-haszn&aacute;ljon-e indexet. A statisztiaki
-adatgy&uuml;jt&eacute;st id&otilde;nk&eacute;nt v&eacute;gre kell
-hajtani, ahogy a t&aacute;bla adatai v&aacute;ltoznak.</p>
-<p>Az indexeket norm&aacute;lis esetben nem haszn&aacute;lja az ORDER
-BY
-vagy az OUTER JOIN. A szekvenci&aacute;lis olvas&aacute;s
-&aacute;ltal&aacute;ban gyorsabb, mint az index keres&eacute;s egy nagy
-t&aacute;bl&aacute;ban. B&aacute;r a LIMIT az ORDER BY-val
-kombin&aacute;lva haszn&aacute;lhat
-indexet, mert a t&aacute;bla csak kis r&eacute;sze &eacute;rintett.
-B&aacute;r a MIN
-&eacute;s MAX SQL funkci&oacute;k sem haszn&aacute;lj&aacute;k az
-indexeket, ezeket az
-&eacute;rt&eacute;keket egy ORDER BY + LIMIT
-lek&eacute;rdez&eacute;ssel is le lehet k&eacute;rdezni:</p>
-<pre>SELECT col</pre>
-<pre>FROM tab</pre>
-<pre>ORDER BY col [ DESC ]</pre>
-<pre>LIMIT 1;</pre>
-<br>
-<p>Amikor helyettes&iacute;t&otilde; jel oper&aacute;torokat
-haszn&aacute;lsz, mint a LIKE kulcssz&oacute; vagy a ~, az indexeket
-csak bizonyos k&ouml;r&uuml;lm&eacute;nyek
-k&ouml;z&ouml;tt lehet haszn&aacute;lni:</p>
-<p>A keres&otilde; string kezdete a keres&eacute;si minta elej&eacute;n
-kell hogy legyen. P&eacute;ld&aacute;ul:</p>
-<ul>
-  <li>A LIKE mint&aacute;k nem kezd&otilde;dhetnek % jellel.</li>
-  <li>&nbsp;~ (regexp) kifejez&eacute;sek nem kezd&otilde;dhetnek ^
-jellel.</li>
-  <li>A keres&eacute;si kifejez&eacute;s nem kezd&otilde;dhet karakter
-oszt&aacute;llyal.</li>
-  <li>A case-insensitive keres&eacute;s (ILIKE, ~*) nem
-haszn&aacute;lnak
-indexet ehelyett funkcion&aacute;lis indexet haszn&aacute;lnak, amit a
-4.12
-pontban tal&aacute;lhatsz.</li>
-  <li>Az alap&eacute;rtelmezett C hellyel kell futtatni az initdb-t.</li>
-</ul>
-<a name="4.9"></a> <big style="text-decoration: underline;">4.9) Hogy
-tudom ellen&otilde;rizni, hogy
-optimaliz&aacute;lta a lek&eacute;rdez&eacute;s
-optimaliz&aacute;l&oacute;<br>
-a lek&eacute;rdez&eacute;sem?<br>
-</big>
-<p>Olvasd el a dokument&aacute;ci&oacute; EXPLAIN-r&oacute;l
-sz&oacute;l&oacute; r&eacute;sz&eacute;t.</p>
-<p><a name="4.10"></a><big style="text-decoration: underline;">4.10) Mi
-az R-tree index?</big></p>
-<p>Az R-tree index a t&eacute;rbeli adat indexel&eacute;s&eacute;re
-alkalmas. Egy hash index nem k&eacute;pes tartom&aacute;ny
-keres&eacute;sekre. A B-tree
-index csak egy dimenzi&oacute;n kezeli a tartom&aacute;ny
-keres&eacute;seket.
-P&eacute;ld&aacute;ul ha az indexet egy pont (point adatt&iacute;pus)
-t&iacute;pus&uacute; mez.re
-&eacute;p&iacute;tj&uuml;k, gyorsabban kezeli az olyan jelleg&uuml;
-lek&eacute;rdez&eacute;seket, mint egy
-adott k&ouml;rben</p>
-<p>tal&aacute;lhat&oacute; pontok.</p>
-<p>Az R-tree tervez&eacute;si mint&aacute;t eredetileg
-le&iacute;r&oacute;
-sz&ouml;veg: Guttman, A. "R-trees: A Dynamic Index Structure for
-Spatial Searching." Proceedings of the 1984 ACM SIGMOD Int'l Conf on
-Mgmt of Data, 45-57.</p>
-<p>Ezt olvashatod Stonebraker "Readings in Database Systems" c.
-k&ouml;nyv&eacute;ben.</p>
-<p>A be&eacute;p&iacute;tett R-tree kezelni tudj&aacute;k a
-soksz&ouml;geket (polygon adatt&iacute;pus) &eacute;s a dobozokat
-(box). Elm&eacute;letileg, az R-tree
-kiterjeszthet&otilde; tov&aacute;bbi dimenzi&oacute;kra is.
-Gyakorlatilag ezen dolgoznod kell egy kicsit,
-&eacute;s m&eacute;g nincs dokument&aacute;ci&oacute;nk arr&oacute;l
-hogy az
-hogyan m&ucirc;k&ouml;dik.</p>
-<p><a name="4.11"></a><big style="text-decoration: underline;">4.11) Mi
-a Genetic Query Optimizer?</big></p>
-<p><big style="text-decoration: underline;"></big></p>
-<p>A GEQO modul a lek&eacute;rdez&eacute;s optimaliz&aacute;ci&oacute;
-sebess&eacute;g&eacute;t n&ouml;veli nagy mennyis&eacute;g&ucirc;
-t&aacute;bla &ouml;sszekapcsol&aacute;sa
-eset&eacute;n. Lehet&otilde;v&eacute; teszi a nagy
-lek&eacute;rdez&eacute;sek v&eacute;grehajt&aacute;s&aacute;t nem
-teljes keres&eacute;ssel.</p>
-<p><a name="4.12"></a><big style="text-decoration: underline;">4.12)
-Hogyan tudok regexp keres&eacute;st &eacute;s
-case-insensitive regexp keres&eacute;st </big><big
- style="text-decoration: underline;">haszn&aacute;lni? Hogyan tudok
-indexet haszn&aacute;lni
-case-insensitive keres&eacute;shez?</big><br>
-</p>
-<p>A ~ oper&aacute;tor hajt v&eacute;gre regul&aacute;ris
-kifejez&eacute;s
-(regexp) &eacute;rtelmez&eacute;st, a ~* ennek case-insensitive
-v&aacute;ltozata. A LIKE case-insensitive v&aacute;ltozata az ILIKE.</p>
-<p>A case-insensitive egyenl&otilde;s&eacute;g m&ucirc;veleteket
-&aacute;ltal&aacute;ban igy hajtjuk v&eacute;gre:</p>
-<p>SELECT *</p>
-<pre>FROM tab</pre>
-<pre>WHERE lower(col) = 'abc';</pre>
-<p>Ez nem fog indexet haszn&aacute;lni, b&aacute;r l&eacute;trehozhatsz
-egy funkci&oacute; indexet:</p>
-<pre>CREATE INDEX tabindex ON tab (lower(col));</pre>
-<a name="4.13"></a> <big style="text-decoration: underline;">4.13)
-Hogyan tudom &eacute;szlelni egy
-lek&eacute;rdez&eacute;sben, ha egy mez&otilde; NULL?</big><br>
-<p>Haszn&aacute;ld "IS NULL"-t &eacute;s az "IS NOT NULL"-t.</p>
-<p><a name="4.14"></a><big style="text-decoration: underline;">4.14) Mi
-a k&uuml;l&ouml;nbs&eacute;g a
-k&uuml;l&ouml;nb&ouml;z&otilde; karaktert&iacute;pusok k&ouml;z&ouml;tt?</big></p>
-<ul>
-  <li>"char" egy karakter hossz&uacute; string</li>
-  <li>CHAR(n) bpchar &uuml;res hellyel a megadott n
-hossz&uacute;s&aacute;gig</li>
-  <li>VARCHAR(n) varchar m&eacute;ret maxim&aacute;lis hossz
-meghat&aacute;roz&aacute;s&aacute;val, a lefogllat ter&uuml;let is
-v&aacute;ltoz&oacute; hossz&uacute; lesz</li>
-  <li>TEXT nincs meghat&aacute;rozott fels&#337; korl&aacute;t</li>
-  <li>BYTEA v&aacute;ltoz&oacute; hossz&uacute;s&aacute;g&uacute;
-byte-t&ouml;mb</li>
-</ul>
-<p>L&aacute;tni fogod a bels&otilde; elnevez&eacute;s&uuml;ket, ha
-tanulm&aacute;nyozod a rendszert&aacute;bl&aacute;kat&eacute;s
-n&eacute;h&aacute;ny hiba&uuml;zenetet.</p>
-<p>Az ut&oacute;bbi n&eacute;gy a "varlena" t&iacute;pusok, ami a
-t&aacute;rol&aacute;suk m&oacute;dj&aacute;ra utal: az els&otilde; 4
-byte a lemezen a hossz&uacute;s&aacute;g, a t&ouml;bbi
-az adat. A val&oacute;di m&eacute;ret teh&aacute;t nagyobb mint a
-deklar&aacute;lt
-hossz&uacute;s&aacute;g.Ezek azadatok t&ouml;m&ouml;ritve
-t&aacute;rol&oacute;dnak el, igy kevesebb helyet foglalnek el az
-el&ouml;re sz&aacute;mitottn&aacute;l.</p>
-<p>A CHAR(n) a legjobb megold&aacute;s, ha stabil
-hossz&uacute;s&aacute;g&uacute; stringet t&aacute;rolsz. A VARCHAR(n)
-j&oacute; arra az esetekre, ha a hossz&uacute;s&aacute;g
-v&aacute;ltozik, de van fels&otilde; korl&aacute;tja. A TEXT
-t&iacute;pus korl&aacute;tlan
-hossz&uacute;s&aacute;g&uacute; (1 GB-ig) sz&ouml;vegek
-t&aacute;rol&aacute;s&aacute;ra alklamas. A BYTEA bin&aacute;ris adatok
-t&aacute;rol&aacute;s&aacute;ra van. A teljesitm&eacute;ny
-mutat&oacute;i hasonl&oacute;ak ezenek a
-t&iacute;pusoknak.</p>
-<p><a name="4.15.1"></a><big style="text-decoration: underline;">4.15.1)
-Hogyan tudok l&eacute;trehozni
-automatikusan n&ouml;vekv&otilde; &eacute;rt&eacute;k&ucirc;
-mez&otilde;t?</big></p>
-<br>
-A PostgreSQL rendelkezik egy SERIAL adatt&iacute;pussal. Ez egy
-szekvenci&aacute;t &eacute;s egy indexet hoz l&eacute;tre az oszlopon.
-P&eacute;ld&aacute;ul ez:<br>
-<pre>CREATE TABLE person (</pre>
-<pre>id SERIAL,</pre>
-<pre>name TEXT</pre>
-<pre>);</pre>
-<p>ugyanezt jelenti:</p>
-<pre>CREATE SEQUENCE person_id_seq;</pre>
-<pre>CREATE TABLE person (</pre>
-<pre>id INT4 NOT NULL DEFAULT nextval('person_id_seq'),</pre>
-<pre>name TEXT</pre>
-<pre>);</pre>
-<pre>CREATE UNIQUE INDEX person_id_key ON person ( id );</pre>
-<br>
-<p>A szekvenci&aacute;kkal kapcsolatban olvasd el a create_sequence man
-oldalt. A sor OID-j&eacute;t is haszn&aacute;lhatod egyedi
-azonosit&oacute;k&eacute;nt, b&aacute;r ebben az esetben figyelj a
-pg_gump haszn&aacute;lat&aacute;n&aacute;l a
--o opci&oacute;ra (COPY WITH OIDS, m&aacute;sol&aacute;s OID-dal), hogy
-meg?rizd az
-&eacute;rt&eacute;keket.</p>
-<p><a name="4.15.2"></a><big style="text-decoration: underline;">4.15.2)
-Hogyan kaphatom meg egy SERIAL
-besz&uacute;r&aacute;s &eacute;rt&eacute;k&eacute;t?</big></p>
-<p>Egy megold&aacute;s erre az, ha a nextval() funkci&oacute;val
-megszerzed az &eacute;rt&eacute;ket m&eacute;g miel&ouml;tt
-besz&uacute;rn&aacute;d
-az adatot a t&aacute;bl&aacute;ba. Erre itt l&aacute;thatsz egy
-p&eacute;ld&aacute;t:</p>
-<pre>new_id = execute("SELECT nextval('person_id_seq')");</pre>
-<pre>execute("INSERT INTO person (id, name) VALUES (new_id, 'Blaise<br>Pascal')");</pre>
-<p>
-Esetleg lek&eacute;rdezheted a szekvencia &aacute;llapot&aacute;t a sor
-besz&uacute;r&aacute;sa ut&aacute;n. </p>
-<pre>execute("INSERT INTO person (name) VALUES ('Blaise Pascal')");</pre>
-<pre>new_id = execute("SELECT currval('person_id_seq')");</pre>
-<p>
-V&eacute;g&uuml;l pedig, haszn&aacute;lhatod a visszaadott OID
-&eacute;rt&eacute;ket is, b&aacute;r ez a lehet&otilde;
-legkev&eacute;sb&eacute; portolhat&oacute;. Perl DBI-ben, Edmund Mergl
-DBD::Pg modulj&aacute;ban az OID &eacute;rt&eacute;k
-haszn&aacute;lhat&oacute; a
-$sth-&gt;execute() ut&aacute;n ($sth-&gt;{pg_oid_status}).</p>
-<a name="4.15.3"></a> <big style="text-decoration: underline;">4.15.3)
-A currval() &eacute;s a nextval() nem
-teremt holtpont vesz&eacute;lyes helyzetet a felhaszn&aacute;l&oacute;k
-k&ouml;z&ouml;tt?</big><br>
-<p>Nem. A currval() funkci&oacute; a szerver processzed &aacute;ltal
-adott
-&eacute;rt&eacute;ket adja vissza, nem pedig a t&ouml;bbi szerver
-processz &aacute;ltal adottat.</p>
-<big style="text-decoration: underline;"><a name="4.15.4"></a>4.15.4)
-Mi&eacute;rt nem haszn&aacute;l&oacute;dnak fel &uacute;jra a
-sequence sz&aacute;mok tranzakci&oacute; abort eset&eacute;n?</big><br>
-<p>Mi&eacute;rt vannak probl&eacute;m&aacute;k a serial oszlopok
-sz&aacute;moz&aacute;s&aacute;val?</p>
-<p>A p&aacute;rhuzamoss&aacute;g fejleszt&eacute;se
-&eacute;rdek&eacute;ben a sorozat sz&aacute;mokat k&eacute;r&eacute;sre
-adja ki a szerver fut&oacute; tranzakci&oacute;knak, &eacute;s azokat
-nem z&aacute;rja, amig a tranzakci&oacute; v&eacute;get nem &eacute;r.
-Ez jukakat okoz a
-sz&aacute;moz&aacute;sokban a visszaforditott tranzakci&oacute;k miatt.</p>
-<p><a name="4.16"></a><big style="text-decoration: underline;"> 4.16)
-Mi a
-OID? Mi a TID?</big></p>
-<p>Az OID a PostgreSQL egyedi sor azonosit&oacute;ja. Minden sor, ami
-l&eacute;trej&ouml;n a szerveren, kap egy OID-t. Minden OID, amit az
-initdb alatt j&ouml;n
-l&eacute;tre 16384 alatt van (l&aacute;sd include/access/transam.h).
-Minden,
-felhaszn&aacute;l&oacute; &aacute;ltal l&eacute;trehozott OID
-legal&aacute;bb ennyi.
-Alap&eacute;rtelmez&eacute;sben, az OID nem csak a
-t&aacute;bl&aacute;ban vagy az adatb&aacute;zisban egyedi,
-hanem a teljes PostgreSQL adatb&aacute;zis rendszerben.</p>
-<p>A PostgreSQL az OID-okat a bels&ouml; t&aacute;bl&aacute;iban
-haszn&aacute;lja a sorok t&aacute;bl&aacute;k k&ouml;z&ouml;tt
-&ouml;sszekapcsol&aacute;s&aacute;hoz. Ezek az OID-k
-haszn&aacute;lhat&oacute;ak a rekordok azonosit&aacute;s&aacute;ra is
-amikor t&aacute;bl&aacute;kat csatol
-&ouml;ssze a szerver (JOIN). Az OID-ot haszn&aacute;lhatod mez&ouml;
-t&iacute;pusk&eacute;nt is,
-&eacute;s indexelheted is.</p>
-<p>Az OID &eacute;rt&eacute;k egy k&ouml;zponti ter&uuml;letr&ouml;l
-sz&aacute;rmazik, amit minden szerver processz haszn&aacute;l. Ha az
-OID-ot valami m&aacute;sra
-szeretn&eacute;d cser&eacute;lni:</p>
-<p>CREATE TABLE new_table(old_oid oid, mycol int);</p>
-<pre>SELECT old_oid, mycol INTO new FROM old;</pre>
-<pre>COPY new TO '/tmp/pgtable';</pre>
-<pre>DELETE FROM new;</pre>
-<pre>COPY new WITH OIDS FROM '/tmp/pgtable';</pre>
-<br>
-<p>Az OID 4 byte-os integer &eacute;rt&eacute;kk&eacute;nt
-t&aacute;rol&oacute;dik, igy 4 milli&aacute;rdn&aacute;l
-t&uacute;lcsordul. M&eacute;g soha senki nem jelezte hogy ez
-t&ouml;rt&eacute;nt volna,
-&eacute;s ezt a korl&aacute;tot igyeksz&uuml;nk elt&aacute;volitani,
-m&eacute;g miel&ouml;tt
-b&aacute;rki &eacute;szrevenn&eacute;.</p>
-<p>A TID a fizikai sorok blokk &eacute;s offszet c&iacute;mmel
-val&oacute;
-azonosit&aacute;s&aacute;ra szolg&aacute;l. A TID v&aacute;ltozik
-minden rekord m&oacute;dosit&aacute;s &eacute;s
-t&ouml;rl&eacute;s alkalm&aacute;val. Ezeket az indexek
-haszn&aacute;lj&aacute;k hogy a fizikai sort gyorsan
-megtal&aacute;lj&aacute;k.</p>
-<p><a name="4.17"></a><big style="text-decoration: underline;">4.17) Mi
-a PostgreSQL-ben haszn&aacute;lt
-kifejez&eacute;sek jelent&eacute;se?</big></p>
-<br>
-<p>N&eacute;hol a forr&aacute;s k&oacute;dban &eacute;s a
-dokumnet&aacute;ci&oacute;ban tal&aacute;lhat&oacute;ak
-kifejez&eacute;sek, amelyek &aacute;ltal&aacute;nosabb
-jelent&eacute;ssel b&iacute;rnak.
-Itt van n&eacute;h&aacute;ny:</p>
-<ul>
-  <li>t&aacute;bla (table), rel&aacute;ci&oacute; (relation),
-oszt&aacute;ly (class)</li>
-  <li>sor (row), rekord (record), tuple (nincs magyar jelent&eacute;s)</li>
-  <li>oszlop (column), mez&ouml; (field), attributum (attribute)</li>
-  <li>retrieve, select</li>
-  <li>helyettesit (replace), m&oacute;dosit (update)</li>
-  <li>hozz&aacute;f&ucirc;z (append), besz&uacute;r (insert)</li>
-  <li>OID, sorozat &eacute;rt&eacute;k (serial value)</li>
-  <li>portal, cursor</li>
-  <li>range variable, t&aacute;bla n&eacute;v, t&aacute;bla alias</li>
-</ul>
-Az &aacute;ltal&aacute;nos adatb&aacute;zis kifejez&eacute;sek
-&ouml;sszefoglal&oacute;j&aacute;t itt olvashat&oacute;:
-<p><a
- href="http://hea-www.harvard.edu/MST/simul/software/docs/pkgs/pgsql/glossary%0A/glossary.html">http://hea-www.harvard.edu/MST/simul/software/docs/pkgs/pgsql/glossary/glossary.html</a></p>
-<br>
-<a name="4.18"></a> <big style="text-decoration: underline;">4.18)
-Mi&eacute;rt kapom ezt a hib&aacute;t:
-"ERROR: Memory exhausted in AllocSetAlloc()"?<br>
-</big>
-<p>Lehet hogy elfogyott a virtu&aacute;lis mem&oacute;ri&aacute;d, vagy
-a
-kerneled er&otilde;forr&aacute;s korl&aacute;tai alacsonyak.
-Pr&oacute;b&aacute;ld ki ezt miel&ouml;tt
-elinditan&aacute;d a postmastert:</p>
-<pre>ulimit -d 262144</pre>
-<pre>limit datasize 256m</pre>
-<p>A shellt&otilde;l f&uuml;gg&otilde;en ezek k&ouml;z&uuml;l csak az
-egyik fut majd le, de a processzek adatszegmens&eacute;t sokkal
-magasabbra &aacute;llitja, ami
-tal&aacute;n el&eacute;g lesz a lek&eacute;rdez&eacute;s
-v&eacute;grehajt&aacute;s&aacute;hoz. Ez az utas&iacute;t&aacute;s a
-jelenlegi processzre (a shelled) &eacute;rv&eacute;nyes, &eacute;s
-minden
-&aacute;ltala l&eacute;trehozott processzre. Ha probl&eacute;m&aacute;d
-van az SQL klienssel, mert a
-szerver t&uacute;l nagy adatot k&uuml;ld vissza, pr&oacute;b&aacute;ld
-meg e
-klienssel is ugyanezt.</p>
-<p><a name="4.19"></a><big style="text-decoration: underline;">4.19)
-Hogyan tudhatom meg PostgreSQL, milyen
-verzi&oacute;t futtatok?</big></p>
-<p>A psql programban select version();</p>
-<a name="4.20"></a> <big style="text-decoration: underline;">4.20)
-Mi&eacute;rt kapok "invalid large obj
-descriptor" hib&aacute;t nagy objektumok
-kezel&eacute;s&eacute;n&eacute;l?</big><br>
-<p>A nagy objektumok kezel&eacute;s&eacute;t egy tranzakci&oacute;s
-blokkban helyezd el. (BEGIN &eacute;s COMMIT k&ouml;z&ouml;tt)</p>
-<p><br>
-Jelenleg a PostgreSQL ezt a szab&aacute;lyt azzal teszi
-k&ouml;telez&otilde;v&eacute;, hogy a tranzakci&oacute;
-v&eacute;g&eacute;n a nagy objektumokat
-lez&aacute;rja, igy a tranzakci&oacute; ut&aacute;n az els&otilde;
-m&ucirc;velet amit az objektumon
-v&eacute;grahajtan&aacute;l hib&aacute;s lesz.</p>
-<p>Ha olyan programoz&aacute;si fel&uuml;letet haszn&aacute;lsz mint az
-ODBC vagy a JDBC akkor val&oacute;szin&ucirc;leg ki kell kapcsolnod az
-auto-commit-ot.</p>
-<p><a name="4.21"></a><big style="text-decoration: underline;">4.21)
-Hogy hozhatok l&eacute;tre olyan oszlopot,
-aminek alap&eacute;rtelmezett </big><big
- style="text-decoration: underline;">&eacute;r&eacute;tke a jelenlegi
-id&otilde;?</big><br>
-</p>
-<p>Haszn&aacute;ld a CURRENT_TIMESTAMP -ot:</p>
-<pre>CREATE TABLE test (x int, modtime timestamp DEFAULT CURRENT_TIMESTAMP );</pre>
-<a name="4.22"></a> <big style="text-decoration: underline;">4.22)
-Mi&eacute;rt olyan lass&uacute;ak az
-al-lek&eacute;rdez&eacute;seim IN-nel?</big><br>
-<p>Jelenleg az al-lek&eacute;rdez&eacute;seket a k&uuml;ls&otilde;
-lek&eacute;rdez&eacute;shez csatoljuk. Ha az allek&eacute;rdez&eacute;s
-csak kev&eacute;s sort eredm&eacute;nyez
-&eacute;s a k&uuml;ls&otilde; lek&eacute;rdez&eacute;s sokat, akkor az
-IN is gyors. Az EXISTS kulcssz&oacute;
-haszn&aacute;lat&aacute;val gyorsithatod a lek&eacute;rdez&eacute;seket.</p>
-<p>SELECT *</p>
-<pre>FROM tab</pre>
-<pre>WHERE col IN (SELECT subcol FROM subtab);</pre>
-<br>
-<p>EXISTS haszn&aacute;lat&aacute;val:</p>
-<pre>SELECT *</pre>
-<pre>FROM tab</pre>
-<pre>WHERE EXISTS (SELECT subcol FROM subtab WHERE subcol = col);</pre>
-Ahhoz hogy ez gyorsan fusson le, a subcol indexelt oszlopnak kell hogy
-legyen. Rem&eacute;lj&uuml;k ezt a korl&aacute;tot siker&uuml;l
-hamarosan legy&otilde;zn&uuml;nk.
-<p><a name="4.23"></a><big style="text-decoration: underline;">4.23)
-Hogyan tudok outer join-t v&eacute;grehajtani?</big></p>
-<p>A PostgreSQL a szabv&aacute;nyos SQL szintaktik&aacute;t
-k&ouml;veti.
-Itt van k&eacute;t p&eacute;lda:</p>
-<p>SELECT *</p>
-<pre>FROM t1 LEFT OUTER JOIN t2 ON (t1.col = t2.col);</pre>
-<p>
-vagy</p>
-<pre>SELECT *</pre>
-<pre>FROM t1 LEFT OUTER JOIN t2 USING (col);</pre>
-<p>Ezek az identikus lek&eacute;rdez&eacute;sek
-&ouml;sszekapcsolj&aacute;k a t1.col &eacute;s a t2.col mez&otilde;ket,
-&eacute;s a t1 b&aacute;rmelyik kapcsolatlan
-sor&aacute;t is visszadj&aacute;k. A RIGHT JOIN a t2 kapcsolatlan
-sorait adta volna vissza, a FULL JOIN pedig a kapcsolt, &eacute;s
-mindk&eacute;t t&aacute;bla kapcsolatlan sorait
-adja. Az OUTER kulcssz&oacute; opcion&aacute;lis, a LEFT, RIGHT
-&eacute;s FULL JOIN
-szintaktikailag helyes. Az &aacute;tlagos
-&ouml;sszekapcsol&aacute;sokat INNER JOIN-nak
-nevezz&uuml;k.</p>
-<p>Az el&otilde;z&otilde; kiad&aacute;sokban a OUTER JOIN
-lek&eacute;rdez&eacute;seket UNION &eacute;s NOT IN kulcsszavakkal
-lehetett szimul&aacute;lni. P&eacute;ld&aacute;ul a tab1
-&eacute;s a tab2 &ouml;sszekapcsol&aacute;sa:</p>
-<pre><code>SELECT tab1.col1, tab2.col2</code></pre>
-<pre><code>
-FROM tab1, tab2</code></pre>
-<pre><code>
-WHERE tab1.col1 = tab2.col1</code></pre>
-<pre><code>
-UNION ALL</code></pre>
-<pre><code>
-SELECT tab1.col1, NULL</code></pre>
-<pre><code>
-FROM tab1</code></pre>
-<pre><code>
-WHERE tab1.col1 NOT IN (SELECT tab2.col1 FROM tab2)</code></pre>
-<pre><code>
-ORDER BY col1</code></pre>
-<pre><code></code></pre>
-<code></code>
-<a name="4.24"></a> <big style="text-decoration: underline;">4.24)
-Hogyan tudok t&ouml;bb adatb&aacute;zison
-v&eacute;grehajtani lek&eacute;rdez&eacute;st?<br>
-</big>
-<p>Arra nincs lehet&otilde;s&eacute;g, hogy m&aacute;s
-adatb&aacute;zisb&oacute;l k&eacute;rdezz le adatot.Mivel a PostgreSQL
-adatb&aacute;zis specifikus rendszer
-t&aacute;bl&aacute;kat t&ouml;ltbe, bizonytalan hogy egy
-adatb&aacute;zisok k&ouml;z&ouml;tti
-lek&eacute;rdez&eacute;snek hogyankellene viselkednie. </p>
-<p>A contrib/dblink k&ouml;nyvt&aacute;rban tal&aacute;lsz egy
-megold&aacute;st erre, ami funkci&oacute; hiv&aacute;sok
-segits&eacute;g&eacute;vel
-m&ucirc;k&ouml;dik. Persze, a kliens hozhat
-l&eacute;treszimult&aacute;n kapcsolatot t&ouml;bb adatb&aacute;zissal,
-&eacute;s
-&ouml;sszef&eacute;s&uuml;lheti az eredm&eacute;nyeket.</p>
-<p><big style="text-decoration: underline;"><a name="4.25"></a>4.25)
-Hogy tudok t&ouml;bb soros vagy oszlopos
-eredm&eacute;nyt visszaadni egy funkci&oacute;b&oacute;l?</big><br>
-</p>
-<big style="text-decoration: underline;"></big>
-<p>A PL/pgSQL t&aacute;rolt elj&aacute;r&aacute;s nyelvvel refcursor
-haszn&aacute;lat&aacute;val. R&eacute;szletesen itt:</p>
-<p><a
- href="http://www.PostgreSQL.org/idocs/index.php?plpgsql-cursors.html">http://www.PostgreSQL.org/idocs/index.php?plpgsql-cursors.html</a></p>
-<a name="4.26"></a> <big style="text-decoration: underline;">4.26)
-Mi&eacute;rt nem tudom megbizhat&oacute;an
-l&eacute;trehozni &eacute;s t&ouml;r&ouml;lni az &aacute;tmeneti
-t&aacute;bl&aacute;kat a PL/pgSQL funkci&oacute;kban?</big><br>
-<p>A PL/pgSQL cacheli a funkci&oacute;k tartalm&aacute;t, aminek az a
-szerencs&eacute;tlen mell&eacute;khat&aacute;sa, hogy ha egy PL/pgSQL
-funkci&oacute;
-haszn&aacute;l egy &aacute;tmeneti t&aacute;bl&aacute;t, ami
-k&eacute;s&#337;bb t&ouml;rl&otilde;dik majd ujra
-l&eacute;trej&ouml;n, akkor az &uacute;jra lefut&oacute; funkci&oacute;
-nem fogja megtal&aacute;lni a t&aacute;bl&aacute;t, mert
-a cache v&aacute;ltozat a r&eacute;gi t&aacute;bl&aacute;ra tartalmaz
-mutat&oacute;t. A megold&aacute;s erre
-az <code>EXECUTE</code> haszn&aacute;lata az &aacute;tmeneti
-t&aacute;bl&aacute;k
-kezel&eacute;s&eacute;re PL/pgSQL-ben. Ez a lek&eacute;rdez&eacute;s
-&uacute;jraford&iacute;t&aacute;s&aacute;t
-fogja el&otilde;id&eacute;zni minden alkalommal.</p>
-<big style="text-decoration: underline;">4.27)
-Milyen replik&aacute;ci&oacute;s
-lehet&otilde;s&eacute;gek vannak?</big><br>
-<p>B&aacute;r a replik&aacute;ci&oacute; egyetlen ter&uuml;let,
-t&ouml;bb technol&oacute;gia l&eacute;tezik replik&aacute;ci&oacute;ra,
-term&eacute;szetesen mindnek meg vannak a maga el&#337;nyei &eacute;s
-h&aacute;tr&aacute;nyai.</p>
-<p>A master/slave replik&aacute;ci&oacute;s megold&aacute;ssal a master
-adatb&aacute;zison hajthatunk v&eacute;gre modos&iacute;t&aacute;sokat,
-m&iacute;g a slave adatb&aacute;zisokon csak
-lek&eacute;rdez&eacute;seket. A PostgreSQL legn&eacute;pszer&#369;bb
-master/slave replik&aacute;ci&oacute;s megold&aacute;sa a Solny-I. </p>
-<p>Sz&aacute;mos m&aacute;s master/slave replik&aacute;ci&oacute;s
-lehet&otilde;s&eacute;g l&eacute;tezik.Egy List&aacute;t olvashatsz
-ezekr&otilde;l itt: </p>
-<p><a href="http://gborg.PostgreSQL.org/genpage?replication_research">http://gborg.PostgreSQL.org/genpage?replication_research</a></p>
-<p>A multi-master replik&aacute;ci&oacute; lehet&#337;v&eacute; teszi
-t&ouml;bb master adatb&aacute;zis haszn&aacute;lat&aacute;t, b&aacute;r
-ez a technol&oacute;gia drasztikusan cs&ouml;kkenti az adatb&aacute;zis
-teljes&iacute;tm&eacute;ny&eacute;t a sok szinkorniz&aacute;ci&oacute;
-miatt. A PGCluster a legelterjedtebb ilyen megold&aacute;s.</p>
-<p>Egy t&ouml;bbfelhaszn&aacute;l&oacute;s replik&aacute;ci&oacute;s
-rendszer k&eacute;sz&uuml;l itt:</p>
-<p><a
- href="http://gborg.PostgreSQL.org/project/pgreplication/projdisplay.php">http://gborg.PostgreSQL.org/project/pgreplication/projdisplay.php.</a></p>
-<p><a name="4.28"></a><big style="text-decoration: underline;">4.28)
-Milyen k&oacute;dol&aacute;si
-lehet&otilde;s&eacute;gek vannak?</big></p>
-<ul>
-  <li>A contrib/pgcrypto tartlamaz sz&aacute;mos SQL
-lek&eacute;rdez&eacute;sben haszn&aacute;lhat&oacute;
-k&oacute;dol&aacute;st.</li>
-  <li>A kliens-szerver kommunik&aacute;ci&oacute;
-rejtjelez&eacute;s&eacute;re a hostssl haszn&aacute;lhat&oacute;. Ezt a
-pg_hba.conf-ben enged&eacute;lyeztheted.</li>
-  <li>Az adatb&aacute;zis felhszn&aacute;l&oacute;k jelszavait
-t&aacute;rol&aacute;skor k&oacute;dolja a rendszer.&nbsp;</li>
-  <li>R&eacute;gebbi verzi&oacute;kban a PASSWORD_ENCRYPTION
-opci&oacute;val
-lehetett bekapcsolni.</li>
-  <li>A szerveren haszn&aacute;lhatsz k&oacute;dolt f&aacute;jrendszert.<br>
-  </li>
-</ul>
-<hr style="width: 100%; height: 2px;"><br>
-<div style="text-align: center;">
-<h2>A PostgreSQL kiterjeszt&eacute;se</h2>
-</div>
-<br>
-<a name="5.1"></a> <big style="text-decoration: underline;">5.1)
-&Iacute;rtam egy felhaszn&aacute;l&oacute;i
-funkci&oacute;t. Mi&eacute;rt core dumpol az adatb&aacute;zis amikor
-haszn&aacute;lom?<br>
-</big>
-<p>Sz&aacute;mos probl&eacute;ma lehet. El&ouml;bb prob&aacute;ld ki a
-funkci&oacute;dat egy k&uuml;l&ouml;n&aacute;ll&oacute;
-alkalmaz&aacute;sban.</p>
-<p><a name="5.2"></a><big style="text-decoration: underline;">5.2)
-Hogyan lehet &uacute;j adatt&iacute;pusokat
-&eacute;s funkci&oacute;kat hozz&aacute;adni a PostgreSQL </big><big
- style="text-decoration: underline;">disztrib&uacute;ci&oacute;hoz?</big><br>
-</p>
-<p>K&uuml;ldd el a kieg&eacute;sz&iacute;t&eacute;seid a pgsql-hackers
-levelez&eacute;si list&aacute;ra &eacute;s a forr&aacute;skodjaid
-v&eacute;g&uuml;l a contrib-ban k&ouml;tnek ki.</p>
-<a name="5.3"></a> <big style="text-decoration: underline;">5.3)
-Hogyan lehet olyan C funkci&oacute;t
-&iacute;rni, ami Tuple-t ad vissza?</big><br>
-<p>A 7.3 verzi&oacute;t&oacute;l kezdve a PostgreSQL t&aacute;mogatja a
-t&aacute;bl&aacute;zatokat viszzaad&oacute; funkci&oacute;kat C,
-PL/pgSQL &eacute;s SQL nyelveken.
-B&otilde;vebb dokument&aacute;ci&oacute;t a Programoz&oacute;
-k&eacute;zik&ouml;nyvben tal&aacute;lsz. Egy C p&eacute;lda
-funkci&oacute; tal&aacute;lhat&oacute; a contrib/tablefunc
-k&ouml;nyvt&aacute;rban.</p>
-<p><a name="5.4"></a><big style="text-decoration: underline;">5.4)
-Megv&aacute;ltoztattam egy forr&aacute;s
-&aacute;llom&aacute;nyt. Mi&eacute;rt nem v&aacute;ltozik a
-bin&aacute;ris </big><big style="text-decoration: underline;">&uacute;jraford&iacute;t&aacute;s
-ut&aacute;n?</big><br>
-</p>
-<p>A Makefile-ok nem ismerik a include &aacute;llom&aacute;nyok
-megfelel&otilde; f&uuml;gg&otilde;s&eacute;geit. V&eacute;gre kell
-hajtanod egy make clean-t, majd &uacute;jra egy
-make-t. Ha GCC-t haszn&aacute;lsz felhaszn&aacute;lhatod a configure
-script
---enable-depend opci&oacute;j&aacute;t, &iacute;gy a compiler maga
-fogja ellen&otilde;rizni a
-f&uuml;gg&otilde;s&eacute;geket.</p>
-<br>
-<br>
-</body>
-</html>
diff --git a/doc/src/FAQ/FAQ_japanese.html b/doc/src/FAQ/FAQ_japanese.html
deleted file mode 100644
index 9aa6b7e805..0000000000
--- a/doc/src/FAQ/FAQ_japanese.html
+++ /dev/null
@@ -1,1399 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>PostgreSQL FAQ in Japanese</TITLE>
-</HEAD>
-<BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#FF0000" VLINK="#A00000" ALINK="#0000FF">
-<META http-equiv="Content-Type" content="text/html; charset=utf-8">
-
-<h1>PostgreSQL(ポストグレス・キュー・エル)についてよくある質問とその解答(FAQ)</h1>
-<p>原文最終更新日:	Thu Jan 01 14:01:00 EDT 2009</p>
-<p>現在の維持管理者:	Bruce Momjian (<A
-href="mailto:[email protected]">[email protected]</a>)<br />
-Maintainer of Japanese Translation:	Jun Kuwamura (<A
-href="mailto:juk at postgresql.jp">juk at postgresql.jp</a>)<br /></p>
-<p>この文書の最新版は<a href=
-    "http://www.postgresql.org/docs/faqs.FAQ.html">
-    http://www.postgresql.org/docs/faqs.FAQ.html</a>
-で見ることができます。</p>
-<p>プラットホームに特有の質問については:<a href=
-    "http://www.postgresql.org/docs/faq/">
-    http://www.postgresql.org/docs/faq/</a>
-<br />
-に解答があります。</p>
-
-<p><small><pre>
-(以下、訳者による注釈を [訳注： と ] とで囲んで記します。)
-[訳注：
-	日本語版のFAQは、
-		http://www.postgresql.org/docs/faqs.FAQ_japanese.html
-	にあります。
-	最新の日本語版については、この文書の最後にある<a
-	href="#item-japanese">「日本語版について」</a>をごらんください。
-
-]
-</pre></small></p>
-
-<hr />
-
-<h2 align="center">一般的な質問</h2>
-
-<a href="#item1.1">1.1</a>) PostgreSQLとは何ですか？ その呼び方は？ Postgresとは？<br />
-<a href="#item1.2">1.2</a>) 誰が PostgreSQL をコントロールしていますか？<br />
-<a href="#item1.3">1.3</a>) PostgreSQLの著作権はどうなってますか？<br />
-<a href="#item1.4">1.4</a>) PostgreSQLをサポートするプラットホームは？<br />
-<a href="#item1.5">1.5</a>) PostgreSQLはどこから入手できますか？<br />
-<a href="#item1.6">1.6</a>) 最新のリリースはどれですか？<br />
-<a href="#item1.7">1.7</a>) サポートはどこで受けられますか？<br />
-<a href="#item1.8">1.8</a>) バグレポートはどのように発信しますか？<br />
-<a href="#item1.9">1.9</a>) 既知のバグや未だ無い機能はどうやって見つけますか？<br />
-<a href="#item1.10">1.10</a>) どのような文書がありますか？<br />
-<a href="#item1.11">1.11</a>) <small>SQL</small>はどうすれば学べますか？<br />
-<a href="#item1.12">1.12</a>) パッチを提供したり、開発チーム参加するにはどうすればよいですか？<br />
-<a href="#item1.13">1.13</a>) 他の<small>DBMS</small>と比べてPostgreSQL はどうなのですか？ PostgreSQLを組み込みに使えますか？<br />
-<a href="#item1.14">1.14</a>) PostgreSQLは国毎の最新の夏時間の変更を扱いますか？<br />
-<a href="#item1.15">1.15</a>) PostgreSQLのメーリングリストの購読をやめるにはどうすればよいですか？また、電子メールを重複して受け取らないようにするにはどうしますか？<br />
-
-<h2 align="center">ユーザ・クライアントの質問</h2>
-
-<a href="#item2.1">2.1</a>) PostgreSQL にはどんなインターフェースが使えますか？<br />
-<a href="#item2.2">2.2</a>) PostgreSQL を Web ページと連携させるにはどんなツールがありますか？<br />
-<a href="#item2.3">2.3</a>) PostgreSQL にグラフィカル・ユーザインターフェースはありますか？<br />
-
-
-<h2 align="center">管理上の質問</h2>
-
-<a href="#item3.1">3.1</a>) どうすれば、PostgreSQLを<i>/usr/local/pgsql</i> 以外の場所にインストールできますか？<br />
-<a href="#item3.2">3.2</a>) 他のホストからの接続はどのように制御しますか？<br />
-<a href="#item3.3">3.3</a>) より良い性能を得るためには、データベース・エンジンをどのように調整しますか？<br />
-<a href="#item3.4">3.4</a>) どのようなデバグ機能が使えますか？<br />
-<a href="#item3.5">3.5</a>) 接続しようとするときに <i>'Sorry, too many clients'</i> が出るのはなぜですか？<br />
-<a href="#item3.6">3.6</a>) PostgreSQLのアップグレードの手順はどうなりますか？<br />
-<a href="#item3.7">3.7</a>) ハードウェアにはどのようなコンピュータを使えばよいですか？<br />
-
-
-<h2 align="center">操作上の質問</h2>
-
-<a href="#item4.1">4.1</a>) 最初のいくつかのロウのみを <small>select</small> するにはどうしますか？ ランダムなロウ？ <br />
-<a href="#item4.2">4.2</a>) 定義されたテーブル、インデックス、データベース、および、ユーザをどのようにして見つけ出しますか？<br />
-<a href="#item4.3">4.3</a>) カラムのデータタイプを変更するにはどうしますか？<br />
-<a href="#item4.4">4.4</a>) ロウ、テーブル、データベースの最大サイズは？<br />
-<a href="#item4.5">4.5</a>) 一般的なテキストファイルのデータを保存するには、データベースのディスク容量はどのくらい必要ですか？<br />
-<a href="#item4.6">4.6</a>) クエリが遅いのはなぜでしょう？ なぜ、インデックスが使われないのでしょうか？<br />
-<a href="#item4.7">4.7</a>) クエリオプティマイザが、どのようにクエリを評価していかを、見るにはどうしますか？<br />
-<a href="#item4.8">4.8</a>) 正規表現での検索や大文字と小文字とを区別しない正規表現検索はどのように実現しますか？大文字と小文字とを区別しない検索のためのインデックスはどのように使いますか？<br />
-<a href="#item4.9">4.9</a>) クエリの中で、フィールドが
-<small>NULL</small> であることを検出するにはどうしますか？
-<small>NULL</small>の可能性のあるものをどのようすれば連結できますか? 
-フィールドが<small>NULL</small>かどうかでどのようにソートができますか？<br />
-<a href="#item4.10">4.10</a>) いろいろな文字型のそれぞれの違いは何ですか？<br />
-<a href="#item4.11.1">4.11.1</a>) 通番(serial)／自動増分フィールドはどのようにつくりますか？<br />
-<a href="#item4.11.2">4.11.2</a>) <small>SERIAL</small>データ型に挿入される値は、どうすれば得られますか？<br />
-<a href="#item4.11.3">4.11.3</a>) <i>currval()</i> は他のユーザとの競合状態に陥ることはないですか？<br />
-<a href="#item4.11.4">4.11.4</a>) トランザクションが中断したときにもういちどシーケンス番号が使われないのはなぜですか？シーケンス／SERIALカラムに空きがあるのはなぜですか？<br />
-<a href="#item4.12">4.12</a>) <small>OID</small> とは何ですか？ <small>TID</small> とは何ですか？<br />
-<a href="#item4.13">4.13</a>) エラーメッセージ <i>"ERROR: Memory exhausted in AllocSetAlloc()"</i>が出るのはなぜですか？<br />
-<a href="#item4.14">4.14</a>) どのバージョンの PostgreSQL を走らせているのかを調べるにはどうしますか？<br />
-<a href="#item4.15">4.15</a>) 現在の時刻がデフォルトとなるようなカラムはどのようにつくりますか？<br />
-<a href="#item4.16">4.16</a>) <i>外部</i>結合(<i>outer</i> join)はどのように実現しますか?<br />
-<a href="#item4.17">4.17</a>) 複数のデータベースを使う問い合わせはどのようにすればできますか？<br />
-<a href="#item4.18">4.18</a>) 関数から複数のロウまたはカラムを返すにはどうしますか？<br />
-<a href="#item4.19">4.19</a>)  PL/PgSQL の関数の中で一時テーブルにアクセスするとき、どうして "relation with OID ##### does not exist" というエラーを受け取るのでしょうか？<br />
-<a href="#item4.19">4.20</a>) どのようなレプリケーションのソリューションがありますか？<br />
-<a href="#item4.20">4.21</a>) テーブルとカラムの名前がクエリーの中で認識
-されないのはなぜですか？ なぜ大文字化(キャピタライズ)は温存されないのですか?<br />
-
-<h2 align="center">日本語に関する質問</h2>
-
-<a href="#item5.1">5.1</a>) 日本語がうまく扱えないのはなぜですか？<br />
-<a href="#item5.2">5.2</a>) psql でWindowsからアクセスしたときに、日本語が文字化けするのですが？<br />
-<a href="#item5.3">5.3</a>) PostgreSQLで日本語の全文検索はできますか？<br />
-
-
-<hr />
-
-<h2 align="center">一般的な質問</h2>
-
-<h4 id="item1.1">1.1</a>) PostgreSQLとは何ですか？ その呼び方は？ Postgresとは？</h4>
-
-    <p>PostgreSQLは<i>Post-Gres-Q-L</i>(ポスト・グレス・キュー・エル) 
-    と発音しますが、会話の中では単純に <i>Postgres</i> と呼ばれることも
-    あります。（"PostgreSQL"をどう発音するか気になる人のために、
-     <a href="http://www.postgresql.org/files/postgresql.mp3">
-    音声ファイル</a>を用意してあります。</p>
-
-    <p>PostgreSQL はオブジェクト-リレーショナルデータベースシステムで、
-    伝統的な商用データベースシステムに、次世代<small>DBMS</small>システ
-    ムに見られるような改良が施された特徴を有します。PostgreSQLは、無料で
-    完全なソースコードを手に入れることができます。</p>
-
-    <p>PostgreSQL の開発は、ほとんどが、世界中にひろがったボランティアの
-    開発者によって、インターネットを通したコミュニケーションによって行わ
-    れています。コミュニティによるプロジェクトであるため、どの企業の制御
-    もうけません。開発に参加したければ、<a href=
-    "http://www.postgresql.org/docs/faqs.FAQ_DEV.html">
-    http://www.postgresql.org/docs/faqs.FAQ_DEV.html</a>
-    にある開発者のFAQを見てください。
-    </p>
-
-    <p>PostgresはPostgreSQLの広く使われている愛称です。また、バークレー
-    でのプロジェクトでもともと使われていた名前で、ほかのいずれの愛称に
-    比べても遥かに好ましいです。'PostgreSQL' の発音が難しいと思うのであ
-    れば、そのかわりに 'Postgres' と呼ぶようにしましょう。</p>
-
-
-<h4 id="item1.2">1.2</a>) 誰が PostgreSQL をコントロールしていますか？</h4>
-
-    <p>PostgreSQLの門番、中央委員会、あるいは、コントロールをする会社を
-      探そうとしても、諦めざるをえず ---- 存在しないのです。我々は、中心
-      となるコミッティとCVSコミッタを持ちますが、これらのグループはコン
-      トロールするためというよりも、管理上のものです。ここでは、プロジェ
-      クトは、だれでも参加ができる開発者とユーザのコミュニティにより方向
-      付けられます。読者がやらなければならないことは、メーリングリストを
-      サブスクライブして、議論に 参加することです。（<a
-      href="http://wiki.postgresql.org/wiki/Developer_FAQ">Developer's
-      FAQ</a>には、PostgreSQL開発に加わり方についての情報があります。）</p>
-
-
-<h4 id="item1.3">1.3</a>) PostgreSQL の著作権はどうなってますか？</h4>
-
-    <p> PostgreSQL は下記の著作権に従います。</p>
-    <p> PostgreSQLは古くからのBSDライセンスの下で配布されています。それ
-      は基本的には、利用者がそのコードを好き勝手に利用することが許されて
-      います。制限があるとすれば、このソフトウェアに伴ういかなる問題にお
-      いても法的に責任を我々に負わせることができないということです。
-      また、この著作権表示がこのソフトウェアのすべての複製に表示すること
-      も必要です。以下に、我々が実際に使っているBSD使用許諾書を示します：
-</p>
-
-    <small><pre>
-    [訳注：
-        正文は英語です。参考として、訳文を併記掲載します。
-    ]
-    </pre></small>
-    <p>PostgreSQL Data Base Management System</p>
-    <p>
-    Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
-    Portions Copyright (c) 1994-1996 Regents of the University of California</p>
-    <p>
-    Permission to use, copy, modify, and distribute this software and its
-    documentation for any purpose, without fee, and without a written
-    agreement is hereby granted, provided that the above copyright notice
-    and this paragraph and the following two paragraphs appear in all
-    copies.</p>
-    <p>
-    IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY
-    FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
-    INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
-    DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF
-    THE POSSIBILITY OF SUCH DAMAGE.</p>
-    <p>
-    THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER
-    IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO
-    OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-    MODIFICATIONS.</p>
-
-    <small><pre>
-	POSTGRESQL データベース管理システム
-
-	部分的著作権 (c) 1996-2009, PostgreSQL国際開発グループ
-	部分的著作権 (c) 1994-1996 カリフォルニア大学本校
-
-
-	  本ソフトウェアおよびその文書一式は上記の著作権表示と、この文章
-	およびこれに続く二つの段落が全ての複製に添付されている限りにおい
-	て、使用、複製、修正および配付の許可を、いかなる目的であっても、
-	無償でかつ同意書無しに行なえることをここに認めます。
-	
-	  カリフォルニア大学は、いかなる当事者にたいしても、利益の壊失を
-	含む、直接的、間接的、特別、偶然あるいは必然的にかかわらず生じた
-	損害について、たとえカリフォルニア大学がこれらの損害について訴追
-	を受けていたとしても、一切の責任を負いません。
-	
-	  カリフォルニア大学は、商用目的における暗黙の保証と、特定目的で
-	の適合性に関してはもとより、これらに限らず、いかなる保証も放棄す
-	ることを明言します。以下に用意されたソフトウェアは「そのまま」を
-	基本原理とし、カリフォルニア大学はそれを維持、支援、更新、改良あ
-	るいは修正する義務を負いません。
-
-    [訳注：
-	著作権に関する正文は上記の英語による表記です。日本語訳はあくまで
-	参考程度としてください。
-    ]
-    </pre></small>
-
-<h4 id="item1.4">1.4</a>) PostgreSQLをサポートするプラットホームは？</h4>
-
-    <p>一般的に、最近のUnix互換プラットホームであればPostgreSQLを稼働さ
-    せられるはずです。リリースの時点で実際にテストを行なったことの報告が
-    なされたプラットホームについてはインストール手引書に列挙してあります。
-    </p>
-
-    <p>PostgreSQL は、Win2000 SP4, WinXP, そして、Win2003 など Microsoft
-    Windows NTベースのオペレーティングシステムで、ネイティブに走ります。
-    あらかじめパッケージにされたインストーラが<a href= 
-    "http://www.postgresql.org/download/windows">
-    http://www.postgresql.org/download/windows</a>
-    からダウンロードできます。
-    MSDOSベースのWindowsのバージョン(Win95, Win98, WinMe)では、Cygwinを
-    使って PostgreSQL を走らせることができます。</p>
-
-    <small><pre>
-    [訳注
-	日本語での情報は、次の Windows版に関するFAQの和訳をごらんくださ
-    い（やや古いです）。
-	http://old.postgresql.jp/wg/jpugdoc/FAQ_windows.ja.html
-    ]
-    </pre></small>
-
-    <p>次のサイトに Novell Netware 6 への移植版もあります。
-    <a href="http://developer.novell.com/wiki/index.php/Postgresql">
-http://developer.novell.com/wiki/index.php/Postgresql</a>
-    また、OS/2 (eComStation) バージョンは、<a href=
-    "http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&button=Search&key=postgreSQL&stype=all&sort=type&dir=%2F">
-    http://hobbes.nmsu.edu/cgi-bin/h-search?sh=1&button=Search&key=postgreSQL&stype=all&sort=type&dir=%2F</a>にあります。</p>
-<br />
-
-
-<h4 id="item1.5">1.5</a>) PostgreSQL はどこから入手できますか？</h4>
-
-    <p>Webブラウザ経由だと、<a href="http://www.postgresql.org/ftp/">
-    http://www.postgresql.org/ftp/</a>、それから、ftp経由だと、
-    <a href="ftp://ftp.postgresql.org/pub/">
-    ftp://ftp.postgresql.org/pub/</a> を使います。</p>
-
-
-<h4 id="item1.6">1.6</a>) 最新のリリースはどれですか？</h4>
-
-    <p>PostgreSQL の最新版はバージョン 8.3.5 です。</p>
-    <p>我々は、1年毎にメジャーリリースを、数ヵ月ごとのマイナーリリースを
-    行なうことを計画しています。</p>
-
-    <p><small><pre>
-    [訳注
-	バージョン番号の x.y.z の最初の x.y がメジャーリリースの番号に相
-	当し、最後の z がマイナーリリースの番号になります。メジャーリリー
-	スの番号が同じであれば、データベース・クラスタに互換性があります。
-    ]
-    </pre></small></p>
-
-
-<h4 id="item1.7">1.7</a>) サポートはどこで受けられますか？</h4>
-
-    <p>PostgreSQL コミュニティは多くのユーザのために、電子メール経由の支
-    援を提供しています。電子メールリストをサブスクライブするためのメイン
-    となるウェブサイトは
-    <a href="http://www.postgresql.org/community/lists/">
-    http://www.postgresql.org/community/lists/</a>です。これから、始める
-    のであれば <i>general</i> または、<i>bugs</i> といったリストがよいで
-    しょう。</p>
-
-    <p>メジャーなIRC チャンネルは、Freenode (<i>irc.freenode.net</i>)の
-    <i>#postgresql</i> というチャンネルです。UNIX コマンドでは、
-    <code>irc -c '#PostgreSQL' "$USER" irc.freenode.net</code> を使って
-    参加できます。同じネットワークに、スペイン語のチャンネル
-    (<i>#postgresql-es</i>)、フランス語のチャンネル
-    (<i>#postgresqlfr</i>)、ブラジル語チャンネル (<i>#postgresql-br</i>)
-    もあります。また、EFNetにもPostgreSQLチャンネルがあります。</p>
-
-    <p><small><pre>
-    [訳注:
-	  1999年7月23日、日本ポストグレスユーザー会、略称JPUGが設立されました。
-	JPUG は非営利組織で、PostgreSQLを利用する人達の相互協力の場となっています。  
-	(2006年 特定非営利活動(NPO)法人日本PostgreSQLユーザ会になりました。
-	Web会員と正会員の会費は無料ですが、協賛会員の会費と会員の貢献で
-	  会は運営されています。)
-	詳しくは、JPUG のWeb サイト:
-		<a href="http://www.postgresql.jp/">http://www.postgresql.jp/</a>
-	をごらんください。
-
-	日本語のIRCチャンネル '#PostgreSQL:*.jp' も存在します。
-    ]
-    </pre></small></p>
-
-    <p>商用サポート会社のリストは<a
-    href="http://www.postgresql.org/support/professional_support">
-    http://www.postgresql.org/support/professional_support</a>にあります。</p>
-
-
-<h4 id="item1.8">1.8</a>) バグレポートはどのように発信しますか？
-</h4>
-
-    <p><a href=
-    "http://www.postgresql.org/support/submitbug">
-    http://www.postgresql.org/support/submitbug</a>
-    のPostgreSQL バグフォームを訪れてください。 バグレポートを提出する仕方
-    についての手引と指針があります。</p>
-
-    <p> それと同時に ftp サイト <A
-    href="ftp://ftp.postgresql.org/pub/">ftp://ftp.postgresql.org/pub/</a>
-    で、最新バージョンの PostgreSQL を探してみてください。</p>
-
-
-<h4 id="item1.9">1.9</a>) 既知のバグや未だ無い機能はどうやって見つけますか？
-</h4>
-
-    <p>PostgreSQLは拡張された<small>SQL:2003</small>のサブセットをサポート
-    します。我々のページの <A
-    href="http://www.PostgreSQL.org/docs/todo.html">TODO</a> リストに、
-    既知のバグや欠落機能や将来計画についての記述があります。</p> 
-
-
-    <p>特徴の要求は普通次のいずれかの解答の中にあります：</p>
-    <ul>
-   <li>既にここにある機能は、
-    <a href="http://www.postgresql.org/docs/faqs.TODO.html">TODO</a>
-    リストです</li>
-    <li>次のような機能は目論まれていません。それは：
-        <ul>
-        <li>SQL規格に準ずる既存の機能と重複するもの</li>
-        <li>コードの複雑性ばかりを高めて、得るものが少ない機能</li>
-        <li>安全性が確められない機能</li>
-        </ul>
-    </li>
-    <li>新しい機能は、
-    <a href="http://www.postgresql.org/docs/faqs.TODO.html">TODO</a>
-    のリストに</li>加えられられます。
-    </ul>
-    
-    <p>我々は、PostgreSQL に関して、電子メールで直接対応して
-    <a href="http://www.postgresql.org/docs/faqs.TODO.html">TODO</a>
-    リストを最新に更新してゆくほうがより効果的であることを知っています
-    ので、バグ追跡システムは使いません。
-    現実に、このソフトウェアの中でバグはそれほど長くはい続けませんし、
-    多くのユーザに影響するバグは早急に修正されます。PostgreSQLのリリース
-    で、すべての変更点、改良点、そして、修正点を知りたければ、
-    <a href="http://www.postgresql.org/developer/sourcecode/">CVS</a>
-    のログメッセージを見てください。リリースノートにさえ、このソフトウェア
-    に加えられたすべての変更点は網羅されていません。</p>
-
-
-<h4 id="item1.10">1.10</a>) どのような文書がありますか？</h4>
-
-    <p> 配付の中に、いくつかのマニュアルとオンライン・マニュアル(マニュ
-    アル・ページ)およびいくつかの小さなテスト例題が含まれます。
-    <i>/doc</i>ディレクトリをごらんください。また、マニュアルは、<A
-    href="http://www.postgresql.org/docs/">
-http://www.postgresql.org/docs/</a>でオンラインでも閲覧できます。
-    </p>
-
-
-    <p><small><pre>
-    [訳注:
-	JPUG 文書・書籍関連分科会で翻訳されたマニュアルもあります。
-		<a href="http://www.postgresql.jp/document/pg835doc/">
-	http://www.postgresql.jp/document/pg830doc/</a>
-	インプレスから、
-	<a href="http://home.impress.co.jp/reference/2108.htm">
-	PostgreSQLオフィシャルマニュアル</a>として出版されています。
-    ]
-    </pre></small></p>
-
-
-    <p>オンラインで参照できる PostgreSQL の本も2冊あります。<a href=
-    "http://www.postgresql.org/docs/books/awbook.html">
-    http://www.postgresql.org/docs/books/awbook.html</a>
-
-    <p><small><pre>
-    [訳注:
-	この本は、JPUG<a href="http://www.postgresql.jp/wg/psqltrans/">「PostgreSQL Book翻訳分科会」
-	</a>で翻訳され、ピアソンから<a href="http://www.seshop.com/detail.asp?pid=2587">
-	「はじめてのPostgreSQL」</a>として出版されています。
-    ]
-    </pre></small></p>
-
-    および、 <a href=
-    "http://www.commandprompt.com/ppbook/">
-    http://www.commandprompt.com/ppbook/</a>です。
-
-    <p><small><pre>
-    [訳注:
-	邦訳は<a href="http://www.oreilly.co.jp/books/4873111021/">「実践 PostgreSQL」
-	</a>がオライリーから出版されています。
-    ]
-    </pre></small></p>
-  
-    購入可能な書籍の目録は、<a href=
-    "http://www.postgresql.org/docs/books/">http://www.postgresql.org/docs/books/</a>
-    にあります。
-
-    PostgreSQL 技術情報記事も、<a href=
-    "http://wiki.postgresql.org/wiki/Community_Generated_Articles%2C_Guides%2C_and_Documentation">http://wiki.postgresql.org/wiki/Community_Generated_Articles%2C_Guides%2C_and_Documentation</a>
-    にあります。</p>
-
-    <p><small><pre>
-    [訳注:
-	日本語の書籍等については、日本PostgreSQLユーザ会の、<A
-	href="http://old.postgresql.jp/PostgreSQL/references.html">http://www.postgresql.jp/PostgreSQL/references.html</a>
-	もごらんください。
-    ]
-    </pre></small></p>
-
-    <p> コマンドラインのクライアントプログラム<i>psql</i> にも、型、
-    演算子、関数、集約、その他の情報を調べるために、素晴らしい \d コマンド
-    がいくつかあります。  \? を入力すると利用可能なコマンドが表示されます。</p>
-
-    <p> 我々の Web サイトには、さらに沢山の文書があります。</p>
-
-    <p><small><pre>
-    [訳注:
-	2008年11月18日、PostgreSQL普及のために一般向けの情報を扱う
-	「Let's Postgres」というポータルサイトがオープンしました。<A
-	href="http://lets.postgresql.jp/">http://lets.postgresql.jp/</a>
-    ]
-    </pre></small></p>
-
-
-<h4 id="item1.11">1.11</a>) <small>SQL</small> はどうすれば学べますか？</h4>
-
-    <p>まず、 上記で述べた PostgreSQL についての本を読むことを検討してください。
-    <i>The Practical SQL Handbook</i>, Bowman Judith S. et al.,
-    Addison-Wesley も多くのユーザに好評です。 ほかでは、<i>The Complete
-    Reference SQL</i >, Groff et al., McGraw-Hill も好評です。</p>
-
-
-    <p>素晴らしい手引書は、<a href=
-    <ul>
-    <li> <a href="http://www.intermedia.net/support/sql/sqltut.shtm">http://www.intermedia.net/support/sql/sqltut.shtm</a>
-    </li>
-    <li>
-    <a href="http://sqlcourse.com/">http://sqlcourse.com</a>
-    </li>
-
-    <li>
-    <a href="http://www.w3schools.com/sql/default.asp">http://www.w3schools.com/sql/default.asp</a>
-    </li>
-    <li><a href=
-    "http://mysite.verizon.net/Graeme_Birchall/id1.html">http://mysite.verizon.net/Graeme_Birchall/id1.html</a>
-    </li>
-    <li><a href=
-    "http://sqlzoo.net">http://sqlzoo.net</a>
-    </li>
-    </ul>
-    にあります。</p>
-
-
-    <p><small><pre>
-    [訳注:
-	 日本PostgreSQLユーザ会の日本語の参考文献の紹介ページ
-		<a href="http://www.postgresql.jp/PostgreSQL/references.html">
-http://www.postgresql.jp/PostgreSQL/references.html</a>
-	があります。
-	 堀田倫英氏の「PostgreSQL日本語マニュアル」
-		<a href="http://www.net-newbie.com/">http://www.net-newbie.com/</a>
-	ではオンラインマニュアルの検索ができます。
-	 丸山不二夫氏のUNIX データベース入門
-		<a href="http://www.wakhok.ac.jp/DB/DB.html">http://www.wakhok.ac.jp/DB/DB.html</a>
-	もオンラインで読むことができます。
-	 Nikkei BP IT Pro にある石井達夫氏の <a href="http://itpro.nikkeibp.co.jp/article/COLUMN/20060120/227628/">PostgreSQL ウォッチ</a>
-	では毎回新しい情報をとりあげています。
-    ]
-    </pre></small></p>
-
-<h4 id="item1.12">1.12</a>) パッチを提供したり、開発チーム参加するにはどうすればよいですか？</h4>
-
-    <p><a href="http://www.postgresql.org/docs/faqs.FAQ_DEV.html">
-    （開発者向けの）Developer's FAQ</a>をごらんください。</p>
-
-
-<h4 id="item1.13">1.13</a>) 他の<small>DBMS</small>と比べPostgreSQLはどうなのですか？ PostgreSQLを組み込みに使えますか？</h4>
-
-    <p>ソフトウェアを評価する方法にはいくつかあります。機能と性能と信頼性と
-    サポートと価格です。</p> 
-
-    <dl>
-      <dt> <b>機能(Features)</b></dt>
-      <dd>
-      PostgreSQLは、トランザクション、サブクエリ、トリガー、ビュー、外
-      部キー整合性参照、および、洗練されたロック機構など、大規模商用
-      <small>DBMS</small>が持つ機能をほとんど持っています。さらに
-      PostgreSQLは、ユーザ定義型、継承、ルール、それから、ロック競合を縮
-      小するマルチバージョン同時性制御など、商用<small>DBMS</small>も持
-      ち合わせないような機能をいくつか持ち合わせています。<br />
-
-      </dd>
-
-      <dt> <b>性能(Performance)</b></dt>
-      <dd>
-      PostgreSQLは他の商用あるいはオープンソースのデータベースと互角の性
-      能も持ちます。ある面ではより早かったり、ほかの面ではより遅かったり
-      します。他のデータベースに比べた性能は、ふつう +/-10% くらいでしょう。
-      </dd>
-
-      <dt> <b>信頼性(Reliability)</b></dt>
-      <dd>
-      我々は、<small>DBMS</small>の信頼性が高くなくてはその価値が無いこ
-      とを理解してます。十分テストして、安定したコードをバグを最小にして
-      からリリースするように努めてます。それぞれのリリースは少なくとも1
-      カ月以上のベータ・テストを行ない、これまでのリリースの履歴が、製品
-      版として安定した堅固なリリースであることを物語っています。この分野
-      では、他のデータベースと比べても遜色がないことに自信を持っています。
-      <br /> 
-      </dd>
-
-      <dt> <b>サポート(Support)</b></dt>
-      <dd>
-      我々のメーリングリストは、遭遇するいかなる問題についても解決への手
-      助けをしてくれる、開発者やユーザの大きな集まりへの接点を提供してい
-      ます。我々は問題の解決を保証することはできませんが、商用データベー
-      スであっても常に解決されるわけではありません。開発者や、ユーザ・コ
-      ミュニティ、マニュアル類、それに、ソースコードなどへ直接アクセスで
-      きることによって、PostgreSQLのサポートは、他の<small>DBMS</small>
-      サポートよりも優れたものとなっています。御要望に答えて、事柄毎の商
-      用サポートなどもあります（<a href="#item1.7">FAQ1.7節</a>をごらんくだ
-      さい）。
-      <br /> 
-      </dd>
-
-      <dt> <b>価格(Price)</b></dt>
-      <dd>
-      PostgreSQLの利用は、商用でも非商用でも、すべて無料です。上記に示し
-      てあるBSDスタイルの使用許諾に外れない限り、PostgreSQLのコードを制
-      限無しで商品に組み込むことができます。<br /> 
-      </dd>
-   </dl>
-    PostgreSQLはクライアント／サーバ・アーキテクチャで設計されていて、
-    クライアントとサーバおよびそれを補助するいろいろなプロセスが別々に走
-    ることが要求されます。多くの組み込みアーキテクチャはこのような要求を
-    サポート可能です。しかし、お使いになっている組み込みアーキテクチャに
-    よっては、データベースサーバがアプリケーション・プロセスの中で走るこ
-    とを要求される場合があり、Postgresを使うことはできないので、軽量のデー
-    タベースソリューションを選択すべきです。
-   </p>
-
-<h3 id="item1.14">1.14) PostgreSQLは国毎の最新の夏時間の変更を扱いますか？</h3>
-
-   <p>合州国の夏時間の変更は、PostgreSQLのリリース8.0.4以降[4+]と、その
-      後のメジャーリリース、たとえば 8.1 には含まれています。カナダとオー
-      西部ストラリアの変更は、8.0.[10+], 8.1.[6+] および、その後のメジャー
-      リリースのすべてに含まれます。8.0より前のPosrgreSQLではオペレーティ
-      ングシステムのタイムゾーンデータベースを夏時間情報のために使ってい
-      ます。</p>
-
-<hr />
-
-<h3 id="item1.15">1.15)  PostgreSQLのメーリングリストの購読をやめるにはどうすればよいですか？また、電子メールを重複して受け取らないようにするにはどうしますか？
-</h3>
-
-    <p>PostgreSQLの<a
-    href="http://mail.postgresql.org/mj/mj_wwwusr/domain=postgresql.org?user=&amp;passw=&amp;func=login">Majordomo</a>
-    ページから、PostgreSQLに関する複数のメーリングリストの購読の開始と中止
-    ができるようになっています。（ログインするためにはMajaordomoから送ら
-    れる御本人のパスワードが必要になります。）</p>
-
-    <p>PostgreSQLnoすべてのメーリングリストでは、返信はメーリングリスト
-    と<i>かつ</i>元のメールの投稿者へ送られるように構成してあります。こ
-    れにり利用者は、もっとも迅速にメールへの返信を受けられるようになって
-    います。既に直接受け取っているメールを、リストから重複して受け取りた
-    くない場合は、Majordomo の<i>Change Settings</i>ページから、
-    <i>eliminatecc</i>をチェックします。また、<i>selfcopy</i>のチェック
-    をはずすことで、自分の送ったメールのコピーを受け取らないようにもでき
-    ます。</p>
-
-
-<h2 align="center">ユーザ・クライアントの質問</h2>
-
-
-<h4 id="item2.1">2.1</a>) PostgreSQL にはどんなインターフェースが使えますか？</h4>
-
-    <p>PostgreSQL のインストールに含まれる物は<small>C</small>と組込み
-    <small>C</small>のインターフェースだけです。その他のインターフェース
-    は独立したプロジェクトで、別々にダウンロードされます。分かれることで、
-    それぞれの開発チームが独自のリリーススケジュールを持つことが許されま
-    す。</p>
-
-    <p><small>PHP</small> のようないくつかのプログラミング言語は、
-    PostgreSQLのインターフェースを含んでいます。Perl, <small>TCL</small>,
-    Python, そして、そのほかの利用可能な言語のインターフェースは、<a 
-    href="http://pgfoundry.org">http://pgfoundry.org</a>
-    の <i>Drivers/Interfaces</i> の節の中とインターネットの検索でみつけ
-    られます。
-    </p>
-
-
-<h4 id="item2.2">2.2</a>) PostgreSQL を Web ページと連携させるにはどんなツールがありますか？</h4>
-
-    <p> データベースを裏に持つ Web ページについての素晴らしい紹介が、<br />
-    <a href="http://www.webreview.com">http://www.webreview.com</a>にあります。</p>
-    <p> Web への拡張のためには、PHP(<a  href="http://www.php.net">http://www.php.net/</a>)
-     が卓越したインターフェースとなっています。</p>
-
-    <p><small><pre>
-    [訳注:
-	  PHPに関する日本語の情報は、2000年4月19日に発足した日本PHPユーザ会のサイト
-		<a href="http://www.php.gr.jp/">http://www.php.gr.jp/</a>
-	あるいは、廣川 類さんのサイト
-		<a href="http://www.geocities.jp/rui_hirokawa/php/">http://www.geocities.jp/rui_hirokawa/php/</a>
-	にかなりまとめられています。
-    ]
-    </pre></small></p>
-
-    <p> 処理が複雑な場合、多くの人は Perl インターフェースと CGI.pm か
-    mod_perl を使います。 </p>
-
-
-<h4 id="item2.3">2.3</a>) PostgreSQL にグラフィカル・ユーザインターフェースはありますか？</h4>
-
-
-    <p>商用とオープンソース開発者によるもの両方で、PostgreSQLには多くのGUIツールが利用可能で、詳細なリストは、<a
-href="http://wiki.postgresql.org/wiki/Community_Guide_to_PostgreSQL_GUI_Tools">
-PostgreSQL GUI ツールについてのコミュニティガイド</a> にてごらんください。</p>
-
-    <p><small><pre>
-    [訳注:
-	pgAdmin3 はPostgreSQL標準GUI管理ツールで、Windows版(PostgreSQL
-	for Windows) に同梱されています。詳しい情報は、
-	<a href="http://www.pgadmin.org/">http://www.pgadmin.org/</a>にあります。
-    ]
-    </pre></small></p>
-
-<hr />
-
-<h2 align="center">管理上の質問</h2>
-
-<h4 id="item3.1">3.1</a>) どのようにすれば <i>/usr/local/pgsql</i> 以外の場所にインストールできますか？</h4>
-
-    <p> 簡単な方法は、 <i>configure</i> を走らせるときに --prefix オプショ
-    ンを指定することです。 </p>
-
-
-<h4 id="item3.2">3.2</a>) 他のホストからの接続はどのように制御しますか？</h4>
-
-    <p>既定値では、PostgreSQL は Unix ドメインソケット、または、TCP/IP接
-     続のローカルマシンからの接続しか許しません。postgresql.conf の中の
-     listen_addresses を修正し、<b>かつ</b>、<i>$PGDATA/pg_hba.conf</i>
-     ファイルを適切に直し、データベースサーバを再起動して、ホストベース
-     の認証を有効にしないかぎりは、他のマシンからは接続できないでしょう。</p>
-
-
-<h4 id="item3.3">3.3</a>) より良い性能を得るためには、データベース・エンジンをどのように調整しますか？</h4>
- 
-    <p>性能改善の可能性のありそうな主な領域が3つあります：</p>
-    <dl>
-    <dt><b>クエリの変更</b></dt>
-
-    <dd>クエリを修正してより良い性能を得ることを含みます：
-    <ul>
-    <li>式および部分インデックスを含む、インデックスを作成</li>
-    <li>複数の<small>INSERT</small>のかわりにCOPYを使用</li>
-    <li>複数の文をグループ化し、1つのトランザクションにしてコミットのオーバヘッドを削減</li>
-    <li>インデックスからから沢山のロウを取り出すときは<small>CLUSTER</small>を使用</li>
-    <li>クエリの出力のサブセットを返すために<small>LIMIT</small>を使用</li>
-    <li>準備されているクエリを使用</li>
-    <li>オプティマイザの正確な統計を維持するために<small>ANALYZE</small>を使用</li>
-    <li><small>VACUUM</small> または <i>pg_autovacuum</i> の常用</li>
-    <li>大きなデータ変更のあるときはインデックスを削除</li>
-    </ul><br/>
-    <br/>
-    </dd>
-
-    <dt><b>サーバ構成</b></dt>
-
-    <dd><i>postgresql.conf</i>の設定のいくつかは性能に影響します。
-    詳しくは、<a href=
-    "http://www.postgresql.org/docs/current/static/runtime-config.html">
-    Administration Guide/Server Run-time Environment/Run-time
-    Configuration</a> の全件リストをごらんください(<a
-    href="http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_conf_e.html">
-    JPUGサイトの日本語版、サーバの構成</a>)。
-    そして、解説として、<a
-    href="http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_conf_e.html">
-    http://www.varlena.com/varlena/GeneralBits/Tidbits/annotated_conf_e.html</a>
-    および、 <a href="http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html">
-    http://www.varlena.com/varlena/GeneralBits/Tidbits/perf.html</a> を
-    ごらんください。
-    <br/>
-    <br/>
-    </dd>
-
-    <dt><b>ハードウェアの選定</b></dt>
-
-    <dd>性能におけるハードウェアの影響は
-    <a href="http://www.powerpostgresql.com/PerfList/">
-    http://www.powerpostgresql.com/PerfList/</a> と、 <a
-    href="http://momjian.us/main/writings/pgsql/hw_performance/index.html">
-    http://momjian.us/main/writings/pgsql/hw_performance/index.html</a>
-    (<a href="http://www.postgresql.jp/wg/psqltrans/hw_performance_j/index.html">JPUGサイトの日本語版</a>)
-    に述べられています。
-    <br/>
-    <br/>
-    </dd>
-    </dl>
-
-
-    <p><small><pre>
-    [訳注:
-      JPUG理事長の片岡裕生氏による、「今すぐできるPostgreSQLチューニング」
-      というコーナーが ThinkIT サイトにあり、実作業の参考になります。
-    	http://www.thinkit.co.jp/free/tech/10/1/1.html
-    ]
-    </pre></small></p>
-
-
-<h4 id="item3.4">3.4</a>) どのようなデバグ機能が使えますか？</h4>
-
-    <p>サーバ構成変数については、
-href="http://www.postgresql.org/docs/current/interactive/runtime-config-logging.html">http://www.postgresql.org/docs/current/interactive/runtime-config-logging.html</a>
-    に示されるように多くの <code>log_*</code> があり、クエリとプロセス
-    の統計情報を出力することができ、デバグや性能測定にはとても便利です。</p>
-
-
-<h4 id="item3.5">3.5</a>) 接続しようとするときに <i>'Sorry, too many clients'</i> が出るのはなぜですか？</h4>
-
-    <p> 既定での制限である 100 のデータベースセッションに達してしまって
-    います。サーバーの同時接続できるバックエンドプロセスの制限値を増やす
-    必要があります。<i>postgresql.conf</i> の中の<i>max_connections</i>
-    の値を変更してサーバを再起動することで可能になります。</p>
-
-
-<h4 id="item3.6">3.6</a>)  PostgreSQLのアップグレードの手順はどうなりますか？</h4>
-
-    <p>バージョン番号付けの方針について、更新全般についての解説は<a
-    href="http://www.postgresql.org/support/versioning">http://www.postgresql.org/support/versioning</a> を、
-    そして、アップグレードについての一般的な説明は <a 
-    href="http://www.postgresql.org/docs/current/static/install-upgrading.html">
-    http://www.postgresql.org/docs/current/static/install-upgrading.html</a>
-    をご覧ください。
-    </p>
-<p><small><pre>
-[訳注：
-   アップグレードについての和訳版は下記にあります。
-  <a href="http://www.postgresql.jp/document/current/html/install-upgrading.html">http://www.postgresql.jp/document/current/html/install-upgrading.html</a>
-]
-</pre></small></p>
-
-
-<small><pre>
-[訳注：
-   原文では、下記の内容は<a href="http://www.postgresql.org/support/versioning">独立したページに移され</a>、削除されています。
-</pre>
-
-    <p>新しい機能を盛り込むPostgreSQLのメジャーリリースはだいたい年に1回
-    程度行ないます。メジャーリリースは、たとえば、8.1から8.2へのように、
-    バージョン番号の1番目か2番目の部分を増やしてゆきます。</p>
-
-    <p>PostgreSQLのメジャーリリースは通常、システムテーブルとデータの内
-    部フォーマットを変更します。これらの変更はたいていは複雑なのでで、デー
-    タファイルの後方互換性を維持したりはしません。メジャーアップグレード
-    のためには、データベースのダンプ/リロードが必要になります。</p>
-
-    <p>マイナーリリースは、たとえば、8.1.5 から8.1.6へのように、バージョ
-    ン番号の3番目の値を増やします。PostgreSQLチームは、マイナーリリース
-    に対しては、バグフィクスしか行ないません。すべてのユーザは、できるだ
-    け最新のマイナーリリースに更新すべきです。アップグレードには、常にリ
-    スクがつきものですから、PostgreSQLのマイナー修正リリースでは、頻繁に
-    発生したり、<a href="http://www.postgresql.org/support/security">セキュリティ</a>に関係したり、データがつぶれるバグだけを修正
-    し、アップグレードのリスクを最小限にとどめます。我々のコミュニティで
-    は、アップグレードするリスクよりも、アップグレード<i>しないリスク</i>
-    のほうが高いと考えています。</p>
-
-    <p>マイナーリリースのアップグレードにはダンプとリストアの必要はなく、
-    データベースサーバを停止して、アップデートされたバイナリをインストー
-    ルし、サーバをリスタートします。</p>
-<pre>
-]
-</pre></small>
-
-
-<h4 id="item3.7">3.7</a>) ハードウェアにはどのようなコンピュータを使えばよいですか？</h4>
-
-    <p>PCハードウェアはほとんど互換性がありますので、ほとんどの人は、す
-    べてのPCハードウェアが同じ品質だと思い込む傾向があります。しかし、そ
-    れは間違いです。ECC RAM、SCSI、および、高品質マザーボードは、安いハー
-    ドウェアに比べると、より信頼性が高く、より性能も良いのです。
-    PostgreSQL はほとんどのハードウェアで稼働しますが、信頼性や性能が重
-    要な場合は、使用中のハードウェアのオプションについて調査することが
-    賢明です。バッテリーバックアップ付きのキャッシュを持つディスクコント
-    ローラも役に立ちます。我々のメーリングリスト上でもハードウェアオプショ
-    ンのトレードオフについて議論することができます。</p>
-<hr />
-
-
-<h2 align="center">操作上の質問</h2>
-
-<h4 id="item4.1">4.1</a>) 最初の数ロウのみを <small>SELECT</small>するにはどうしますか？ランダムなロウ？
-</h4>
-
-    <p>取得したいロウがほんの数行で、<small>SELECT</small>  の実行時に取得するロウの
-    数が分かっていれば <small>LIMIT</small> を使いましょう。インデックスが 
-    <small>ORDER BY</small> とマッチすれば、クエリ全体を(丸ごと)実行しなくても済む場合も
-   あります。<small>SELECT</small> する時点でロウの数が不明なら、カーソルを使って
-   <small>FETCH</small> しましょう。
-
-   <p>ランダムにロウを<small>SELECT</small>するには、次の文を使います： 
-<pre>
-    SELECT col
-    FROM tab
-    ORDER BY random()
-    LIMIT 1;
-</pre>
-
-
-<h4 id="item4.2">4.2</a>) 定義されたテーブル、インデックス、データベース、および、ユーザをどのようにして見つけ出しますか？<i>psql</i>で使われているクエリを表示するにはどうしますか？</h4>
-
-    <p><i>psql</i> の中で \dtコマンドを使ってテーブルを見ることができ
-    ます。psqlの中で \? を使って、コマンドの全リストを調べることができま
-    す。一方で、<i>psql</i> のソースコードで、バックスラッシュコマンドを
-    出力する <i>pgsql/src/bin/psql/describe.c</i> ファイルを読むこともで
-    きます。その中には、 <small>SQL</small> コマンドを生成する部分も含ま
-    れます。また、 <i>-E</i> オプションを付けて <i>psql</i> を開始すると、
-    入力されたコマンドを実行するためのクエリを印字出力するようになります。
-    PostgreSQLは <small>SQL</small> 準拠の INFORMATION SCHEMA インター
-    フェースを提供しますので、データベースについての情報を問い合わせるこ
-    ともできます。</p>
-
-    <p><i>pg_</i> で始まるシステムテーブルでもこれらを記述することができ
-    ます。</p>
-    
-    <p><i>psql -l</i>を使うと全てのデータベースをリストします。</p>
-
-    <p>それと、<i>pgsql/src/tutorial/syscat.source</i> を試してみてくだ
-    さい。そこには、データベースのシステムテーブルから情報を得るために必
-    要な <small>SELECT</small> 文が沢山あります。</p>
-
-
-<h4 id="item4.3">4.3</a>) カラムのデータ型を変更するにはどうしますか？</h4>
-
-    <p>カラムのデータ型の変更は 8.0 以降では、
-    <small>ALTER TABLE ALTER COLUMN TYPE</small> を使うことにより間単に
-    なりました。</p>
-
-    <p>それより前のバージョンでは、以下のようにします:</p>
-<pre>
-    BEGIN;
-    ALTER TABLE tab ADD COLUMN new_col <i>new_data_type</i>;
-    UPDATE tab SET new_col = CAST(old_col AS <i>new_data_type</i>);
-    ALTER TABLE tab DROP COLUMN old_col;
-    COMMIT;
-</pre>
-
-    <p>これを行なったときは、抹消された行が使っているディスク空間を回収
-    するために<i>VACUUM FULL tab</i>をしたほうが良いかもしれません。</p>
-
-<h4 id="item4.4">4.4</a>) ロウ、テーブル、データベースの最大サイズは？</h4>
-
-    <p>制限は以下のとおりです:</p>
-<blockquote>
-<table>
-<tr><td>データベースの最大サイズ?</td><td>制限無し (32 TB のデータベースも存在します)</td></tr>
-<tr><td>テーブルの最大サイズ?</td><td>32 TB</td></tr>
-<tr><td>ロウの最大サイズ?<